Bump the Debian patch set. Replace the Makefile patch with a compatible set of sed scripts. Respect LDFLAGS. Do not patch lib/Makefile since we do not use it. Do not install INSTALL. Properly use EAPI=2.

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

3 files changed, 26 insertions, 16 deletions

diff --git a/app-text/an/ChangeLog b/app-text/an/ChangeLog
index 91ccf1727e90..c6cc6f11be7c 100644
--- a/app-text/an/ChangeLog
+++ b/app-text/an/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/an
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/an/ChangeLog,v 1.26 2009/03/18 20:02:59 jer Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/an/ChangeLog,v 1.27 2010/06/27 20:34:25 jer Exp $
+
+*an-0.95.3.2 (27 Jun 2010)
+
+  27 Jun 2010; Jeroen Roovers <jer@gentoo.org> -an-0.95.3.1.ebuild,
+  +an-0.95.3.2.ebuild:
+  Bump the Debian patch set. Replace the Makefile patch with a compatible
+  set of sed scripts. Respect LDFLAGS. Do not patch lib/Makefile since we do
+  not use it. Do not install INSTALL. Properly use EAPI=2.
 
 *an-0.95.3.1 (18 Mar 2009)
 
diff --git a/app-text/an/Manifest b/app-text/an/Manifest
index 34054cc675fc..9d312ee8c39e 100644
--- a/app-text/an/Manifest
+++ b/app-text/an/Manifest
@@ -1,8 +1,8 @@
 AUX an-0.95-make.patch 807 RMD160 dca29995e857aee472777afd6f31ed1e25663488 SHA1 fcbdb01095bbac1b75fb52ca806f8195a680f654 SHA256 a964b39f30e1d5f6263968f24c603acb0525e6a152703ce32c534fc50ebf0580
 AUX an_0.95-3.diff 9803 RMD160 cc567e20cce82dd7e45cbb741a07bad8d95c2e96 SHA1 ce1d798aac40edef804fee77e33a356ac879a655 SHA256 fbb795b791b423e0d9b1b4a68255e57dec3db8926687b942df77f6166ba0bbd3
-DIST an_0.95-3.1.diff.gz 5114 RMD160 24ecac7359eefd61e0cd60bb8088f020d248c62b SHA1 491191d2cce4f860477c41e508e31df5f441f3f0 SHA256 13480915e7c977e4e48960bf604b6f8add4450d4695c2968e824178c1e159042
+DIST an_0.95-3.2.diff.gz 5530 RMD160 213fa4a424fec5039af18d82b76311b10ff0bc38 SHA1 c7de943fb51376dd477b4283138a6f04e4c336ea SHA256 6b0b7a42f39abac072e5a20aa1f13e616b46e97a37dc3d6baa6af5416e1ab009
 DIST an_0.95.orig.tar.gz 47829 RMD160 eec61214eaf3f3ab0666cec4a146ed37e7e96263 SHA1 930ce6f737da315597f01b46f74c60b2bb6639bf SHA256 11266dd1e347594d98f8dfd1e141d8b4fbe067752542d0e93c422c4789f9295c
-EBUILD an-0.95.3.1.ebuild 1662 RMD160 842fffcaecd41ba623107bd14ac952ac8f0a07ea SHA1 9aacb4756f71745711ec0a3c105cc23bff899731 SHA256 749da23427bb914eed56fbd024ab54ee18beab8c4416b124936f8a7fab42aede
+EBUILD an-0.95.3.2.ebuild 1824 RMD160 9564e4cbf2b67836eb88c55109e171b27df62557 SHA1 83c69d7c7acb760462b5d2ae765c5c40ea336e82 SHA256 7ac069d6b5ea6278e9abd7b6edba0b6dda780a40cdf552396f2f9759b8629af9
 EBUILD an-0.95.3.ebuild 1586 RMD160 a6007ec360cd6473ea6556fb1ac272cba969e7b6 SHA1 8d0c5cfd36bb51b439ef01d467c83d391ef02e06 SHA256 a3369999bcc0e514fbc9a8391a07e6eae898bab1972243e1d1d5fd6f1498a875
-MISC ChangeLog 3331 RMD160 0d24589e2dc035ea75e242a70f3b73299ff08f53 SHA1 39e05959da6f5a18f3ebdb871526ad815a4fcc83 SHA256 f7bbcda40188b125b34904f31cd13cf6778fbe96f271c321f89d61259a7a8c24
+MISC ChangeLog 3661 RMD160 1217f9e9b81fda05074755bb1cf633b83fff075b SHA1 72d84f26891e914ebb8f582607b4e16c1086cb91 SHA256 909d4f02386485810c6e128a7faa3dc604d4eca547c7f875f461442d7c24182d
 MISC metadata.xml 360 RMD160 22be39fe77465ec8805ee3e6fc9218f75ae8089b SHA1 08b31da7c491295e9c5c7d6062c888f7db7d84d1 SHA256 1adab811286ade1a38f27e34473bea71fbf07e62c9ba10663f8fd8651bb72ddc
diff --git a/app-text/an/an-0.95.3.1.ebuild b/app-text/an/an-0.95.3.2.ebuild
index e7f633086ac4..2ca0cecd6aa4 100644
--- a/app-text/an/an-0.95.3.1.ebuild
+++ b/app-text/an/an-0.95.3.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/an/an-0.95.3.1.ebuild,v 1.1 2009/03/18 20:02:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/an/an-0.95.3.2.ebuild,v 1.1 2010/06/27 20:34:25 jer Exp $
 
 EAPI="2"
+
 inherit eutils toolchain-funcs versionator
 
 DESCRIPTION="Very fast anagram generator with dictionary lookup"
@@ -24,23 +25,25 @@ RDEPEND="sys-apps/miscfiles[-minimal]"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
+src_prepare() {
 	MY_PL="$(replace_version_separator 2 -)"
 	epatch "${WORKDIR}"/${PN}_${MY_PV}-${DEB_REV}.diff
-	epatch "${FILESDIR}"/${PN}-${MY_PV}-make.patch
 
 	# sys-apps/miscfiles doesn't have /usr/dict/words:
-	sed \
+	sed -i README \
 		-e 's:/usr/dict/words:/usr/share/dict/words:' \
-		-i README || die "sed failed"
+		|| die "sed README failed"
+	sed -i Makefile \
+		-e 's|^CC=gcc|#CC=gcc|g' \
+		-e 's|^CFLAGS=-O2|CFLAGS := $(CFLAGS)|g' \
+		-e 's|$(CC) $(CFLAGS)|$(CC) $(CFLAGS) $(LDFLAGS)|g' \
+		-e 's|&& make|\&\& $(MAKE)|g' \
+		|| die "sed Makefile failed"
 }
 
 src_compile() {
 	tc-export CC
-	emake || die "make failed"
+	emake LDFLAGS="${LDFLAGS}" || die "emake failed"
 }
 
 src_install() {
@@ -52,7 +55,6 @@ src_install() {
 		DICTIONARY \
 		EXAMPLE.ANAGRAMS \
 		HINTS \
-		INSTALL \
 		README \
 		TODO || die
 }