Respect CFLAGS, LDFLAGS, bug #240026, thank Diego E. 'Flameeyes' Pettenò for report.

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

4 files changed, 12 insertions, 31 deletions

diff --git a/app-misc/fdupes/ChangeLog b/app-misc/fdupes/ChangeLog
index 83032dec5835..4872729a8ea8 100644
--- a/app-misc/fdupes/ChangeLog
+++ b/app-misc/fdupes/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/fdupes
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/fdupes/ChangeLog,v 1.26 2008/11/12 21:47:18 ranger Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/fdupes/ChangeLog,v 1.27 2009/01/27 08:41:55 pva Exp $
+
+  27 Jan 2009; Peter Volkov <pva@gentoo.org> -fdupes-1.40.ebuild,
+  fdupes-1.40-r3.ebuild:
+  Respect CFLAGS, LDFLAGS, bug #240026, thank Diego E. 'Flameeyes' Pettenò
+  for report.
 
   12 Nov 2008; Brent Baude <ranger@gentoo.org> fdupes-1.40-r3.ebuild:
   stable ppc64, bug 237828
diff --git a/app-misc/fdupes/Manifest b/app-misc/fdupes/Manifest
index c49f5d169c96..1afaa91c9441 100644
--- a/app-misc/fdupes/Manifest
+++ b/app-misc/fdupes/Manifest
@@ -1,7 +1,6 @@
 AUX fdupes-1.40-external-md5sum-quotation.patch 501 RMD160 0e0b49c6ab776e73f3cffd0908f0999c446a8e72 SHA1 17c79d78db68e236db7666696557944aaad48243 SHA256 b7793ba36f71e1037375e96aee95b525e0c57b49d9bd3274d5c10626ad3bc841
 AUX fdupes-1.40-memcpy.patch 404 RMD160 3eb921066e968f8616b2425d0c327b4da1b2a22e SHA1 0f253ff9995edd7afb06a835ac3c1e8823202761 SHA256 fab0d75c156101524e105902a488de4bcebdec415c2dfa6cec596b757cb576d4
 DIST fdupes-1.40.tar.gz 16026 RMD160 0abd2f0dfee38cb333c1069363a65f8ab37e18dd SHA1 e1bce9bdf50d7bf700dda3eb8a3d218b181b3931 SHA256 e1ed91c44bf4a08de9a92cb019c20420874fdeed49a56e8f270ad7fc26bbdde7
-EBUILD fdupes-1.40-r3.ebuild 1034 RMD160 a167896e394ad6ab3cc36a45e05cd544d7eb9fba SHA1 05a35f13192621e26bba3b50edb236fb58304246 SHA256 f5cc52f57a331f2f90dc681e2aedc6714c59ca1d4e8a99c9f73e9437cc291175
-EBUILD fdupes-1.40.ebuild 667 RMD160 3d51c2cada79331ddbf53e86edd38e8fcfec2866 SHA1 42aa0c59e09c28b048cfcf9f549fd8344c3e28c4 SHA256 d7444eae71d07bf752f34e35aab9770da0ac8de04eda0593b51d7142517857f5
-MISC ChangeLog 3104 RMD160 5a8de33b2ff0855adf611f3c9a5599d4f7fbbf44 SHA1 11e9d4d5aaf4b60400b1fbe734a16ea555cea7b9 SHA256 8d73f97ed0ce5406ef2635551e7ca9dcd622bc0e357842a9ce35183dff446928
+EBUILD fdupes-1.40-r3.ebuild 1097 RMD160 e326c158b49620e0b8b0cdfd3c9a8234ac649f78 SHA1 16618fc43382585bdf5642dd4ed371815dbf82ca SHA256 4a643ce74157e50dc42c98b5c9c53f3a46f0460de7b96bba9e7ddc43e9867347
+MISC ChangeLog 3283 RMD160 4e13e9ad8fdf9fd8342b6ead28c28f484240196a SHA1 ccbd8d625b6a8d20e44613cf497afa802c59bb04 SHA256 114d41ffd8f4c3ee9260946bfb2fd5ac8d5374b0c3104ae24387939699fef387
 MISC metadata.xml 282 RMD160 0addf414937c807aed4272638129c7a77ef84d1e SHA1 54b1a28038a54e30507143e1974b043213d294dd SHA256 3acb9f2c77ca228e238de954252e9e42644263ff549565bdf268340f0e45a21f
diff --git a/app-misc/fdupes/fdupes-1.40-r3.ebuild b/app-misc/fdupes/fdupes-1.40-r3.ebuild
index a47a24a639ff..1d12ab081015 100644
--- a/app-misc/fdupes/fdupes-1.40-r3.ebuild
+++ b/app-misc/fdupes/fdupes-1.40-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/fdupes/fdupes-1.40-r3.ebuild,v 1.10 2008/11/12 21:47:18 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/fdupes/fdupes-1.40-r3.ebuild,v 1.11 2009/01/27 08:41:56 pva Exp $
 
 inherit eutils toolchain-funcs
 
@@ -25,6 +25,7 @@ src_unpack() {
 		sed -i -e 's/^#EXTERNAL_MD5[[:blank:]]*= /EXTERNAL_MD5 = /g' \
 					Makefile || die "sed failed"
 	fi
+	sed -e 's/-o fdupes/${CFLAGS} ${LDFLAGS} -o fdupes/' -i Makefile
 }
 
 src_compile() {
diff --git a/app-misc/fdupes/fdupes-1.40.ebuild b/app-misc/fdupes/fdupes-1.40.ebuild
deleted file mode 100644
index 97782ed8d99a..000000000000
--- a/app-misc/fdupes/fdupes-1.40.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/fdupes/fdupes-1.40.ebuild,v 1.12 2005/04/21 19:11:28 blubb Exp $
-
-DESCRIPTION="identify/delete duplicate files residing within specified directories"
-HOMEPAGE="http://netdial.caribe.net/~adrian2/fdupes.html"
-SRC_URI="http://netdial.caribe.net/~adrian2/programs/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-DEPEND=""
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	dobin fdupes || die
-	doman fdupes.1
-	dodoc CHANGES CONTRIBUTORS INSTALL README TODO
-}