Fix building with x11-libs/libnotify >= 0.7 and remove useless libtool and static archive files for plugins.

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

4 files changed, 55 insertions, 15 deletions

diff --git a/media-sound/ario/ChangeLog b/media-sound/ario/ChangeLog
index 80a1c76d5cd3..24d6fd9244d0 100644
--- a/media-sound/ario/ChangeLog
+++ b/media-sound/ario/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/ario
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ario/ChangeLog,v 1.17 2010/09/10 07:54:30 angelos Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ario/ChangeLog,v 1.18 2011/02/05 08:10:58 ssuominen Exp $
+
+  05 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> ario-1.5.ebuild,
+  +files/ario-1.5-libnotify-0.7.patch:
+  Fix building with x11-libs/libnotify >= 0.7 and remove useless libtool and
+  static archive files for plugins.
 
 *ario-1.5 (06 Sep 2010)
 
diff --git a/media-sound/ario/Manifest b/media-sound/ario/Manifest
index a21145d930f3..e340c196bbfd 100644
--- a/media-sound/ario/Manifest
+++ b/media-sound/ario/Manifest
@@ -1,8 +1,9 @@
 AUX ario-1.1-as-needed.patch 927 RMD160 0ede5363ea5fc3eb99e6a3afd3830933ef152b85 SHA1 921f8171f459099c9d62da188412c2186364afbb SHA256 51218d2e1d7c74f779a23571abde3b868977e8b90192d20cac8be7294d0c38c2
 AUX ario-1.3-unsupported-warnings.patch 7266 RMD160 74c8346ef3d4afc06a4b0d7a531c040ff7375c2d SHA1 2e86bbd2a206fe1a36a51ba66e88329c98903505 SHA256 b6853b0d602d54cb8802bb26273d0163fdba21966bcba7fec62ba0cb1f0aff3b
+AUX ario-1.5-libnotify-0.7.patch 947 RMD160 c39364548e835f91bc6089d134cafbaa97860ba0 SHA1 058567173892ca869a4f55a60489c56c6270a4fd SHA256 3df3bac95f6534c8a3d4dcb53b5e0f7aa2b4c70597ca1d1a21e6b72fa443d9b9
 DIST ario-1.4.4.tar.gz 1098970 RMD160 826bca4b62764ed2d4e73bdbdad126db41edbb17 SHA1 25fbad6dc5c32dab016b057d9a74065908c2c3d7 SHA256 58e43708b6fc85ef9fdce286806fdefc0621a8e73069160ab39110839835fc92
 DIST ario-1.5.tar.gz 1119387 RMD160 74701aaae0c5413958675fde837ea04640113d9a SHA1 45996e16056046ce49f132dd675031b47b571735 SHA256 0de4885f3c133cc3af2fd506d19780d9fa8c1e7b8a6413b0c2153b30b73c9725
 EBUILD ario-1.4.4.ebuild 1617 RMD160 7425dbe58626fd8b8f7041061507536f92557ee6 SHA1 3378569b127761a1997bdf9df8b706fee9d27b8f SHA256 25516be6129060d93b5527a69f13f3402b70cb12d286401f7e2f5d8944bf8a7d
-EBUILD ario-1.5.ebuild 1662 RMD160 a6d710a24ea1d2a9805cc5b55dac9d41dc24e34d SHA1 f82ad2f530e3664d3e8ae269cf07d0fb9b65cd8a SHA256 605aba7cc7bd8d80aa2bbe6f1239af87fdfe754f152ba1b98cbcf0dc831ea23a
-MISC ChangeLog 2425 RMD160 b83d666a8b1b0cccc0fd2b0cdbd150b201fc057a SHA1 b3b4fc271a6f2d7609cd9e006961c3c53d1452d9 SHA256 3eeea6a9a912465e49ab448214e96f42e70078aa0619d576609aafc8e0501e50
+EBUILD ario-1.5.ebuild 1799 RMD160 1be285d9bb8dcdb5d08e5f9a284667a3e5d31420 SHA1 126e153f932694d0803c7d3bf5669883446f1931 SHA256 5ee6dc48f57904f6884dae079fb474dea59f135bb2145e2cb8714aba3471056e
+MISC ChangeLog 2651 RMD160 008438633a1ad602495c76c0fe64ead22929c464 SHA1 b1e7b08a398303b95e2d68ea75cf266689a77887 SHA256 1267df272e8c895ae4a397a17ff408c699557eb506662b74ecdacdd45411e36d
 MISC metadata.xml 473 RMD160 a8d4a164ef16c18ab5bd025fab9f55841b3f84fd SHA1 c418af9cd17b56310cf12480dc4f46fa6c18950f SHA256 0dbb1d8401bd46a16859df60bef68f26238590556ddb67f37ca1f78ed3b409c9
diff --git a/media-sound/ario/ario-1.5.ebuild b/media-sound/ario/ario-1.5.ebuild
index ec75ce763fa8..965be786662c 100644
--- a/media-sound/ario/ario-1.5.ebuild
+++ b/media-sound/ario/ario-1.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ario/ario-1.5.ebuild,v 1.1 2010/09/10 07:54:30 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ario/ario-1.5.ebuild,v 1.2 2011/02/05 08:10:58 ssuominen Exp $
 
-EAPI=1
-inherit gnome2-utils
+EAPI=2
+inherit eutils gnome2-utils
 
 DESCRIPTION="a GTK2 MPD (Music Player Daemon) client inspired by Rythmbox"
 HOMEPAGE="http://ario-player.sourceforge.net"
@@ -28,16 +28,23 @@ RDEPEND=">=dev-libs/glib-2.14:2
 		dev-python/pygobject )
 	taglib? ( media-libs/taglib )
 	zeroconf? ( net-dns/avahi )"
-DEPEND="sys-devel/gettext
+DEPEND="${RDEPEND}
 	dev-util/intltool
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+	sys-devel/gettext"
 
-src_compile() {
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+}
+
+src_configure() {
 	econf \
+		--disable-dependency-tracking \
+		--disable-static \
+		--disable-xmms2 \
 		--enable-libmpdclient2 \
 		--enable-search \
 		--enable-playlists \
-		--disable-xmms2 \
 		--disable-deprecations \
 		$(use_enable audioscrobbler) \
 		$(use_enable dbus) \
@@ -48,13 +55,13 @@ src_compile() {
 		$(use_enable python) \
 		$(use_enable taglib) \
 		$(use_enable zeroconf avahi)
-
-	emake || die "emake failed"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog NEWS README TODO
+
+	find "${D}" -name '*.la' -exec rm -f '{}' +
 }
 
 pkg_preinst() {
diff --git a/media-sound/ario/files/ario-1.5-libnotify-0.7.patch b/media-sound/ario/files/ario-1.5-libnotify-0.7.patch
new file mode 100644
index 000000000000..75749b6d13b4
--- /dev/null
+++ b/media-sound/ario/files/ario-1.5-libnotify-0.7.patch
@@ -0,0 +1,27 @@
+--- plugins/libnotify/ario-notifier-libnotify.c
++++ plugins/libnotify/ario-notifier-libnotify.c
+@@ -30,6 +30,10 @@
+ #include "lib/ario-conf.h"
+ #include "ario-debug.h"
+ 
++#ifndef NOTIFY_CHECK_VERSION
++#define NOTIFY_CHECK_VERSION(x,y,z) 0
++#endif
++
+ struct ArioNotifierLibnotifyPrivate
+ {
+         NotifyNotification *notification;
+@@ -122,9 +126,13 @@
+         ARIO_LOG_FUNCTION_START;
+         notifier_libnotify->priv = ARIO_NOTIFIER_LIBNOTIFY_GET_PRIVATE (notifier_libnotify);
+ 
++#if NOTIFY_CHECK_VERSION (0, 7, 0)
++        notifier_libnotify->priv->notification = notify_notification_new ("Ario",  NULL, NULL);
++#else
+         notifier_libnotify->priv->notification = notify_notification_new ("Ario",  NULL, NULL, NULL);
+         notify_notification_attach_to_status_icon (notifier_libnotify->priv->notification,
+                                                    GTK_STATUS_ICON (ario_tray_icon_get_instance ()));
++#endif
+ }
+ 
+ static void