From: Thomas Sachau Date: Sat, 10 Apr 2010 00:11:02 +0000 (+0000) Subject: Revision bump, fixes bug 276728 and bug 307549, thanks to Diego “Flameeyes” Pettenò... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9f055e34f71567daac2e00e2d5f6699f6b4dd6c7;p=gentoo.git Revision bump, fixes bug 276728 and bug 307549, thanks to Diego “Flameeyes” Pettenò for investigation and patch Package-Manager: portage-2.2_rc67-r3/cvs/Linux x86_64 --- diff --git a/dev-java/fec/ChangeLog b/dev-java/fec/ChangeLog index 7905d42b917e..d0f0017f0dc8 100644 --- a/dev-java/fec/ChangeLog +++ b/dev-java/fec/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-java/fec # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/fec/ChangeLog,v 1.9 2010/02/26 12:24:29 ali_bush Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/fec/ChangeLog,v 1.10 2010/04/10 00:11:01 tommy Exp $ + +*fec-1.0.4-r1 (10 Apr 2010) + + 10 Apr 2010; Thomas Sachau (Tommy[D]) + -fec-1.0.4.ebuild, +fec-1.0.4-r1.ebuild, +files/fec-1.0.4-build.patch, + files/fec-1.0.4-soname.patch: + Revision bump, fixes bug 276728 and bug 307549, thanks to Diego + “Flameeyes” Pettenò for investigation and patch 26 Feb 2010; Alistair Bush fec-1.0.4.ebuild, +files/fec-1.0.4-soname.patch: diff --git a/dev-java/fec/Manifest b/dev-java/fec/Manifest index 87fdfb87fb76..f72207e9a537 100644 --- a/dev-java/fec/Manifest +++ b/dev-java/fec/Manifest @@ -1,9 +1,22 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX fec-1.0.4-build.patch 968 RMD160 cf35c9d138610ead5629a42ecde22d67395d04e1 SHA1 f57d6e59783cb5d3fe3bf3fab116bda311cf288c SHA256 595b724937568e8482a7a4d7d5d1bb89f98725b648ffaf1d0d47514df2576f6a AUX fec-1.0.4-libfec8path.patch 1068 RMD160 8e1ad3dde5cbcd21eb04040e152d6d196ac20d5d SHA1 be2e21795943690c7333c3bbed445fe01e8ca64c SHA256 942e1b7f5bf4ae2da1270140d51d24c4a4e112d3eb6f833c68e48ef7bb3cce3d -AUX fec-1.0.4-soname.patch 768 RMD160 e026655dba2fbf04439c43cdc28f7ed19173c38f SHA1 8e9dcbf8a02a1adf141f5d575989ff384595816c SHA256 185b6556011dccbff28351d5aedd63dcf68806c21ac2d0314cb7562614741a6f +AUX fec-1.0.4-soname.patch 786 RMD160 be06edca7683c23f51e817aa608c4de2f542d198 SHA1 8149ba0882ce2fa0e762b016b77522eb6b021e00 SHA256 b6da1e1015a72d952d6fde0e51916cef01e5ec7628760e789447e24d9f6bca20 AUX libfec8path.patch 950 RMD160 0df6aad13aeea91116f7a03a8833e4e89bef9773 SHA1 c5936a8e9e738ea74ef3798932e8308b0a13ec31 SHA256 cedc6420e56ad4e707499fd40ae603887a253476c23368058945da64c2ce4081 DIST fec-1.0.3.zip 745195 RMD160 b1b302071c6eb90ce586e01da6c31de4a469acf5 SHA1 35de94815de1a132bc0aa991dcfffd5547226ff4 SHA256 2b23956854800b85a0d2eec11ab0940daec44e4c828b78782686efe8511a7d12 DIST fec-1.0.4.tar.bz2 611131 RMD160 77c7a10562a91cd33f50f94ec322f41bc74ff4a9 SHA1 88d66aa906f12f55114d37e67c8f2a47ae13363f SHA256 978d0ef609ec334ea85e3f70e46a94f6c2cc04393b590a2addfc74e03634b8dd EBUILD fec-1.0.3-r1.ebuild 1562 RMD160 5e00700b19316b8f4135475daf7e3679faad7a00 SHA1 ed27c9ddd6b3ed1b482fdee0f98dadaf4dcb06a2 SHA256 953c768350589fa1e42aba2bfab7236af871d9ddca863773c4390d46ccbc1b9b -EBUILD fec-1.0.4.ebuild 1715 RMD160 109f821c03463ba7f4edd21e024c6089cda9c3f5 SHA1 7ced7f16ab5a850bbef6a3d040b5a709ba0758fa SHA256 69946bcad217fcf4657fabe6a7a8f57103066875b37c92ba6847e0eeb63ea9f8 -MISC ChangeLog 1422 RMD160 2edf219885f9c97a18005efd76d0f8470381177d SHA1 33f98c26e78a302320d52667a64c61c3c1e0505c SHA256 2e85d38b4a5d52a06d76e080128dddc2f4ed6190809ce7e1a4c5efab2a1376ef +EBUILD fec-1.0.4-r1.ebuild 1604 RMD160 ef9b209cf11c767e4893960875414aec34969a29 SHA1 3b8b378cdf9f28594438a14b5c33246d1f02efd3 SHA256 50a25eff500252a82655570874c794ab4d8874aa99d257509e35b4f09879ea5b +MISC ChangeLog 1735 RMD160 d33c83a508c977309b662005485725360858712e SHA1 a947982c3af19721685d34e239a0ba54c9d2e9fd SHA256 6fd012ae679174887650ba3b26b6ee9cd07cfef7965828aa12448192ee958ae2 MISC metadata.xml 262 RMD160 beccaa043c2480f3afbd62f89a4c8ba55ef725f8 SHA1 c05367066b98af14b7089a2122ac09a3fa109281 SHA256 5a48177bba82f308c835efee09c4f2da15fe97eb7bf5a9a9950940dd1b7c95a5 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.15 (GNU/Linux) + +iJwEAQECAAYFAku/wiQACgkQG7kqcTWJkGdfzQQApBe7KVg4iLYzYAtfe1nNVYp7 +Plz0Ywja4tHujSSolveanQKZ9Nb5Cb1LrOU3HKPvGn7vXoOzSiywzbiaPTxI4Bjg +SoRpJox8fXa1Getjfr1xHu7dcttAr98epUR8Ae+VRQnq4Cn2BVgx9dGfhdrC8hcO +6effy1Ojlt1BuIqhb1E= +=uAxb +-----END PGP SIGNATURE----- diff --git a/dev-java/fec/fec-1.0.4.ebuild b/dev-java/fec/fec-1.0.4-r1.ebuild similarity index 82% rename from dev-java/fec/fec-1.0.4.ebuild rename to dev-java/fec/fec-1.0.4-r1.ebuild index f30cacd70faf..f6872ea6e658 100644 --- a/dev-java/fec/fec-1.0.4.ebuild +++ b/dev-java/fec/fec-1.0.4-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/fec/fec-1.0.4.ebuild,v 1.3 2010/02/26 12:24:29 ali_bush Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/fec/fec-1.0.4-r1.ebuild,v 1.1 2010/04/10 00:11:02 tommy Exp $ JAVA_PKG_IUSE="doc source" @@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2" LICENSE="as-is" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="hardened" +IUSE="" COMMON_DEPEND="dev-java/log4j dev-java/concurrent-util" @@ -30,10 +30,7 @@ src_unpack() { cd "${S}" || die sed -i -e 's/build.compiler=jikes/#build.compiler=jikes/g' build.properties || die sed -i -e 's/test.lib/lib/g' build.properties || die - epatch "${FILESDIR}"/${P}-libfec8path.patch - pushd src/csrc > /dev/null - epatch "${FILESDIR}/${P}-soname.patch" - popd > /dev/null + epatch "${FILESDIR}"/${P}-{libfec8path,build,soname}.patch eant clean cd lib || die @@ -50,7 +47,7 @@ src_unpack() { src_compile() { java-pkg-2_src_compile cd "${S}"/src/csrc - (use amd64 || use hardened ) && append-flags -fPIC + append-flags -fPIC emake CC=$(tc-getCC) CFLAGS="${CFLAGS} $(java-pkg_get-jni-cflags)" || die } diff --git a/dev-java/fec/files/fec-1.0.4-build.patch b/dev-java/fec/files/fec-1.0.4-build.patch new file mode 100644 index 000000000000..3920dcec4c7d --- /dev/null +++ b/dev-java/fec/files/fec-1.0.4-build.patch @@ -0,0 +1,32 @@ +Index: csrc/Makefile +=================================================================== +--- src/csrc.orig/Makefile ++++ src/csrc/Makefile +@@ -28,11 +28,8 @@ fec8-jinterf.o: fec-jinterf.c + -I$(JAVA_HOME)/include/linux fec-jinterf.c \ + -o fec8-jinterf.o + +-fec8.o: fec.h fec8.S +- $(CC) $(CFLAGS) -DGF_BITS=8 -c -o fec8.o fec8.S +- +-fec8.S: fec.c Makefile +- $(CC) $(CFLAGS) -DGF_BITS=8 -S -o fec8.S fec.c ++fec8.o: fec.h fec.c ++ $(CC) $(CFLAGS) -DGF_BITS=8 -c -o fec8.o fec.c + + libfec16.so: fec16.o fec16-jinterf.o + $(CC) $(LDFLAGS) -shared fec16-jinterf.o fec16.o -o libfec16.so +@@ -42,11 +39,8 @@ fec16-jinterf.o: fec-jinterf.c + -I$(JAVA_HOME)/include/linux fec-jinterf.c \ + -o fec16-jinterf.o + +-fec16.o: fec.h fec16.S +- $(CC) $(CFLAGS) -DGF_BITS=16 -c -o fec16.o fec16.S +- +-fec16.S: fec.c Makefile +- $(CC) $(CFLAGS) -DGF_BITS=16 -S -o fec16.S fec.c ++fec16.o: fec.h fec.c ++ $(CC) $(CFLAGS) -DGF_BITS=16 -c -o fec16.o fec.c + + clean: + - rm -f *.o *.S fec *.so diff --git a/dev-java/fec/files/fec-1.0.4-soname.patch b/dev-java/fec/files/fec-1.0.4-soname.patch index 57fc90026ab4..ae00449ced40 100644 --- a/dev-java/fec/files/fec-1.0.4-soname.patch +++ b/dev-java/fec/files/fec-1.0.4-soname.patch @@ -1,5 +1,5 @@ ---- Makefile.bak 2010-02-27 00:51:38.000000000 +1300 -+++ Makefile 2010-02-27 00:56:06.000000000 +1300 +--- src/csrc/Makefile.bak 2010-02-27 00:51:38.000000000 +1300 ++++ src/csrc/Makefile 2010-02-27 00:56:06.000000000 +1300 @@ -21,7 +21,8 @@ $(CC) $(CFLAGS) -DGF_BITS=8 -o fec fec8.o test.c