summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Crête <tester@gentoo.org>2012-05-29 14:31:38 +0000
committerOlivier Crête <tester@gentoo.org>2012-05-29 14:31:38 +0000
commit5cb63aa8c20baae7ce16ab5cb9f2a6abce0629b2 (patch)
tree887e518afb3c40a7d2e235a42b6055c721af987f /net-im/amsn
parentkeyword ~amd64-fbsd (diff)
downloadgentoo-2-5cb63aa8c20baae7ce16ab5cb9f2a6abce0629b2.tar.gz
gentoo-2-5cb63aa8c20baae7ce16ab5cb9f2a6abce0629b2.tar.bz2
gentoo-2-5cb63aa8c20baae7ce16ab5cb9f2a6abce0629b2.zip
Add patch to prevent deleting built files in the install phase
(Portage version: 2.1.10.49/cvs/Linux x86_64)
Diffstat (limited to 'net-im/amsn')
-rw-r--r--net-im/amsn/ChangeLog6
-rw-r--r--net-im/amsn/amsn-0.98.9.ebuild5
-rw-r--r--net-im/amsn/files/amsn-0.98.9-no-rebuild-on-install.patch22
3 files changed, 30 insertions, 3 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/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)