Fix icon cache update and raise EAPI to 4 by "ago" from Freenode.

(Portage version: 2.2.0_alpha60/cvs/Linux x86_64)

2 files changed, 25 insertions, 18 deletions

diff --git a/net-im/amsn/ChangeLog b/net-im/amsn/ChangeLog
index aa7c09daa92b..2b2f2d6fc896 100644
--- a/net-im/amsn/ChangeLog
+++ b/net-im/amsn/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/amsn
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/amsn/ChangeLog,v 1.106 2011/10/03 09:31:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/amsn/ChangeLog,v 1.107 2011/10/03 11:05:13 ssuominen Exp $
+
+  03 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> amsn-0.98.4-r1.ebuild:
+  Fix icon cache update and raise EAPI to 4 by "ago" from Freenode.
 
   03 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> amsn-0.98.4-r1.ebuild:
   The libpng15 patch imported from NetBSD is not compatible with libpng14 wrt
diff --git a/net-im/amsn/amsn-0.98.4-r1.ebuild b/net-im/amsn/amsn-0.98.4-r1.ebuild
index 1500dbcf92e0..96846725056d 100644
--- a/net-im/amsn/amsn-0.98.4-r1.ebuild
+++ b/net-im/amsn/amsn-0.98.4-r1.ebuild
@@ -1,23 +1,18 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/amsn/amsn-0.98.4-r1.ebuild,v 1.3 2011/10/03 09:31:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/amsn/amsn-0.98.4-r1.ebuild,v 1.4 2011/10/03 11:05:13 ssuominen Exp $
 
-EAPI=2
-
-inherit autotools eutils fdo-mime gnome2-utils
+EAPI=4
+inherit autotools eutils fdo-mime gnome2-utils toolchain-funcs
 
 MY_P=${P/_rc/RC}
-S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="aMSN Messenger client"
 SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${MY_P}-src.tar.bz2"
 HOMEPAGE="http://www.amsn-project.net"
 
-# The tests are interactive
-RESTRICT="test"
-
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc -sparc ~x86"
 IUSE="debug"
 
@@ -40,6 +35,13 @@ RDEPEND="${DEPEND}
 #	>=media-libs/gst-plugins-bad-0.10.13
 #	>=media-plugins/gst-plugins-ffmpeg-0.10.7
 
+# The tests are interactive
+RESTRICT="test"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( AGREEMENT TODO README FAQ CREDITS )
+
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-0.98-noautoupdate.patch \
@@ -52,21 +54,21 @@ src_prepare() {
 	# only portage should strip files, bug 285682
 	sed -i -e "s/LDFLAGS += -s/LDFLAGS += /" Makefile.in || die "sed failed"
 	# Ships with a 32-bit binary, we want to rebuild it
-	rm -f plugins/amsnplus/snapshot
+	rm -f plugins/amsnplus/snapshot || die
 	eautoreconf
 }
 
 src_configure() {
-	econf $(use_enable debug) || die "configure script failed"
+	tc-export CC
+	econf $(use_enable debug)
 }
 
 src_install() {
-	make -C plugins/amsnplus || die
-	make DESTDIR="${D}" install || die
-	dodoc AGREEMENT TODO README FAQ CREDITS
+	emake -C plugins/amsnplus
+	default
 
 	domenu amsn.desktop
-	sed -i -e s:.png:: "${D}/usr/share/applications/amsn.desktop"
+	sed -i -e s:.png:: "${D}"/usr/share/applications/amsn.desktop || die
 
 	cd desktop-icons
 	for i in *; do
@@ -77,11 +79,13 @@ src_install() {
 	done
 }
 
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
 pkg_postinst() {
 	fdo-mime_desktop_database_update
 	gnome2_icon_cache_update
-
-	ewarn "You might have to remove ~/.amsn prior to running as user if amsn hangs on start-up."
 }
 
 pkg_postrm() {