Revision bump: EAPI 5, respect LDFLAGS, wrt bug #334833, drop old revision. Thanks to Diego Elio Pettenò for discovering this issue

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

4 files changed, 46 insertions, 22 deletions

diff --git a/sys-libs/libtrash/ChangeLog b/sys-libs/libtrash/ChangeLog
index 7aaeed5fd448..4857907dfe03 100644
--- a/sys-libs/libtrash/ChangeLog
+++ b/sys-libs/libtrash/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-libs/libtrash
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtrash/ChangeLog,v 1.16 2013/02/25 20:45:09 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtrash/ChangeLog,v 1.17 2013/02/25 21:22:46 pinkbyte Exp $
+
+*libtrash-3.2-r1 (25 Feb 2013)
+
+  25 Feb 2013; Sergey Popov <pinkbyte@gentoo.org> -libtrash-3.2.ebuild,
+  +libtrash-3.2-r1.ebuild, +files/libtrash-3.2-ldflags.patch:
+  Revision bump: EAPI 5, respect LDFLAGS, wrt bug #334833, drop old revision.
+  Thanks to Diego Elio Pettenò for discovering this issue
 
   25 Feb 2013; Sergey Popov <pinkbyte@gentoo.org>
   files/libtrash-3.2-gentoo.patch:
diff --git a/sys-libs/libtrash/Manifest b/sys-libs/libtrash/Manifest
index 0410fc3211eb..fe0bfc291c87 100644
--- a/sys-libs/libtrash/Manifest
+++ b/sys-libs/libtrash/Manifest
@@ -3,18 +3,19 @@ Hash: SHA256
 
 AUX cleanTrash.cron 200 SHA256 0e92799b07c64b0f0b372b598704a1f8506dd2408dedcd46c8931d2687b127f2 SHA512 39d3480c7141c01656660f3d3ee517d5740bc7c61a96681f7b28053571602c97edcd65024343046afff1ad56411f23ea0b1f1e0ffd0bcb1ba98675ea9f470840 WHIRLPOOL 6c823c7cc2e52fd519801e84d84ed4c6f49c52fc39e6de2ff5770d36f9a96361f3f8a191eb953657aec76147f0ce31df5730af798b4e54fc32b34f78416e04ee
 AUX libtrash-3.2-gentoo.patch 2586 SHA256 bd19abfce8346dfa7a07362b08ec688d7fc856d7aed531c1b146280794761eee SHA512 77d5a8f81a4caca73653ae5a83436273299b55137d2dafafdcc5162c30f552a12b4cf1999f68c1e75ff282d7fe5c7ef91d91d97fa63c7bc806f6da431c835cbc WHIRLPOOL 4cad54e2a3e7928c41e514b28c1af1c0c2df8f5275ca20bf15f96b318001850a4617e01bd6fe2b0a04b6907c88f882dd4eb816b0527f1d6bd4f2be4d9aeb4060
+AUX libtrash-3.2-ldflags.patch 476 SHA256 38f62857dc3a01ceaefcc34a90a58c2327478be0fc9d914864c67dd156b1e227 SHA512 ca7bda8cbfe1ef3f910a8a53a8d3aeef757ea024a5ba94e9a8ea160325bf62563f1a8988b1f3e8f14f1f8d486a5b9618aa4f2da2ad99a857d16b51496b51de18 WHIRLPOOL cfaa17864c4b3023ba0bda9d02ef34d5ea0bb34fa01481e9f7046c5d99013d10f51bb85840fd4781a3a308154310b24d9f72676afdd0c550ba903386b497d78f
 DIST libtrash-3.2.tgz 98138 SHA256 c1bb4b941ed0eef29f9acf9f4101f8695bdb49763f80ed41647b01063d6e946f SHA512 b79d26f8414016044de36359fc98b261dd850a550003d13bf910be7ab5faad42820c4c7f06be6fd5aad34f9aacd0e234ee24d72d43b37eb80d69b197b25442cd WHIRLPOOL 1ede1936d6e41a1a7097e8980f9dcbc76180cb0c43ed52bb876c66ad1eea707e05c6e0a400c9503465f4950daf72714e6ef2c276ebca318b92d9cb1e282e49a3
-EBUILD libtrash-3.2.ebuild 1714 SHA256 ca9c5d8d26e562407276098c1a5076c667e2093d3410bdb1f530a80fe5599389 SHA512 02b226cddf10db185db097d5ef62e1fe0bf62a25a2b7c685096a9661708fb29159a2deaefa4660fae4baa5e28dffb98ecdb853265752e6d53971d79aa80055f4 WHIRLPOOL 6c6c81388069ee14d2aa9c525b230be8125c1c8561c11e208bb767364bdff792b9ff02199779f73ff8f14d8876ed87d585764c4d5763ff2ccafbc0aa9bb55bae
-MISC ChangeLog 2131 SHA256 e7529239adcd19d12f6e3a2bb102ee793260e292dd131339e2f412ea5daa1a19 SHA512 935f9de1e162cee74a41ad179f12f10d3dba1d4fb5ab14d7dcca8cf053f6875627e88f6d3093ac0f037447a20ef8404f5dbd3496132e6ab10027ea1bf1c301dc WHIRLPOOL 9abbb9406e1435231989651df116a8b2e710d28c93ca98c9325fe799526e197ac45053e36a1cc782604c457066c7dc717fa2a7a8e78d0c55d1779dfbb9df0e83
+EBUILD libtrash-3.2-r1.ebuild 1783 SHA256 6f40296521a64345dbfa781ef2f64154a7d2b212202ebbc74abfb460b19e689d SHA512 834d16e01dc50b7b90448c81229db84a519d55aac7d295e2a551f1392be9a3dbf04fee945af92a89529d326bd16f562b13b51b6487770aee9565ddee85b904b0 WHIRLPOOL 4376f11bb171274d30fa65fd1f336ab1ca1ce830485966b50b0a4c7548d835bc55763be14e5f1d564e9e32e9edba6e9301fcb43cb422a5b431741b5a40347054
+MISC ChangeLog 2435 SHA256 9f27531f544a39bf1d86182e95365e4e3ed2523b547716551a1d63ab6d69b2d9 SHA512 8d41661025dfead03018a62e414757d2a89ef843e06cda47b1eedad6c85d088f59123f6318722839f43efc735d4a8f18a5e67b553b5cf261db5df8d271107f20 WHIRLPOOL 7c2e677efc3fe711a7d837ac8e1b502052b3a1fa33207ac0e8756dcb69506c986f1996a9341517355fdd3b71f955423f141c7e67b7d185ec981d67e4b140f5ba
 MISC metadata.xml 210 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39 SHA512 4554adeece55ce9adfdadba04443a3ede6ff910b96a11b77bb1f07ddd6bdbc756b8e6e1873660f8f54e67f46db1065980794a6136c6de7883b24d0ee13ff51fe WHIRLPOOL f546bd1233d5a9934ba0480881ceba944cb8ff1869c12ed2421d4ccbb247ee38dc0c7c8b979f10533ad0fc603b5e4829d0ddf174a83d0bda8e8dd62c1c873eeb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRK81VAAoJECo/aRed9267Y4kIAIGTUcxQ3mv/CJGxSp83xMwj
-msXFVNDYDVBGYFtSyXzUuUuW+3Z9zM8cs3qMGVlKtTCC81q4rF8bQtzVb/7KzME6
-iMu/LKgOcARDASj1k7d/FkRU479OIrSA2u5rM7sC23fSoMBCa6Eb9AGaxtGZwEAY
-Wwbd/iXp9tIQ1LpiY6Q2DjLpqZE63xNiPdqMOQsDVrF1O90dHeRn3CNwjjSu4702
-z1efzZyrD5C9xCCAPZ4go9odKQbbcMLbnxWdlRx6SZ7V13md1gbJm6z2zg2ZpcpD
-jIPUV/5N05EUywbL45j0xKHcS2rnCifVNB97VSdT1R9QAUdjqPundntI0Ub8t0E=
-=yoUr
+iQEcBAEBCAAGBQJRK9YmAAoJECo/aRed9267Y/AIAJ1mbxUXx9H30pfc9/Fi454v
+XneX9Ea+sP65g4ERDl4Z1BEqiuUn5TZ3t507f0eWs636KyRvCv4iWzoOwn5K4Q55
+mohXh21biq0C6arksfmvxCKXFauJeknYEEZtkrFex+J2LEDrWLhX5GKfrM1mNQPh
+tWop6Pd7lX0tLmnEexzbwDpxDYH6KE3qMpsVyfUH5GG+LkWUYfaf1dLJSPXig7LG
+KDz72ZFdS5JOVZug8Z6F04nqXbWtkrC9PNgQ2nMCxmfwmSzTFh64cAz+Fj9N5vdB
+Pfep3Q95MKrmcD8AICkg2wsyl69iS/po04zfFRzpUeJbP1vUQtWJJPMKi1rh1xw=
+=PE5P
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libtrash/files/libtrash-3.2-ldflags.patch b/sys-libs/libtrash/files/libtrash-3.2-ldflags.patch
new file mode 100644
index 000000000000..b8c3917132a6
--- /dev/null
+++ b/sys-libs/libtrash/files/libtrash-3.2-ldflags.patch
@@ -0,0 +1,11 @@
+--- src/Makefile.orig	2013-02-26 01:16:14.367046358 +0400
++++ src/Makefile	2013-02-26 01:16:26.054046729 +0400
+@@ -28,7 +28,7 @@
+ 	python ../scripts/get_symbol_versions.py
+ 	rm -f linking-helper
+ 	perl -w ../scripts/genconf.pl
+-	$(CC) $(CFLAGS) $(SRC) -nostartfiles -shared -fPIC -Wl,-soname,libtrash.so.${MAJOR} \
++	$(CC) $(CFLAGS) $(SRC) -nostartfiles -shared -fPIC $(LDFLAGS) -Wl,-soname,libtrash.so.${MAJOR} \
+         -o libtrash.so.${VERSION} -ldl
+ 
+ install-libtrash: 
diff --git a/sys-libs/libtrash/libtrash-3.2.ebuild b/sys-libs/libtrash/libtrash-3.2-r1.ebuild
index a1564eb7626c..a431111164ce 100644
--- a/sys-libs/libtrash/libtrash-3.2.ebuild
+++ b/sys-libs/libtrash/libtrash-3.2-r1.ebuild
@@ -1,38 +1,43 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtrash/libtrash-3.2.ebuild,v 1.1 2008/12/30 01:33:22 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libtrash/libtrash-3.2-r1.ebuild,v 1.1 2013/02/25 21:22:46 pinkbyte Exp $
 
-inherit eutils toolchain-funcs
+EAPI=5
 
-DESCRIPTION="provides a trash can by intercepting certain calls to glibc"
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Provides a trash can by intercepting certain calls to glibc"
 HOMEPAGE="http://pages.stern.nyu.edu/~marriaga/software/libtrash/"
 SRC_URI="http://pages.stern.nyu.edu/~marriaga/software/libtrash/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
 DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	sed -i -e "/^INSTLIBDIR/s:local/lib:$(get_libdir):" src/Makefile || die
+	unpack "${A}"
 
 	# now let's unpack strash too in cash anyone is interested
-	cd cleanTrash
+	cd "${S}/cleanTrash" || die "cd failed"
 	unpack ./strash-0.9.tar.gz
 }
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch "${FILESDIR}/${P}-ldflags.patch" # bug 334833
+	sed -i -e "/^INSTLIBDIR/s:local/lib:$(get_libdir):" src/Makefile || die "sed on Makefile failed"
+}
+
 src_compile() {
-	emake CC="$(tc-getCC)" || die "Error Making Source...Exiting"
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
 	dodir /etc /usr/$(get_libdir)
-	emake DESTDIR="${D}" install || die "Error Installing ${P}...Exiting"
+	emake DESTDIR="${D}" install
 
 	dosbin cleanTrash/ct2.pl
 	exeinto /etc/cron.daily