From bdffe3fbb05f28f8ad415c136bd6a4a1cdb78fbc Mon Sep 17 00:00:00 2001 From: Philip Miess Date: Sun, 7 Jul 2024 21:18:46 -0400 Subject: return to origenal patches try chaning eapply strip level Signed-off-by: Philip Miess --- dev-java/jinput/Manifest | 8 ++--- dev-java/jinput/files/javah-classpath.patch | 2 +- dev-java/jinput/files/nostrip.patch | 2 +- dev-java/jinput/files/unbundle.patch | 2 +- dev-java/jinput/jinput-2.0.6-r2.ebuild | 50 ----------------------------- dev-java/jinput/jinput-2.0.6-r3.ebuild | 50 +++++++++++++++++++++++++++++ 6 files changed, 57 insertions(+), 57 deletions(-) delete mode 100644 dev-java/jinput/jinput-2.0.6-r2.ebuild create mode 100644 dev-java/jinput/jinput-2.0.6-r3.ebuild diff --git a/dev-java/jinput/Manifest b/dev-java/jinput/Manifest index 46969ad..569a4a6 100644 --- a/dev-java/jinput/Manifest +++ b/dev-java/jinput/Manifest @@ -1,7 +1,7 @@ -AUX javah-classpath.patch 464 BLAKE2B 3eca9e980144ecc5943a03d34c994ab5e5cae78af6193340942da8dd25ce0aa6c0b5d1c23902c188b06a8355c76bb39037a457e18a0ca094d7753e017711799d SHA512 9d4ff5c51cc1e1cf144c4ab1aa9803969300746bda9c48a3b04f6d36348b2d1962aee95fe2184793b5c63a19e4c3512e0ac78f20dcc7f1df2b3bd5e7ef477f61 -AUX nostrip.patch 426 BLAKE2B 7685381a0d63d925d7746bd382892e0acaaa25a1b4757c33aaba12c75a8c318a1264d034b952c02d5f95646f8c1a636a56717dc188cdee8dc033424ad4af58ed SHA512 9de6019045ea44c21d61ffd8c315a6d4629e394ecb675c9e1d1838012754db4df2b236c7137e35ad23873791e99527dbbcb3fa69fd467c7e84b7d6db4e5f11be +AUX javah-classpath.patch 469 BLAKE2B 6cf9c5c6fb5048a074fd8e654cd4851779d1df9155ba81b7a38c716af1acda9eafc5e1fb2392cd05c9e2f14859daf93ec93fa5acf5d09784d3367a24f76af1a0 SHA512 a10b34e593980e24e0d9dbf0419cdacdb9c03059b54d3a811f3dadc8838d223cc3e4800feeb1ad0cf3b65d75117a0dbc7061740b40e051c683c4180a323bc916 +AUX nostrip.patch 431 BLAKE2B 5633db9dd6cf803c8a960dbfa38dce803b247efe107d20430b41c24aad057041750e1f05af1cc2e26d3d4b241260a0a3cdc5d295d713ae91c1748487d3f4f760 SHA512 0f1cccfef58afca9c1db074ae179bc9d06c0ae758a859671e362c229279d2b3c570356ca2e06bd319f1ba6674f601f4fd15479adf1e1410779a52eec9e1172c9 AUX remove-getDeviceUsageBits.patch 4109 BLAKE2B 89518857ae50e74688fa1f9c0f493c8bcd34a0db44b39e5768c581019cced7d9c568813f3add70ba26eb42963291da9131238c9b3c96b703bd73e15897d55663 SHA512 e5d5a2c4715b00a08b909965079fffb2a0797a0a762481c76135692a66f208bc86b7610db525ed82997c90bb5c70f590ba1062833c00104b86112b0a1e0d6176 -AUX unbundle.patch 349 BLAKE2B a4ef197b8f755a7c52c08ba42d4205cc0b823691c2336f8db638a12f3415ef95c1acd74510c1a0cc09d81adbd0c1179ae6f2306a907a228f51227d862f432eea SHA512 81cca3aa4245ab972e64e6449441a2de5a2f50cc9e9f4034e82c603da281bbda8fcb45561cf9502d15b0e89e14d749e87cd3d1fb9b897b68229a0e4401cce06c +AUX unbundle.patch 354 BLAKE2B 87bbc929c3449e786c61810bd4f3ef2beeb9d8bd7efdc006afede6898a6608accea69a6a935ab383cd5d5689f4c0956367043c5d1f856486c379f0b2b997deb1 SHA512 99d933a2bf501fe209df2bdfe8dbc0f756b78715c322f6f4c605e40b96aa3773cb8592c52ac2d752e720245bbb310e7bcf52409e97a74e06175f3c995a55454e DIST jinput-2.0.6.tar.gz 1590738 BLAKE2B ceb296af7ca4309913708fac5c67c6fec9cd94ef3dad454c41a99ffee7e390545ab6424354dd0dc9755dfb4c0711b449b29b423b395c0f2f504a73d2d7019645 SHA512 770b3a0724334b9182098797923cc11e575b42cb67c5583d8aac7aeb432ec80189199daf1ef624a56923c4ecce271f05adf0481c13b8cd6997bb1862a7a91eba -EBUILD jinput-2.0.6-r2.ebuild 1236 BLAKE2B 5af64a4b5f52b3e1ab59a693a055c2fcd65c97209bb49f3fa01fdc8f6e3381ca1b001f59a10461bfc5545cd99c9689c61d074f1520280c9e8b9cf1c4bebcb042 SHA512 5ca537910f3bcbb4efd75e8c5e3e1e8331c159c90510b2ec22bdafaaeab1b7435b0ba699141017e5aa81e1708975f4460071e756e3e09de0821ac588bcba74fe +EBUILD jinput-2.0.6-r3.ebuild 1240 BLAKE2B ea6d17fa403ebf55293b8022389d2ea265d405d75e7e70ab3a2b7eed3f347e67321f28f3a479a899fad6644697018286b33c7efd9ad86049a72281d40be6d169 SHA512 438f914da55594273c0aee5af8456e430f67f85ff5b6112d27505814e79ce851ac22bcb8211029c7b0220db48e96745ebaec9da325ef215e4cbf530be5c51854 MISC metadata.xml 657 BLAKE2B 17302de7620eb88fba8aca2a04148cd31cb9176a0e2e539e3e181d68ca0e98f98c6a2a1a2fc254c16e2f19c4a8d206af893e80581c0be3f18c9280376868f08a SHA512 2fa1026b4a776a5c527de51e4291b4cf12f58e0b526e329101b6c1cc9cd05b405919b4187b96b35c93977da3c8e80722984aff841d77a78d5e2ea6e6911073ac diff --git a/dev-java/jinput/files/javah-classpath.patch b/dev-java/jinput/files/javah-classpath.patch index 0cee4ff..ae90584 100644 --- a/dev-java/jinput/files/javah-classpath.patch +++ b/dev-java/jinput/files/javah-classpath.patch @@ -1,4 +1,4 @@ ---- plugins/linux/build.xml 2006-07-11 22:07:38.000000000 +0100 +--- plugins/linux/build.xml.orig 2006-07-11 22:07:38.000000000 +0100 +++ plugins/linux/build.xml 2011-11-16 15:49:21.140789781 +0000 @@ -56,6 +56,7 @@ diff --git a/dev-java/jinput/files/nostrip.patch b/dev-java/jinput/files/nostrip.patch index 4fd66fb..8627c0d 100644 --- a/dev-java/jinput/files/nostrip.patch +++ b/dev-java/jinput/files/nostrip.patch @@ -1,4 +1,4 @@ ---- plugins/linux/src/native/build.xml 2013-03-25 18:01:56.000000000 +0000 +--- plugins/linux/src/native/build.xml.orig 2013-03-25 18:01:56.000000000 +0000 +++ plugins/linux/src/native/build.xml 2015-04-12 17:36:36.020105790 +0100 @@ -46,9 +46,6 @@ diff --git a/dev-java/jinput/files/unbundle.patch b/dev-java/jinput/files/unbundle.patch index 47e4d4d..1a86863 100644 --- a/dev-java/jinput/files/unbundle.patch +++ b/dev-java/jinput/files/unbundle.patch @@ -1,4 +1,4 @@ ---- build.xml 2013-03-25 18:01:56.000000000 +0000 +--- build.xml.orig 2013-03-25 18:01:56.000000000 +0000 +++ build.xml 2015-04-12 17:11:45.869203820 +0100 @@ -137,7 +137,6 @@ diff --git a/dev-java/jinput/jinput-2.0.6-r2.ebuild b/dev-java/jinput/jinput-2.0.6-r2.ebuild deleted file mode 100644 index 1ce329f..0000000 --- a/dev-java/jinput/jinput-2.0.6-r2.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -COMMIT="790b666" -JAVA_PKG_IUSE="doc source" - -inherit toolchain-funcs java-pkg-2 java-ant-2 vcs-snapshot - -DESCRIPTION="An implementation of an API for game controller discovery and polled input" -HOMEPAGE="https://java.net/projects/jinput" -SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -CDEPEND="dev-java/jutils:0" - -RDEPEND=">=virtual/jre-1.4 - ${CDEPEND}" - -DEPEND=">=virtual/jdk-1.4 - ${CDEPEND}" - -JAVA_PKG_BSFIX="off" -EANT_BUILD_TARGET="dist" - -src_prepare() { - # http://java.net/jira/browse/JINPUT-44 - # http://java.net/jira/browse/JINPUT-45 - eapply "${FILESDIR}"/{javah-classpath,nostrip,remove-getDeviceUsageBits,unbundle}.patch - - sed -i \ - -e "s/\"cc\"/\"$(tc-getCC)\"/g" \ - -e "s/-O[0-9]/${CFLAGS} ${LDFLAGS}/g" \ - plugins/linux/src/native/build.xml || die - - java-pkg_jar-from --into lib jutils -} - -src_install() { - java-pkg_dojar dist/${PN}.jar - java-pkg_doso dist/lib${PN}-*.so - - # Only core API docs, others would conflict. - use doc && java-pkg_dojavadoc coreAPI/apidocs - use source && java-pkg_dosrc */src/java/* */**/src/java/* -} diff --git a/dev-java/jinput/jinput-2.0.6-r3.ebuild b/dev-java/jinput/jinput-2.0.6-r3.ebuild new file mode 100644 index 0000000..915cda0 --- /dev/null +++ b/dev-java/jinput/jinput-2.0.6-r3.ebuild @@ -0,0 +1,50 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +COMMIT="790b666" +JAVA_PKG_IUSE="doc source" + +inherit toolchain-funcs java-pkg-2 java-ant-2 vcs-snapshot + +DESCRIPTION="An implementation of an API for game controller discovery and polled input" +HOMEPAGE="https://java.net/projects/jinput" +SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +CDEPEND="dev-java/jutils:0" + +RDEPEND=">=virtual/jre-1.4 + ${CDEPEND}" + +DEPEND=">=virtual/jdk-1.4 + ${CDEPEND}" + +JAVA_PKG_BSFIX="off" +EANT_BUILD_TARGET="dist" + +src_prepare() { + # http://java.net/jira/browse/JINPUT-44 + # http://java.net/jira/browse/JINPUT-45 + eapply -p0 "${FILESDIR}"/{javah-classpath,nostrip,remove-getDeviceUsageBits,unbundle}.patch + + sed -i \ + -e "s/\"cc\"/\"$(tc-getCC)\"/g" \ + -e "s/-O[0-9]/${CFLAGS} ${LDFLAGS}/g" \ + plugins/linux/src/native/build.xml || die + + java-pkg_jar-from --into lib jutils +} + +src_install() { + java-pkg_dojar dist/${PN}.jar + java-pkg_doso dist/lib${PN}-*.so + + # Only core API docs, others would conflict. + use doc && java-pkg_dojavadoc coreAPI/apidocs + use source && java-pkg_dosrc */src/java/* */**/src/java/* +} -- cgit v1.2.3-65-gdbad