Upgrade to automake 1.9 at least, drop libghttp check pre-rebuild. Do a recursive rebuild.

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

3 files changed, 33 insertions, 25 deletions

diff --git a/media-sound/orpheus/ChangeLog b/media-sound/orpheus/ChangeLog
index 2451e1a153d5..284f3a82f54f 100644
--- a/media-sound/orpheus/ChangeLog
+++ b/media-sound/orpheus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/orpheus
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/orpheus/ChangeLog,v 1.25 2009/05/10 14:22:56 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/orpheus/ChangeLog,v 1.26 2010/12/03 00:28:03 flameeyes Exp $
+
+  03 Dec 2010; Diego E. Pettenò <flameeyes@gentoo.org> orpheus-1.6-r1.ebuild,
+  files/orpheus-1.6-nolibghttp.patch:
+  Upgrade to automake 1.9 at least, drop libghttp check pre-rebuild. Do a
+  recursive rebuild.
 
   10 May 2009; Samuli Suominen <ssuominen@gentoo.org>
   -files/1.5-gcc34.patch, -orpheus-1.5.ebuild,
diff --git a/media-sound/orpheus/files/orpheus-1.6-nolibghttp.patch b/media-sound/orpheus/files/orpheus-1.6-nolibghttp.patch
index 28823e85e9d8..e6a5f87a210f 100644
--- a/media-sound/orpheus/files/orpheus-1.6-nolibghttp.patch
+++ b/media-sound/orpheus/files/orpheus-1.6-nolibghttp.patch
@@ -1,11 +1,15 @@
---- orpheus-1.6/configure.old	2006-11-25 16:56:53.000000000 +0100
-+++ orpheus-1.6/configure	2006-11-25 16:57:30.000000000 +0100
-@@ -4219,7 +4219,7 @@
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_ghttp_ghttp_request_new" >&5
- echo "${ECHO_T}$ac_cv_lib_ghttp_ghttp_request_new" >&6
--if test $ac_cv_lib_ghttp_ghttp_request_new = yes; then
-+if test $ac_cv_lib_ghttp_ghttp_request_new = nolibghttp; then
-   cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBGHTTP 1
- _ACEOF
+Index: orpheus-1.6/configure.in
+===================================================================
+--- orpheus-1.6.orig/configure.in
++++ orpheus-1.6/configure.in
+@@ -30,8 +30,8 @@ AM_PATH_XML2(2.0.0, [
+ 
+ AC_CHECK_LIB(ncurses, main,, AC_CHECK_LIB(curses, main,, AC_MSG_ERROR(The ncurses terminal library is required in order to build the program)))
+ 
+-AC_CHECK_LIB(ghttp, ghttp_request_new,,
+-    [AC_MSG_WARN(libghttp not found - the support for CDDB is be disabled)])
++#AC_CHECK_LIB(ghttp, ghttp_request_new,,
++#    [AC_MSG_WARN(libghttp not found - the support for CDDB is be disabled)])
+ 
+ AC_CHECK_LIB(vorbis, vorbis_synthesis_headerin,,
+     AC_MSG_WARN(libvorbisfile not found - the support for OGG tags edit is disabled))
diff --git a/media-sound/orpheus/orpheus-1.6-r1.ebuild b/media-sound/orpheus/orpheus-1.6-r1.ebuild
index 0af8a6f8e5d5..611b8e71bdb6 100644
--- a/media-sound/orpheus/orpheus-1.6-r1.ebuild
+++ b/media-sound/orpheus/orpheus-1.6-r1.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/orpheus/orpheus-1.6-r1.ebuild,v 1.5 2009/09/06 17:53:56 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/orpheus/orpheus-1.6-r1.ebuild,v 1.6 2010/12/03 00:28:03 flameeyes Exp $
 
 EAPI=2
-WANT_AUTOMAKE=1.8
+
+# Will fail with 1.10+ because of config.rpath
+WANT_AUTOMAKE="1.9"
 
 inherit eutils autotools
 
@@ -29,16 +31,13 @@ src_prepare() {
 	# Bug 113683, CVE-2005-3863.
 	epatch "${FILESDIR}"/101_fix-buffer-overflow.diff
 
-	# configures generated by different autoconf versions
-	# cause problems when calling econf
-	cd "${S}/kkstrtext-0.1"
-	eautoreconf
-	cd "${S}/kkconsui-0.1"
-	eautoreconf
-
-	# force not using deprecated libghttp
-	cd "${S}"
 	epatch "${FILESDIR}"/${P}-nolibghttp.patch
+
+	# For automake 1.9 and later
+	sed -i -e 's:@MKINSTALLDIRS@:$(top_srcdir)/mkinstalldirs:' \
+		po/Makefile.in.in || die
+
+	eautoreconf
 }
 
 src_install() {