Add newer Debian patches. Respect LDFLAGS (bug #337626). Remove empty DEPEND.

Package-Manager: portage-2.2_rc96/cvs/Linux i686

4 files changed, 67 insertions, 85 deletions

diff --git a/app-arch/arj/ChangeLog b/app-arch/arj/ChangeLog
index 243d7e34bb51..6df69e63f123 100644
--- a/app-arch/arj/ChangeLog
+++ b/app-arch/arj/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/arj
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/arj/ChangeLog,v 1.40 2010/03/29 23:43:41 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/arj/ChangeLog,v 1.41 2010/10/14 19:18:57 jer Exp $
+
+*arj-3.10.22-r3 (14 Oct 2010)
+
+  14 Oct 2010; Jeroen Roovers <jer@gentoo.org> -arj-3.10.22-r1.ebuild,
+  +arj-3.10.22-r3.ebuild:
+  Add newer Debian patches. Respect LDFLAGS (bug #337626). Remove empty
+  DEPEND.
 
   29 Mar 2010; Jonathan Callen <abcd@gentoo.org> arj-3.10.22-r2.ebuild,
   +files/arj-3.10.22-darwin.patch, +files/arj-3.10.22-interix.patch:
diff --git a/app-arch/arj/Manifest b/app-arch/arj/Manifest
index 03e4199a9d7a..cbd3e55a65ff 100644
--- a/app-arch/arj/Manifest
+++ b/app-arch/arj/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 001_arches_align.patch 1424 RMD160 582ad74d357523ca99f833b02c4db30fcd6a8aa0 SHA1 7f8904f8c89bacbbeec8c431d627efbb8da2f259 SHA256 63a1f369fd7d23c1132293a75419fa00324b2da0578ab436483f156d43687792
 AUX 002_no_remove_static_const.patch 530 RMD160 f796238452c903213684060adfce196a5910c6b2 SHA1 919a3c02a1e039803502c21175d69f7703d13026 SHA256 4a48bec5bfac3efd9ebeb463a4ce3fdeeac2fd0ebf11eb4b64a6cfc96e25e306
 AUX 003_64_bit_clean.patch 5948 RMD160 755dd1ee9822cbaef43aa29b4c8215d8a97220af SHA1 d506338e34b40ef5cac6ec14c858fd651a354aaf SHA256 6253fdb216a9f617648ee3977f8ab38c376cc029ae55a8414203df3275484db1
@@ -8,17 +5,10 @@ AUX arj-3.10.22-darwin.patch 825 RMD160 b33ca8ab28b6bedb36db29425598ddb3c3bc4454
 AUX arj-3.10.22-glibc2.10.patch 515 RMD160 12a15b266dac3eb33dbd122a19285972be472e53 SHA1 d31bdbb61c96809fae5e0c09411c39c3f80de0fb SHA256 b4b4b4a774620cd9ec79dd26201f4b64cfe7c8f2f117221c0f8091bd35c55508
 AUX arj-3.10.22-implicit-declarations.patch 833 RMD160 df4cc1eb6d5a0d7fd097cd65fdea4f7686c2c3d2 SHA1 86dc2094017698f6a248e31dc828e1c91bc51e0b SHA256 016de0f1ab252081a13bfcc3d73161e2fea87812d7fa3411b3a8fb5608ddf860
 AUX arj-3.10.22-interix.patch 1257 RMD160 fc0cba212e10850f9cf0018f6c7839d7ac0fa3c7 SHA1 280d4794fbe87db719ee5d3ac7659f7dbe7e414a SHA256 167a3a2aa02bd95c346cf0bc859b0c0327901c5616dbd761f83065367c761feb
-DIST arj-3.10.22.tar.gz 431467 RMD160 80f8a1a8cd203f73def8e957d96563a4dba80153 SHA1 e8470f480e9eee14906e5485a8898e5c24738c8b SHA256 589e4c9bccc8669e7b6d8d6fcd64e01f6a2c21fe10aad56a83304ecc3b96a7db
 DIST arj_3.10.22-4.diff.gz 31492 RMD160 9acfb9a3e3a400aedcb27508975d48d1fb02c15c SHA1 b1fa204d904aafca018a8ad18c01af657697e3d5 SHA256 0807ad8d0404fc17e9cf6566d16a92eb2b06afd2cef71e79629e027cab9aec2b
+DIST arj_3.10.22-9.debian.tar.gz 11160 RMD160 f3ebac881e51a50bc5392a92de41f94bec9dacf1 SHA1 6a4ee5109dbae2bdb599fdd9212ae7e8daa54e20 SHA256 3ca3437f48f6a17b6fe3fe9526d2029dc30a1f22d7a5c5df5bb6140b5fe9255a
 DIST arj_3.10.22.orig.tar.gz 431467 RMD160 80f8a1a8cd203f73def8e957d96563a4dba80153 SHA1 e8470f480e9eee14906e5485a8898e5c24738c8b SHA256 589e4c9bccc8669e7b6d8d6fcd64e01f6a2c21fe10aad56a83304ecc3b96a7db
-EBUILD arj-3.10.22-r1.ebuild 1850 RMD160 d7a3aebe7ebc6dfb10977ae6ad7130eaa28e8152 SHA1 659764852df4d07a068c4d61be1911542478dd6e SHA256 0d407718bd2874a7de016b4ef0158ca7dd62ae1314a6cb14a9dacc379558676c
 EBUILD arj-3.10.22-r2.ebuild 1404 RMD160 9d83ecf58b9e3d987da5e9538c922a19c2f649a3 SHA1 6cdb08f8ba58efcf106ce055d5c3ee61a17008be SHA256 02221016f3e8a97ba4ffeaa5b79ee63eec791a6192fe7e149837407eba97a994
-MISC ChangeLog 5426 RMD160 d5af8a79b6328e5213a49649cbb0f019b9278575 SHA1 5d6dab47c33b744da5f0891e0d0c9ca2dc5bf743 SHA256 4cb92221e66ec1e9c08855ee13f474268c9313f10ded791d08160b418d1d9c53
+EBUILD arj-3.10.22-r3.ebuild 1397 RMD160 4eeb5bdabe652edaf42d0fcba997988e3e3cd1e2 SHA1 1ce08b2451daa2fbd0748791449e32eeebddadea SHA256 948c57566b4be19f1924d3d74c8c5b661b0b11179eba8642ec6a97acff8f6688
+MISC ChangeLog 5636 RMD160 14c318978640e0b6a76b9ca07508d0e38ad94358 SHA1 60b22aae9f9a78d69c640bbf3179c7209d741979 SHA256 d643102bd1f0fefe7739d356d438b1a802e0fe53a27278407b9e1a8a28cd0d6e
 MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuxOzUACgkQOypDUo0oQOpzUQCgoZJ7w+SWNFnkYUZVSx8EUPpg
-RvwAn3lMkO4kIz/7R4wu8jV3He5K687P
-=Szzp
------END PGP SIGNATURE-----
diff --git a/app-arch/arj/arj-3.10.22-r1.ebuild b/app-arch/arj/arj-3.10.22-r1.ebuild
deleted file mode 100644
index 9390bbc4e2c6..000000000000
--- a/app-arch/arj/arj-3.10.22-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/arj/arj-3.10.22-r1.ebuild,v 1.11 2009/10/12 16:38:22 halcy0n Exp $
-
-inherit eutils toolchain-funcs autotools
-
-DESCRIPTION="Utility for opening arj archives"
-HOMEPAGE="http://arj.sourceforge.net/"
-SRC_URI="mirror://sourceforge/arj/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc sparc x86 ~x86-fbsd"
-IUSE=""
-RESTRICT="strip"
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}/001_arches_align.patch"
-	epatch "${FILESDIR}/002_no_remove_static_const.patch"
-	epatch "${FILESDIR}/003_64_bit_clean.patch"
-
-	cd "${S}/gnu"
-	eautoreconf
-}
-
-src_compile() {
-	if [ -x /usr/sbin/gcc-config ]
-	then
-		# Do we have a gcc that use the new layout and gcc-config ?
-		if /usr/sbin/gcc-config --get-current-profile &> /dev/null
-		then
-			export GCC_PROFILE="$(/usr/sbin/gcc-config --get-current-profile)"
-
-			# Just recheck gcc version ...
-			if [ "$(gcc-version)" != "3.2" ] && [ "$(gcc-version)" != "3.3" ]
-			then
-				# See if we can get a gcc profile we know is proper ...
-				if /usr/sbin/gcc-config --get-bin-path ${CHOST}-3.3.4 &> /dev/null
-				then
-					export PATH="$(/usr/sbin/gcc-config --get-bin-path ${CHOST}-3.3.4):${PATH}"
-					export GCC_PROFILE="${CHOST}-3.3.4"
-				else
-					eerror "This build needs gcc-3.2 or gcc-3.3!"
-					eerror
-					eerror "Use gcc-config to change your gcc profile:"
-					eerror
-					eerror "  # gcc-config $CHOST-3.3.4"
-					eerror
-					eerror "or whatever gcc version is relevant."
-					die
-				fi
-			fi
-		fi
-	fi
-
-	cd "${S}/gnu"
-	econf || die
-
-	cd "${S}"
-	make prepare || die "make prepare failed"
-	make package || die "make package failed"
-}
-
-src_install() {
-	cd "${S}/${CHOST#*-*-}/en/rs/u"
-	dobin bin/* || die
-	dodoc doc/arj/* "${S}/ChangeLog"
-}
diff --git a/app-arch/arj/arj-3.10.22-r3.ebuild b/app-arch/arj/arj-3.10.22-r3.ebuild
new file mode 100644
index 000000000000..c4fea3c64e81
--- /dev/null
+++ b/app-arch/arj/arj-3.10.22-r3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/arj/arj-3.10.22-r3.ebuild,v 1.1 2010/10/14 19:18:57 jer Exp $
+
+EAPI=3
+
+inherit autotools eutils toolchain-funcs
+
+PATCH_LEVEL=9
+
+DESCRIPTION="Utility for opening arj archives"
+HOMEPAGE="http://arj.sourceforge.net"
+SRC_URI="mirror://debian/pool/main/a/arj/${P/-/_}.orig.tar.gz
+	mirror://debian/pool/main/a/arj/${P/-/_}-${PATCH_LEVEL}.debian.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE=""
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-implicit-declarations.patch \
+		"${FILESDIR}/${P}-glibc2.10.patch"
+
+	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
+		epatch "${WORKDIR}"/debian/patches
+
+	epatch "${FILESDIR}"/${P}-darwin.patch
+	epatch "${FILESDIR}"/${P}-interix.patch
+
+	cd gnu
+	eautoconf
+}
+
+src_configure() {
+	cd gnu
+	CFLAGS="${CFLAGS} -Wall" econf
+}
+
+src_compile() {
+	sed -i -e '/stripgcc/d' GNUmakefile || die "sed failed."
+
+	ARJLIBDIR="${EPREFIX}/usr/$(get_libdir)"
+
+	emake CC=$(tc-getCC) libdir="${ARJLIBDIR}" \
+		ADD_LDFLAGS="${LDFLAGS}" \
+		pkglibdir="${ARJLIBDIR}" all || die "emake failed."
+}
+
+src_install() {
+	emake pkglibdir="${ARJLIBDIR}" \
+		DESTDIR="${D}" install || die "emake install failed."
+
+	dodoc doc/rev_hist.txt
+}