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

Package-Manager: portage-2.1.2_rc2-r2

7 files changed, 121 insertions, 12 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/Manifest b/media-sound/orpheus/Manifest
index 6b233c930e15..7773d6e7f18e 100644
--- a/media-sound/orpheus/Manifest
+++ b/media-sound/orpheus/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.5-amd64.patch 962 RMD160 d1161a1f7aafdb629ebf9e04850183c7d976d841 SHA1 794a565b09895e46136ebb492a7d3e24dac780ae SHA256 cd0c12aebe6909dceba04b6db0741fa997bf86f2501cbed3fccf070c9802395a
 MD5 21e4e8d2352ea4f1541f8ac0b43d8b9c files/1.5-amd64.patch 962
 RMD160 d1161a1f7aafdb629ebf9e04850183c7d976d841 files/1.5-amd64.patch 962
@@ -6,15 +9,28 @@ AUX 1.5-gcc34.patch 1505 RMD160 02befa91982b761cad2c0523d82c5768048dc706 SHA1 4f
 MD5 8a5d258c9488ec265c5b8005714062a3 files/1.5-gcc34.patch 1505
 RMD160 02befa91982b761cad2c0523d82c5768048dc706 files/1.5-gcc34.patch 1505
 SHA256 f92866d2138cd6cb7518cf87bedec3c4dd2f97a89dba0a03245d9ac5e40eed48 files/1.5-gcc34.patch 1505
+AUX orpheus-1.5-nolibghttp.patch 475 RMD160 aa45fc187839cf6d7ccb94de6b8d8cfa0434e21d SHA1 b3d38759986893c33d6412994bc2f351ea28deba SHA256 745ca13333819cc48c607d65f3ab643040d139c93949c81665a7a15ca0048b91
+MD5 6b4e6c1d8496342960d4f4cb8abd6c52 files/orpheus-1.5-nolibghttp.patch 475
+RMD160 aa45fc187839cf6d7ccb94de6b8d8cfa0434e21d files/orpheus-1.5-nolibghttp.patch 475
+SHA256 745ca13333819cc48c607d65f3ab643040d139c93949c81665a7a15ca0048b91 files/orpheus-1.5-nolibghttp.patch 475
+AUX orpheus-1.6-nolibghttp.patch 462 RMD160 366c7095918ffd7807473aa02773e0a127d5db3f SHA1 ecc7b842802a4e0df96b58616102b8eda9965bb8 SHA256 886e0a99607294fc55430056099d023075e00a7569a87d649dca7d55ceb86250
+MD5 341bae29a2e4624e9db36296428e839b files/orpheus-1.6-nolibghttp.patch 462
+RMD160 366c7095918ffd7807473aa02773e0a127d5db3f files/orpheus-1.6-nolibghttp.patch 462
+SHA256 886e0a99607294fc55430056099d023075e00a7569a87d649dca7d55ceb86250 files/orpheus-1.6-nolibghttp.patch 462
 DIST orpheus-1.5.tar.gz 340984 RMD160 8836e03d6f386f816373829e96f3acf262cef0dd SHA1 8ae94167d2262613ac5a74206411d355f3358494 SHA256 6b1a15c4bd6819c2098c49128fbb2c8a37406af145ac798e5f6d5727a28ff110
-EBUILD orpheus-1.5.ebuild 1448 RMD160 efc850cb84721f91587db8cdf531068b6f32f829 SHA1 3dc6cfc3648a7e864e73367a22d990fbbed248db SHA256 b6035566bddb94c7c8feed74ebb827bdbf97307d976f076ebf3f4c1600392008
-MD5 c6a32dbad17f323ee70fabf5a4e42ed5 orpheus-1.5.ebuild 1448
-RMD160 efc850cb84721f91587db8cdf531068b6f32f829 orpheus-1.5.ebuild 1448
-SHA256 b6035566bddb94c7c8feed74ebb827bdbf97307d976f076ebf3f4c1600392008 orpheus-1.5.ebuild 1448
-MISC ChangeLog 2505 RMD160 6594bd58a8a6366b2603f54f43a14f5f7e6a2738 SHA1 cbb221c42067cbf9b58853859aa88c7db568d5ba SHA256 cd98151541000fb1a795f08c6f8e22d350e48763181a7a135f091c6404fb6668
-MD5 aacb8e93f6a465b3b8f9a38aca5814f8 ChangeLog 2505
-RMD160 6594bd58a8a6366b2603f54f43a14f5f7e6a2738 ChangeLog 2505
-SHA256 cd98151541000fb1a795f08c6f8e22d350e48763181a7a135f091c6404fb6668 ChangeLog 2505
+DIST orpheus-1.6.tar.gz 440553 RMD160 bd1b04f8c1195074e648d1ed8731970f512e120a SHA1 0cfd17a68f98971e2c810d4f47ef8e37c550b121 SHA256 18a6a4b0171c8a2a5a09be6e2cd8fc781c145fde1b266e43a9902fef10ee6ff5
+EBUILD orpheus-1.5.ebuild 1471 RMD160 bc662337317b9ff577fe4d194d4558023a4bb1c0 SHA1 90d815de616f44710d92d6d480bc73d9325b96c8 SHA256 3a987d4627ab10993d8c9a4fe09ea14cf5676303489e08fcd0496d251aea70f4
+MD5 fe52c5b106d87cd87b1e04ec98a185d8 orpheus-1.5.ebuild 1471
+RMD160 bc662337317b9ff577fe4d194d4558023a4bb1c0 orpheus-1.5.ebuild 1471
+SHA256 3a987d4627ab10993d8c9a4fe09ea14cf5676303489e08fcd0496d251aea70f4 orpheus-1.5.ebuild 1471
+EBUILD orpheus-1.6.ebuild 1148 RMD160 8de3985de29b5de4de4484375d25bedd58a95ece SHA1 ec6ece0c966dfce409ea1b57ea6729495e6f4430 SHA256 09fbc721f0cac454631859b831192a49fb499778c129ddb6c32db3fd80e0a966
+MD5 9fcef2e27a9d48e088193e7ef65a2ed0 orpheus-1.6.ebuild 1148
+RMD160 8de3985de29b5de4de4484375d25bedd58a95ece orpheus-1.6.ebuild 1148
+SHA256 09fbc721f0cac454631859b831192a49fb499778c129ddb6c32db3fd80e0a966 orpheus-1.6.ebuild 1148
+MISC ChangeLog 2791 RMD160 c40e61140b7ec79051be6d8c02212b58069c8e47 SHA1 60d683aaa6a259fafacad83e27639762d8d22386 SHA256 ab28fbb3e51aa2b64c558d7ab962a60d12f136609636b134db777601c9113bea
+MD5 fb833547d8fac587f872e699604b6368 ChangeLog 2791
+RMD160 c40e61140b7ec79051be6d8c02212b58069c8e47 ChangeLog 2791
+SHA256 ab28fbb3e51aa2b64c558d7ab962a60d12f136609636b134db777601c9113bea ChangeLog 2791
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -22,3 +38,13 @@ SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata
 MD5 681c41fd90341cd519bd9a194ea24446 files/digest-orpheus-1.5 235
 RMD160 fe4ad05132df79f024765ddd2db1997d72fba781 files/digest-orpheus-1.5 235
 SHA256 48cebbcbaf3ebc5871b103c78cfd44f8da3eaa622b441ae96920c7110aa8f383 files/digest-orpheus-1.5 235
+MD5 0250e8d74d234c9dcd09ef93e6a5d4f9 files/digest-orpheus-1.6 235
+RMD160 c914cf74d96726de3de30c79732e9dc8d49cefdf files/digest-orpheus-1.6 235
+SHA256 a200a84cbd8d7da2727ef2631b50aacadee6616e1e4b8429463e44f73f250c63 files/digest-orpheus-1.6 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFaG3BvFcC4BYPU0oRAk2TAKCt+4nXS55wb+GYKHtiOkrfDB/g6gCfW/Za
+hvIiMoTrSIbkr2gxweKNja4=
+=1X6y
+-----END PGP SIGNATURE-----
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
+}