Version bump, removed libghttp deps, patching configure to force it to not use it

(Portage version: 2.1.2_rc2-r2)

6 files changed, 87 insertions, 4 deletions

diff --git a/media-sound/orpheus/ChangeLog b/media-sound/orpheus/ChangeLog
index f03b3890f944..922cfe3131c6 100644
--- a/media-sound/orpheus/ChangeLog
+++ b/media-sound/orpheus/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/orpheus
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/orpheus/ChangeLog,v 1.19 2006/10/18 20:57:46 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/orpheus/ChangeLog,v 1.20 2006/11/25 16:22:31 aballier Exp $
+
+*orpheus-1.6 (25 Nov 2006)
+
+  25 Nov 2006; Alexis Ballier <aballier@gentoo.org>
+  +files/orpheus-1.5-nolibghttp.patch, +files/orpheus-1.6-nolibghttp.patch,
+  orpheus-1.5.ebuild, +orpheus-1.6.ebuild:
+  Version bump, removed libghttp deps, patching configure to force it to not
+  use it
 
   18 Oct 2006; Alexis Ballier <aballier@gentoo.org> +files/1.5-amd64.patch,
   orpheus-1.5.ebuild:
diff --git a/media-sound/orpheus/files/digest-orpheus-1.6 b/media-sound/orpheus/files/digest-orpheus-1.6
new file mode 100644
index 000000000000..df58ce21c4ca
--- /dev/null
+++ b/media-sound/orpheus/files/digest-orpheus-1.6
@@ -0,0 +1,3 @@
+MD5 718b57d507d4dfae5008e7fb53f7b840 orpheus-1.6.tar.gz 440553
+RMD160 bd1b04f8c1195074e648d1ed8731970f512e120a orpheus-1.6.tar.gz 440553
+SHA256 18a6a4b0171c8a2a5a09be6e2cd8fc781c145fde1b266e43a9902fef10ee6ff5 orpheus-1.6.tar.gz 440553
diff --git a/media-sound/orpheus/files/orpheus-1.5-nolibghttp.patch b/media-sound/orpheus/files/orpheus-1.5-nolibghttp.patch
new file mode 100644
index 000000000000..076d17138f23
--- /dev/null
+++ b/media-sound/orpheus/files/orpheus-1.5-nolibghttp.patch
@@ -0,0 +1,11 @@
+--- orpheus-1.5/configure.old	2006-11-25 17:14:46.000000000 +0100
++++ orpheus-1.5/configure	2006-11-25 17:15:25.000000000 +0100
+@@ -1479,7 +1479,7 @@
+ LIBS="$ac_save_LIBS"
+ 
+ fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = nolibghttp"; then
+   echo "$ac_t""yes" 1>&6
+     ac_tr_lib=HAVE_LIB`echo ghttp | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+     -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
diff --git a/media-sound/orpheus/files/orpheus-1.6-nolibghttp.patch b/media-sound/orpheus/files/orpheus-1.6-nolibghttp.patch
new file mode 100644
index 000000000000..28823e85e9d8
--- /dev/null
+++ b/media-sound/orpheus/files/orpheus-1.6-nolibghttp.patch
@@ -0,0 +1,11 @@
+--- 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
diff --git a/media-sound/orpheus/orpheus-1.5.ebuild b/media-sound/orpheus/orpheus-1.5.ebuild
index 96ccbe835e89..a41034e587e7 100644
--- a/media-sound/orpheus/orpheus-1.5.ebuild
+++ b/media-sound/orpheus/orpheus-1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/orpheus/orpheus-1.5.ebuild,v 1.13 2006/10/18 20:57:46 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/orpheus/orpheus-1.5.ebuild,v 1.14 2006/11/25 16:22:31 aballier Exp $
 
 inherit eutils toolchain-funcs
 
@@ -16,8 +16,7 @@ IUSE="ogg"
 DEPEND=">=sys-libs/ncurses-5.2
 	ogg? ( >=media-libs/libvorbis-1.0_beta1 )
 	virtual/mpg123
-	media-sound/vorbis-tools
-	gnome-base/libghttp"
+	media-sound/vorbis-tools"
 #	nas? ( >=media-libs/nas-1.4.1 )
 
 src_unpack() {
@@ -26,6 +25,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${PV}-gcc34.patch"
 	epatch "${FILESDIR}/${PV}-amd64.patch"
+	epatch "${FILESDIR}/${P}-nolibghttp.patch"
 
 	#if use nas; then
 	#	cd src
diff --git a/media-sound/orpheus/orpheus-1.6.ebuild b/media-sound/orpheus/orpheus-1.6.ebuild
new file mode 100644
index 000000000000..5c72c0a4e0f5
--- /dev/null
+++ b/media-sound/orpheus/orpheus-1.6.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/orpheus/orpheus-1.6.ebuild,v 1.1 2006/11/25 16:22:31 aballier Exp $
+
+WANT_AUTOCONF=2.5
+WANT_AUTOMAKE=1.8
+
+inherit eutils autotools
+
+DESCRIPTION="Command line MP3 player."
+HOMEPAGE="http://konst.org.ua/en/orpheus"
+SRC_URI="http://konst.org.ua/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=sys-libs/ncurses-5.2
+	>=media-libs/libvorbis-1.0_beta1
+	virtual/mpg123
+	media-sound/vorbis-tools"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/1.5-amd64.patch"
+
+	# 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"
+}
+
+src_compile() {
+	econf || die "configure failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}