Add patch to prevent deleting built files in the install phase

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

4 files changed, 37 insertions, 13 deletions

diff --git a/net-im/amsn/ChangeLog b/net-im/amsn/ChangeLog
index ba4ef0be7437..2b4aca1af4c0 100644
--- a/net-im/amsn/ChangeLog
+++ b/net-im/amsn/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/amsn
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/amsn/ChangeLog,v 1.119 2012/05/29 12:12:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/amsn/ChangeLog,v 1.120 2012/05/29 14:31:36 tester Exp $
+
+  29 May 2012; Olivier Crête <tester@gentoo.org> amsn-0.98.9.ebuild,
+  +files/amsn-0.98.9-no-rebuild-on-install.patch:
+  Add patch to prevent deleting built files in the install phase
 
   29 May 2012; Agostino Sarubbo <ago@gentoo.org> amsn-0.98.9.ebuild:
   Stable for amd64, wrt bug #415861
diff --git a/net-im/amsn/Manifest b/net-im/amsn/Manifest
index 1b7c283ff200..89f21a56015a 100644
--- a/net-im/amsn/Manifest
+++ b/net-im/amsn/Manifest
@@ -1,24 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX amsn-0.98-noautoupdate.patch 1371 RMD160 ea2b1ca3dfda02b07be649973d273ec0eccb53a1 SHA1 6d472886ab0d9a218000f17bdcbf4fc143a37baa SHA256 e4ffbe486dd48b72e8a5fda212c76a800b760e2b9dab22c34df280cb544274af
 AUX amsn-0.98.4-amsnplus-ldflags.patch 452 RMD160 54d0f8c4cfc5b13e225d9fbd3426ad3d5a928613 SHA1 6d9dd12ec2bd2cc35f5e3effa74b00f7405f05ef SHA256 8c91329a99585153e353cfef73601b073337fc2306adeed0725fa7c1e2dccb6b
 AUX amsn-0.98.4-libpng15.patch 16533 RMD160 52e068036a76805218663ee4cf4726a59806f30e SHA1 1f048d24dc52bdb8efbecfb275d64717903e5829 SHA256 4b13cf0e00978f72323790ea872a331241145ab4a9ac8649d25a4d07cbe2bab9
 AUX amsn-0.98.4-v4l2.patch 850 RMD160 8657bd6e05cb42ebc702e9863274a4755878bb57 SHA1 0838d1e15953cf413351c36fdfcc9e2ee88e709c SHA256 67b2e5c212ba91c5dedb4e82a14cf53ea6f1aa81dd1de879953f8378d66bbbe4
+AUX amsn-0.98.9-no-rebuild-on-install.patch 656 RMD160 4c675b298ea816439d8c4cb196c57156c7ef04ae SHA1 94fd753018be3a2c77131deeb41efef7994a9c12 SHA256 3e8b246a5658f22cae3902336e5395b41cdde3f723b97ce1e82217d1f1d0077e
 DIST amsn-0.98.4-src.tar.bz2 13513233 RMD160 8e0c3bdde902540fe759b01978447cc60d8fbeb3 SHA1 e00761c945ad47e0b715c69f1f9f18f5a4bf287c SHA256 7aa11a7199b4cda5e814493dd160915ab4c4f96c04de2c1fe7c2fe23eeaba871
 DIST amsn-0.98.9-src.tar.bz2 13520050 RMD160 adae4930acd13cef8a8521740d6397ef499ab37b SHA1 3c389dacb33d96b6e7a0edf218319f5384b69ee3 SHA256 1fd2620489cc3627a841773a79cf28a7c9c438979c76d37f231a773a79e7f23e
 EBUILD amsn-0.98.4-r1.ebuild 2259 RMD160 d19aa10040d17d29a5b74a40b2f7974aafba4052 SHA1 b10c9582f8d6151ed0caebe17181a0bc8fae1328 SHA256 62399abb48dd0bd10e6365e0a914b732cc8029a97ad00b71ad88e230e3cf0cea
-EBUILD amsn-0.98.9.ebuild 2256 RMD160 0d1a3048eaeda31d926c7f43bf9813d58e36ed2e SHA1 4939edc0fb58fa352f6245596d09716419dc440b SHA256 0a6adee1cf179e27d05455050ca59fa2051d0b272ebbb88ca36eb77ee71f1728
-MISC ChangeLog 15162 RMD160 a37ce948c8daf773483c544701e2240d58773dde SHA1 41e9a8947d9a08aac5bdb241d8af01fd2056b2ec SHA256 c0bfbed13e1ae63332eabb2af2c4bf0b746af073d46b6764279ca1f8d6886f8f
+EBUILD amsn-0.98.9.ebuild 2318 RMD160 a4e348f9e90dc460b80a4e5d9147965cb6d8d74b SHA1 5bdbf6bc0919abad5a0476dc0fb8c71eac6bad9a SHA256 cfd5cd48572f6377f804fb4cb2a550b2017604a1132cb6815d6f9d669c2313d3
+MISC ChangeLog 15351 RMD160 e8feeec112d3cc1d4e39da46a8530843955260c2 SHA1 d1df0757506cc4a7bf7a0ddd1bc6ad3176cff9bb SHA256 4ba392225729d8472bf3b5c36ebf7a1dd7d02d059745ab41afaccf39057eb85a
 MISC metadata.xml 228 RMD160 d75298dd38147e4c60991454366d6d9cc14985bb SHA1 9f2cadd0fee8f845e833c429f3e6d3a4e2a207b4 SHA256 0ca6e1352c0e4284a99ed8f0267b6835a5e33e2d8b94a08f1af6ad58fd72d942
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPxL0gAAoJEOTDgjZ80txdPmsH/3dFVv+wzHyOvbZBr1q5F+q/
-+RrPhdiMZXY6ELoV5DtAW0tDemO6qmp/W5OZyiG9SwvzZVeLkUN772q9D8+wIfEN
-kp1iTKYu73INBSXDgqGxLjrH4va/KaZWIZ+a+4nXk9tgiFh9BowHCDsaThHr8gIC
-JFhy2Ri2a+eU6oYJMzItO/FkfdvYJP1X/rmEHGrhXrttBo+c4C+mVrZGdaYWKeDf
-WytQLlDRJtAd3suv4dTg7oiAQ/sU8qTVCSkTDcjsbUam0OwQnWUH8iYT2JvY0ypZ
-wO0GfUsTlmiUQrE3C0O6Z87cro0eb0EtoP0lccUP1Bfh4w8GX7vsItLpZ6P0Vkw=
-=SI3L
+iEYEARECAAYFAk/E3dAACgkQmOfEJZHYOKf94wCbBaKLhmSKkDFPEnY/PWX70lCd
+N1QAn2ev/tItADDw5CfIBsY7wC4eIiwC
+=DjGp
 -----END PGP SIGNATURE-----
diff --git a/net-im/amsn/amsn-0.98.9.ebuild b/net-im/amsn/amsn-0.98.9.ebuild
index 0baf30ac38cd..1ead98abb5b6 100644
--- a/net-im/amsn/amsn-0.98.9.ebuild
+++ b/net-im/amsn/amsn-0.98.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/amsn/amsn-0.98.9.ebuild,v 1.5 2012/05/29 12:12:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/amsn/amsn-0.98.9.ebuild,v 1.6 2012/05/29 14:31:36 tester Exp $
 
 EAPI=4
 inherit autotools eutils fdo-mime gnome2-utils toolchain-funcs
@@ -46,7 +46,8 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-0.98-noautoupdate.patch \
 		"${FILESDIR}"/${PN}-0.98.4-v4l2.patch \
-		"${FILESDIR}"/${PN}-0.98.4-amsnplus-ldflags.patch
+		"${FILESDIR}"/${PN}-0.98.4-amsnplus-ldflags.patch \
+		"${FILESDIR}"/${PN}-0.98.9-no-rebuild-on-install.patch
 
 	# only portage should strip files, bug 285682
 	sed -i -e "s/LDFLAGS += -s/LDFLAGS += /" Makefile.in || die "sed failed"
diff --git a/net-im/amsn/files/amsn-0.98.9-no-rebuild-on-install.patch b/net-im/amsn/files/amsn-0.98.9-no-rebuild-on-install.patch
new file mode 100644
index 000000000000..ab351bd51014
--- /dev/null
+++ b/net-im/amsn/files/amsn-0.98.9-no-rebuild-on-install.patch
@@ -0,0 +1,22 @@
+--- trunk/amsn/Makefile.in	2012/05/18 19:28:05	12371
++++ trunk/amsn/Makefile.in	2012/05/28 19:41:51	12400
+@@ -259,7 +259,9 @@
+ 
+ 	ln -sf $(dstdir)/$(PACKAGE)/desktop-icons/48x48/apps/amsn.png $(DESTDIR)$(dstdir)/pixmaps/
+ 
+-install_libs:: rebuild_libs do_install_libs
++install_libs:: clean_libs
++	$(MAKE) rebuild_libs
++	$(MAKE) do_install_libs
+ 
+ do_install_libs:: $(LIBS_TO_INSTALL)
+ 	rm -Rf $(DESTDIR)$(libdir)/$(PACKAGE)
+@@ -276,7 +278,7 @@
+ 
+ rebuild_libs: RPATH+=$(libdir)/$(PACKAGE)
+ rebuild_libs: LIBDIR=$(libdir)/$(PACKAGE)
+-rebuild_libs: clean_libs $(LIBS_WITH_RPATH)
++rebuild_libs: $(LIBS_WITH_RPATH)
+ 
+ uninstall::
+ 	rm -Rf $(dstdir)/$(PACKAGE)