From 7d49bf25a701d2f8c9a296c919c3a195fe6c0aa6 Mon Sep 17 00:00:00 2001 From: Manuel Friedli Date: Mon, 15 Dec 2014 11:28:37 +0100 Subject: [PATCH] fixed ebuild for nexus-2.11.0 and updated ebuild for nexus-2.10.0 --- dev-java/nexus-oss-bin/Manifest | 7 ++-- ...apper.patch => nexus-wrapper-2.10.0.patch} | 0 .../files/nexus-wrapper-2.11.0.patch | 42 +++++++++++++++++++ .../nexus-oss-bin/nexus-oss-bin-2.10.0.ebuild | 2 +- .../nexus-oss-bin/nexus-oss-bin-2.11.0.ebuild | 4 +- 5 files changed, 48 insertions(+), 7 deletions(-) rename dev-java/nexus-oss-bin/files/{nexus-wrapper.patch => nexus-wrapper-2.10.0.patch} (100%) create mode 100644 dev-java/nexus-oss-bin/files/nexus-wrapper-2.11.0.patch diff --git a/dev-java/nexus-oss-bin/Manifest b/dev-java/nexus-oss-bin/Manifest index af98a9c..b6a2ab3 100644 --- a/dev-java/nexus-oss-bin/Manifest +++ b/dev-java/nexus-oss-bin/Manifest @@ -1,6 +1,7 @@ AUX init.sh 381 SHA256 7adb00b5de411223dcdaf017005e7103d8716e885a008f19aa8d56db2afa47de SHA512 b458fda89207b327f34c3e14f0c51ab86e7aa271867ec9a6c72634e1b8d81aebafba8ac6279f359fc9ba520920bee64fb439588b3f771d647ee8f3fde0ea742d WHIRLPOOL ac4d4fc6facc926f697706beb7b95d9c3bceb35a2e2d04eb656a73b2ed397c4dac521b3566307189655d6afcaa1ea116fbb8ff645a32cad484bf3ed0380b2dc8 -AUX nexus-wrapper.patch 1193 SHA256 0ae0408df651d2bbf55a00f871e6640caa7161adf0936bfe32fa24e9b1658fff SHA512 2e54a97b288db451953d2bef2fe7bef1c1aad5f344acaad2e84d4e1c466dd7d169c84a9be7eefdbf974d20b903b598290bc6a189dcc199c6ebc31c917767af2e WHIRLPOOL c3288dc11f31dfca4c43aa6ecc6e4a2ea9c0bb181380ef373d1370b3d588614d5a33ef7db6b9523c6993424882266f4a57c19cac2e5314a82cb30e1267c5ed7a +AUX nexus-wrapper-2.10.0.patch 1193 SHA256 0ae0408df651d2bbf55a00f871e6640caa7161adf0936bfe32fa24e9b1658fff SHA512 2e54a97b288db451953d2bef2fe7bef1c1aad5f344acaad2e84d4e1c466dd7d169c84a9be7eefdbf974d20b903b598290bc6a189dcc199c6ebc31c917767af2e WHIRLPOOL c3288dc11f31dfca4c43aa6ecc6e4a2ea9c0bb181380ef373d1370b3d588614d5a33ef7db6b9523c6993424882266f4a57c19cac2e5314a82cb30e1267c5ed7a +AUX nexus-wrapper-2.11.0.patch 1193 SHA256 aa6b5ed79964383bcbbda6350ca7a3312b82c4d022e6ca1023a09f2a16446b21 SHA512 7913d7899da5b524d30c69a49b9d57c943c2c60da223f3384f9860bee82cc86a945bea8439b7b4977a6917a42cdfd119366fced23c2fa340cfe746b2acfc6a67 WHIRLPOOL 6f1a66e73d0fc5fa2f96a97aac212212cb15e3370ca35c15e24930b017a4a988d0e8c2ee7065347c7639cb62a85236f599bbfb12e149b193e883190d3bf4d86e DIST nexus-2.10.0-02-bundle.tar.gz 50071813 SHA256 730442be2ca4918b44a69b98bb62abfcbf8ce8f997385349510dd807c1bf88d6 SHA512 22a75a71d279b34ad2c43c4360a5fcf6218494ab3772e7419a6817e86ee8682843402a727c720d410e79e0015dddd63a38049afddeb20dfb8a7860fa3bf057e2 WHIRLPOOL d025400ff050744a4632c6f30a7708ae912506dc9e924adccf73ce1ababeaf99c701b57ea9594370a71dbf41d8cc91917cbcbb3dada360f1eb990796923b8ea2 DIST nexus-2.11.0-02-bundle.tar.gz 71803785 SHA256 c55cee79c527d6275c2f00576ca152c823ac7de4311c9257851d3dbe21f6329c SHA512 016b99cbe529a713f29492255b1c11fb8c71055bf19d3612a035f62c230705e8f5a724801af86790e06a8ef62f093ed9a8d49fc2a3430a2f5b996d73d8520701 WHIRLPOOL 31dd1a3fe49e29e036736e3b83aba7a26aece555ba7407877f20947134d01dc2f5906a47b0da3fa4547962cbc9506d8a2984fc6aa8a0ea0e456bc147427d47b0 -EBUILD nexus-oss-bin-2.10.0.ebuild 1201 SHA256 ee108bc437b213f0ecaabc2050c4d9b91c4802e4908412e48207027bf32a3f3f SHA512 9d02d6a7380e2d2538c3e98c9b8f96cc201f6ba9ffb32ee9578b77296fba6aa3cf976eab75c551a2bec1be0b952d6362cd6f35a6d8155dba747028dcb0d6ce02 WHIRLPOOL 06454c109335aaa8c219775ee8d690ab2a39454919c9a973449acd78740b4e432023c6cb3b5914ab2e94b12417a86aa07327765530d9609dc57fb995be6e9bdd -EBUILD nexus-oss-bin-2.11.0.ebuild 1130 SHA256 a746dba3f1994ca9b9231ebaed3c204f4490990213c2f6083dde25c7ab96306e SHA512 9098e2a57ac0e3a3268c92023a50ab9b80c7b019e9a1f0e2ce2cbeb35bd73bb83e3239226151b72f62b18eb4ea1d0b1e7256b58e6c412d923e69dd4a7d0d2cdb WHIRLPOOL 423499dc7597a7c09c63814b7d94104b860e3e32c9032e9fc277224f38cd7af50e1f79958a91e48f02dd1d73a4640d1f59d9905e9b2c06beecc832d0cc3754ff +EBUILD nexus-oss-bin-2.10.0.ebuild 1207 SHA256 73da7df4a618bc7b8be13ea0a05069a7e5075ce7ef5e2c504c92fc7719c7167e SHA512 bdfd7e517d7ae5efa46c7cc1bf2c652888460247af769e745be0a9384e302351e2bb0bb9c6c679351b41a62e267de41b8b32e4264d041d389c59792f4dc57d05 WHIRLPOOL 863e2881e689e7615d8e6a329e1cbdd48be46c009cd5ac75512563839422a7c3f7a97b2113eb2240dc9dc3e37480a127e64799aa4a5cb03078796cb1acd42f0f +EBUILD nexus-oss-bin-2.11.0.ebuild 1089 SHA256 0ecf89add82e5150e5cf4f067bce8b7c72d479f5b5cec12d1f5a985c74470ce6 SHA512 862da4bbac1b40a3aedd2bfc2053c61eeef4771dc76ea8ac4b9b42aa510727b42cf30a4c385fae47b22de567f779ff1b746956c861ec2230811d56a67a3725e4 WHIRLPOOL abb54b585b8ba6f92d4c275cc0ed614001ca2d69058c8aeec300fba378de29a3ae9a1a4f2197ef32c14d5fa734e9a31965abccc4ddd1f81dd3f7a66041917956 diff --git a/dev-java/nexus-oss-bin/files/nexus-wrapper.patch b/dev-java/nexus-oss-bin/files/nexus-wrapper-2.10.0.patch similarity index 100% rename from dev-java/nexus-oss-bin/files/nexus-wrapper.patch rename to dev-java/nexus-oss-bin/files/nexus-wrapper-2.10.0.patch diff --git a/dev-java/nexus-oss-bin/files/nexus-wrapper-2.11.0.patch b/dev-java/nexus-oss-bin/files/nexus-wrapper-2.11.0.patch new file mode 100644 index 0000000..0d78219 --- /dev/null +++ b/dev-java/nexus-oss-bin/files/nexus-wrapper-2.11.0.patch @@ -0,0 +1,42 @@ +diff --git a/bin/nexus b/bin/nexus +index 3f3a23c..4f69c5e 100755 +--- a/nexus-2.11.0-02/bin/nexus ++++ b/nexus-2.11.0-01/bin/nexus +@@ -161,6 +161,37 @@ case "$DIST_ARCH" in + '9000/800') + DIST_ARCH="parisc" + ;; ++ *) ++ DIST_ARCH=`uname -m | tr [:upper:] [:lower:] | tr -d [:blank:]` ++ case "$DIST_ARCH" in ++ 'athlon' | 'ia32' | 'i386' | 'i486' | 'i586' | 'i686') ++ DIST_ARCH="x86" ++ ;; ++ 'amd64' | 'x86_64' | 'ia64') ++ DIST_ARCH="x86" ++ DIST_BITS=64 ++ ;; ++ 'ip27') ++ DIST_ARCH="mips" ++ ;; ++ 'power' | 'powerpc' | 'power_pc') ++ DIST_ARCH="ppc" ++ ;; ++ 'ppc64') ++ DIST_ARCH="ppc" ++ DIST_BITS=64 ++ ;; ++ 'pa_risc' | 'pa-risc') ++ DIST_ARCH="parisc" ++ ;; ++ 'sun4u' | 'sparcv9') ++ DIST_ARCH="sparc" ++ ;; ++ '9000/800') ++ DIST_ARCH="parisc" ++ ;; ++ esac ++ ;; + esac + + # Extra architecture detection diff --git a/dev-java/nexus-oss-bin/nexus-oss-bin-2.10.0.ebuild b/dev-java/nexus-oss-bin/nexus-oss-bin-2.10.0.ebuild index e54cc62..9adc2d9 100644 --- a/dev-java/nexus-oss-bin/nexus-oss-bin-2.10.0.ebuild +++ b/dev-java/nexus-oss-bin/nexus-oss-bin-2.10.0.ebuild @@ -36,7 +36,7 @@ src_unpack() { } src_prepare() { - epatch "${FILESDIR}/nexus-wrapper.patch" + epatch "${FILESDIR}/nexus-wrapper-${PV}.patch" } src_install() { diff --git a/dev-java/nexus-oss-bin/nexus-oss-bin-2.11.0.ebuild b/dev-java/nexus-oss-bin/nexus-oss-bin-2.11.0.ebuild index 6e17e49..ff271ee 100644 --- a/dev-java/nexus-oss-bin/nexus-oss-bin-2.11.0.ebuild +++ b/dev-java/nexus-oss-bin/nexus-oss-bin-2.11.0.ebuild @@ -30,12 +30,10 @@ pkg_setup() { src_unpack() { unpack ${A} cd "${S}" - -# epatch "${FILESDIR}/nexus-wrapper.patch" } src_prepare() { - epatch "${FILESDIR}/nexus-wrapper.patch" + epatch "${FILESDIR}/nexus-wrapper-${PV}.patch" } src_install() {