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

Package-Manager: portage-2.2.0_alpha60/cvs/Linux x86_64

3 files changed, 34 insertions, 27 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/Manifest b/net-im/amsn/Manifest
index c867445c2d21..ff40b8b4782c 100644
--- a/net-im/amsn/Manifest
+++ b/net-im/amsn/Manifest
@@ -11,18 +11,18 @@ AUX amsn-0.98.4-v4l2.patch 850 RMD160 8657bd6e05cb42ebc702e9863274a4755878bb57 S
 DIST amsn-0.98.3-src.tar.bz2 13275477 RMD160 20f707062da4a5ab1eb6beec49d01dfd2ba90a99 SHA1 aa8383a11ce66352aceee27f9c291c1410b3403d SHA256 43b76da9d886fd2cdcf8a7e21c9872141228a2ad1defaca8ad537722a32e0d88
 DIST amsn-0.98.4-src.tar.bz2 13513233 RMD160 8e0c3bdde902540fe759b01978447cc60d8fbeb3 SHA1 e00761c945ad47e0b715c69f1f9f18f5a4bf287c SHA256 7aa11a7199b4cda5e814493dd160915ab4c4f96c04de2c1fe7c2fe23eeaba871
 EBUILD amsn-0.98.3.ebuild 1879 RMD160 740fc499d88e512c1a4256b349e455f0bab3c376 SHA1 16ab6050e4f31a396d0e6b67904e07745555352b SHA256 a84fa8b1a7fca24448ced62a3af7cb504221c1d0975a8b3244497bed2ffd959a
-EBUILD amsn-0.98.4-r1.ebuild 2319 RMD160 3db093740aab1653b4ba67bc6bc212e753234212 SHA1 17784135f3b33205e8665a30dd4d412cd7138dca SHA256 3312499727f3bfb76ce6590a0123bfe2c12a858f3c89728012b77b093e9a2f8b
+EBUILD amsn-0.98.4-r1.ebuild 2244 RMD160 6f890abb4c21cf5ef5d54ab7e3f642a5a337a2f7 SHA1 816b4f4413b880e346ce33547a65a98565ac394c SHA256 272c3e7e03bbe94f48761c12c5958be42e37e65ee80074811db4ce3bea0b4f21
 EBUILD amsn-0.98.4.ebuild 1878 RMD160 7fe60ce2b5fe1f6851fcaf9cf75820e1327f6868 SHA1 251b1397d1a7512c28fb303eec46506472acd2de SHA256 d66257d76d87cde3d1e2ace8b313bdc226d7de2a3bca8f930b9e07bfb3c6d87b
-MISC ChangeLog 13666 RMD160 54fb22cb2cb90d7e4a6b70ad1990d6d2ab14985b SHA1 dd63780040acbc6cb358b2b9d3495ed033d78ce4 SHA256 ba42a0e2335e7eed422ce538e76d26dde27fe3b4c7a298a51ec6884075b1a72a
+MISC ChangeLog 13812 RMD160 24421f4298ff1a5a78a718dee3b9cf3c618439d9 SHA1 627a588b9eb34bccd69200145ef4586acffa306a SHA256 c0a68d506b596ad777c9b66793b510eac4638db0f585b7c5870ff4ce06aa178e
 MISC metadata.xml 228 RMD160 d75298dd38147e4c60991454366d6d9cc14985bb SHA1 9f2cadd0fee8f845e833c429f3e6d3a4e2a207b4 SHA256 0ca6e1352c0e4284a99ed8f0267b6835a5e33e2d8b94a08f1af6ad58fd72d942
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOiYEeAAoJEEdUh39IaPFNCX0IAJfZjlztgFhcLSbAmV/HdwLZ
-RgTEgbyuKC+Ly37G4nLwlpeiYcJHtpGl2TsPmY6tuFSfgYWNBri8mspR5ph4w4Vf
-bg8Kgr1enNXxPG6Wh5q5NNzzRM4iYStOL3pZLk//1rd8ky1usA5ksYiGE8WF7GtY
-ha0ajw+XThH3DPyVKxWH8qrR/2Ukh/DCe15Nt1cHz70tKj9KdkIKkEJQyCWxrwJp
-YvYaeMQM0716j4JbtSwyzJ5WfdDQp3HXMotqOk4AyDzgfIEk8B/sxitFGb1pSKPY
-ISTJ5rY63QiKMKCFWq+q13sWHzNh1M4osYDrCFBuSRGOalMyZnGk4woiFKYVY0I=
-=HGs6
+iQEcBAEBAgAGBQJOiZcRAAoJEEdUh39IaPFNLukIAJy0O4LlxceqJnWiv3mYJ13A
+PzjCs/T2JZvAUPa/2OHzznFhmCnYt6J7uCCTsPGkkHb/1rsOPoSw18T3ZRjy/c0Y
+b9L72fUwm0Bhc7/oppQCAU2QekajM7zVMNnWc3Wpx6F6quz86lE8NJSL1cM4slZT
+T8vCQ+kE+VzXN1KxAJYPZ4mLmq8AsLfWg6nY5RF/l8x9YRDg65Qvkzgcubq45vMf
+QPDu3ntQlODZAW7C3EpWekqeoHb/SeR7ZDG775sVgVcEjHRI1TU8AGI3w3eaO64A
+EOHfK8XHZfBe1UkVCWtbfONMqftke3NbL5r7KwEROHnpV6q+wBAt1wBLZLjYFQo=
+=YpDP
 -----END PGP SIGNATURE-----
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() {