Fixed as-needed, bug 232416 and 247814, thanks to a-v and idl0r on freenode

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.28-rc7-00167-g24920a7 x86_64

4 files changed, 50 insertions, 15 deletions

diff --git a/media-sound/ario/ChangeLog b/media-sound/ario/ChangeLog
index 63837b6a27d8..949cad9fa5fa 100644
--- a/media-sound/ario/ChangeLog
+++ b/media-sound/ario/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/ario
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ario/ChangeLog,v 1.5 2008/12/06 21:13:51 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ario/ChangeLog,v 1.6 2008/12/06 22:14:07 angelos Exp $
+
+  06 Dec 2008; Christoph Mende <angelos@gentoo.org>
+  +files/ario-1.1-as-needed.patch, ario-1.1.ebuild:
+  Fixed as-needed, bug 232416 and 247814, thanks to a-v and idl0r on
+  freenode
 
   06 Dec 2008; Christoph Mende <angelos@gentoo.org> ario-1.1.ebuild:
   Renamed USE=avahi to USE=zeroconf and added gnome2_icon_savelist
diff --git a/media-sound/ario/Manifest b/media-sound/ario/Manifest
index 2ccece63cf02..61ff529c1956 100644
--- a/media-sound/ario/Manifest
+++ b/media-sound/ario/Manifest
@@ -1,14 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX ario-1.1-as-needed.patch 927 RMD160 0ede5363ea5fc3eb99e6a3afd3830933ef152b85 SHA1 921f8171f459099c9d62da188412c2186364afbb SHA256 51218d2e1d7c74f779a23571abde3b868977e8b90192d20cac8be7294d0c38c2
 DIST ario-1.1.tar.gz 808862 RMD160 adec28946b7e580d85153d17d2bb519441308b60 SHA1 81cb62d3b6009d029e51223d5c2eac1e6ed21cf5 SHA256 41c79aa12e7147372508a78185644bf249fc1f4db24ed23f389ad7de3db7abe1
-EBUILD ario-1.1.ebuild 1191 RMD160 3d169083e61b1123e7404efa59c4c49ebd94c277 SHA1 9aeb22b590c4c183db7018127243c729f1585fb8 SHA256 8ecf9e5d9b7f80ff16b10afe28b408085b99c271e93db294ad598c74ce49fd02
-MISC ChangeLog 851 RMD160 31971f14a8448255129759905beebab6ad17e316 SHA1 c764d5d13afc77d453a96d413df5f6815a551954 SHA256 e5843dedb0ba2eca24bec99e48fcf91997e990256295f21965109b545d5272e0
+EBUILD ario-1.1.ebuild 1306 RMD160 22e58e1159719aca174e934549ab032a1a589570 SHA1 746b8a554ee0f53dc8192b26426fb63f3978c69b SHA256 ef01cd105f57619a2062fa4f02dd516a944409fb388834694a5a0cca9b256bfe
+MISC ChangeLog 1036 RMD160 38e2f32a816c739775086df0335a10ccd79a6d73 SHA1 3de9a3a5df8d9b10ed2f9040ef18b97c0074140f SHA256 f5af2b7b107a0ad10669d8286f62d0e9f45fd4719a26a585d33c57d0f8d6415a
 MISC metadata.xml 258 RMD160 6d4c6c4e7c021a3fc82145a078f8e113eb6f521a SHA1 02004f2821b6ac3f69abfbfdafc9744008535258 SHA256 ee85021b7ae93a2e1442a570b114d3c9bf2e577c16b7b1b409914983d5d55485
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkk66xYACgkQKhnDs22gwa/kUgCgpp08FpuMfpdsBWtjInvi0Dpq
-tLoAmwZQT5h07JF/7kkU4eC9tRqH3H5O
-=PY3J
------END PGP SIGNATURE-----
diff --git a/media-sound/ario/ario-1.1.ebuild b/media-sound/ario/ario-1.1.ebuild
index 27edb275ed52..9e3d5f5fa008 100644
--- a/media-sound/ario/ario-1.1.ebuild
+++ b/media-sound/ario/ario-1.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ario/ario-1.1.ebuild,v 1.5 2008/12/06 21:13:51 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ario/ario-1.1.ebuild,v 1.6 2008/12/06 22:14:07 angelos Exp $
 
 EAPI=1
-inherit gnome2-utils
+inherit autotools eutils gnome2-utils
 
 DESCRIPTION="a GTK2 MPD (Music Player Daemon) client inspired by Rythmbox"
 HOMEPAGE="http://ario-player.sourceforge.net"
@@ -27,6 +27,13 @@ DEPEND="sys-devel/gettext
 
 S="${WORKDIR}"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+	eautoreconf
+}
+
 src_compile() {
 	econf \
 		$(use_enable zeroconf avahi) \
diff --git a/media-sound/ario/files/ario-1.1-as-needed.patch b/media-sound/ario/files/ario-1.1-as-needed.patch
new file mode 100644
index 000000000000..580697674c62
--- /dev/null
+++ b/media-sound/ario/files/ario-1.1-as-needed.patch
@@ -0,0 +1,32 @@
+diff -u -Nru a/configure.ac b/configure.ac
+--- a/configure.ac	2008-06-05 23:44:02.000000000 +0200
++++ b/configure.ac	2008-12-06 23:07:49.000000000 +0100
+@@ -26,6 +26,8 @@
+ AC_SUBST(DEPS_CFLAGS)
+ AC_SUBST(DEPS_LIBS)
+ 
++AM_PATH_LIBGCRYPT(1.4.0,,)
++
+ dnl i18n
+ GETTEXT_PACKAGE=Ario
+ AC_SUBST(GETTEXT_PACKAGE)
+diff -u -Nru a/src/Makefile.am b/src/Makefile.am
+--- a/src/Makefile.am	2008-05-17 20:02:37.000000000 +0200
++++ b/src/Makefile.am	2008-12-06 23:08:03.000000000 +0100
+@@ -132,12 +132,14 @@
+ endif
+ 
+ ario_LDADD = \
+-        $(DEPS_LIBS)\
+-        $(AVAHI_LIBS)
++        $(DEPS_LIBS) \
++        $(AVAHI_LIBS) \
++	$(LIBGCRYPT_LIBS)
+ 
+ AM_CPPFLAGS = \
+                 $(DEPS_CFLAGS) \
+                 $(AVAHI_CFLAGS) \
++		$(LIBGCRYPT_CFLAGS) \
+                 -DLOCALE_DIR=\""$(pkgdatadir)/locale"\"\
+                 -DPIXMAP_PATH=\""$(pkgdatadir)/ario/art/"\"\
+                 -DDATA_PATH=\""$(pkgdatadir)/ario/data/"\"\