Remove deprecated libghttp support wrt #244128

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

8 files changed, 25 insertions, 192 deletions

diff --git a/media-sound/orpheus/ChangeLog b/media-sound/orpheus/ChangeLog
index f6f607b55a5f..2451e1a153d5 100644
--- a/media-sound/orpheus/ChangeLog
+++ b/media-sound/orpheus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/orpheus
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/orpheus/ChangeLog,v 1.24 2007/11/08 17:00:22 armin76 Exp $
+# 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 $
+
+  10 May 2009; Samuli Suominen <ssuominen@gentoo.org>
+  -files/1.5-gcc34.patch, -orpheus-1.5.ebuild,
+  -files/orpheus-1.5-nolibghttp.patch, -orpheus-1.6.ebuild,
+  orpheus-1.6-r1.ebuild:
+  Remove deprecated libghttp support wrt #244128
 
   08 Nov 2007; Raúl Porcel <armin76@gentoo.org> orpheus-1.6-r1.ebuild:
   alpha/sparc stable wrt security #113683, thanks to Tobias Klausmann and Alex
@@ -12,7 +18,7 @@
 
 *orpheus-1.6-r1 (06 Nov 2007)
 
-  06 Nov 2007; Samuli Suominen <drac@gentoo.org>
+  06 Nov 2007; Samuli Suominen <ssuominen@gentoo.org>
   +files/101_fix-buffer-overflow.diff, +orpheus-1.6-r1.ebuild:
   Fix security bug 113683, CVE-2005-3863, a stack-based buffer overflow in
   kkstrtext.h in ktools library and stabilize amd64.
diff --git a/media-sound/orpheus/Manifest b/media-sound/orpheus/Manifest
index 814cb5434ce0..579789758892 100644
--- a/media-sound/orpheus/Manifest
+++ b/media-sound/orpheus/Manifest
@@ -1,12 +1,7 @@
 AUX 1.5-amd64.patch 962 RMD160 d1161a1f7aafdb629ebf9e04850183c7d976d841 SHA1 794a565b09895e46136ebb492a7d3e24dac780ae SHA256 cd0c12aebe6909dceba04b6db0741fa997bf86f2501cbed3fccf070c9802395a
-AUX 1.5-gcc34.patch 1505 RMD160 02befa91982b761cad2c0523d82c5768048dc706 SHA1 4f1379a6ab318bcf78e69bdcbe9d9c1cb1f6ba58 SHA256 f92866d2138cd6cb7518cf87bedec3c4dd2f97a89dba0a03245d9ac5e40eed48
 AUX 101_fix-buffer-overflow.diff 614 RMD160 01fa9fc617eb87a7cfbb099ca8a894d39d3b864b SHA1 e98ec36f1983219dcd4fcbbd263c4cb14d5200c1 SHA256 f6c2ee9d2e53b079764b40e85678b8d23664d86432c14cedf0246112c59f2501
-AUX orpheus-1.5-nolibghttp.patch 475 RMD160 aa45fc187839cf6d7ccb94de6b8d8cfa0434e21d SHA1 b3d38759986893c33d6412994bc2f351ea28deba SHA256 745ca13333819cc48c607d65f3ab643040d139c93949c81665a7a15ca0048b91
 AUX orpheus-1.6-nolibghttp.patch 462 RMD160 366c7095918ffd7807473aa02773e0a127d5db3f SHA1 ecc7b842802a4e0df96b58616102b8eda9965bb8 SHA256 886e0a99607294fc55430056099d023075e00a7569a87d649dca7d55ceb86250
-DIST orpheus-1.5.tar.gz 340984 RMD160 8836e03d6f386f816373829e96f3acf262cef0dd SHA1 8ae94167d2262613ac5a74206411d355f3358494 SHA256 6b1a15c4bd6819c2098c49128fbb2c8a37406af145ac798e5f6d5727a28ff110
 DIST orpheus-1.6.tar.gz 440553 RMD160 bd1b04f8c1195074e648d1ed8731970f512e120a SHA1 0cfd17a68f98971e2c810d4f47ef8e37c550b121 SHA256 18a6a4b0171c8a2a5a09be6e2cd8fc781c145fde1b266e43a9902fef10ee6ff5
-EBUILD orpheus-1.5.ebuild 1519 RMD160 98da850ff927521e77f010ef6c144048743f9150 SHA1 1b953d1b8e53891402a5dc09fdb7828da4ddd755 SHA256 b3bada661a457e15949b9bd45559f63e1b9e121b81993af78d6792ca6d9f64c3
-EBUILD orpheus-1.6-r1.ebuild 1346 RMD160 295d7ca122ff1c218613bb68ceb9ddf5ba957bce SHA1 27618c1a82005b758fe902a300b01e165ee69d4e SHA256 d1f98c057b438a6a1d137f00f1b3d9e7682e6f28cdb71895554fc07de42fc20a
-EBUILD orpheus-1.6.ebuild 1195 RMD160 b0b4e4c7100fe5f7cea22c9bd61d014cfc582a4f SHA1 713b9192273aa496702aa8b5ddee58ab0c8a50a1 SHA256 c177006e58ec333d59fd6b0c894155f1843aa5c18f46c4cad2f00688a85fd3ef
-MISC ChangeLog 3495 RMD160 6578889c29f017d70bd9267c7003109bd797f8aa SHA1 142501ed1006eeaf0421ab57a8b352d1432d72a4 SHA256 725ace224bea741c39de26555ab5c4f3c631e44ed63bda8e7c2883b85adae8a1
-MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
+EBUILD orpheus-1.6-r1.ebuild 1197 RMD160 de19f0d17bf0ff22f0f8c5f65cadde39c4b3c54d SHA1 50e9f8f93022611d4559695d5ae934476b686152 SHA256 2f43285a67b29418740e7c3db31259157821338520d7072ca5d0e15fdcae9203
+MISC ChangeLog 3738 RMD160 1b66021230fc88d9f9d2828239abbcaac24fb8a8 SHA1 a3b4f77b992fcbb9dc2dee63da1b5c6dacfd4fcf SHA256 6f90e2c3e0b8617dd66323a58c4a0cb3d765f884f13f33646ef44c0264e01bf4
+MISC metadata.xml 159 RMD160 568344dc99ebe68c2e2d43d268d186757532144d SHA1 3f9589301dbaa4363c56de0f309cf792d8c38b63 SHA256 eb5b8cfa9aed067cd72d6439beac2dd0abdba30248f27e4b337012b493a18369
diff --git a/media-sound/orpheus/files/1.5-gcc34.patch b/media-sound/orpheus/files/1.5-gcc34.patch
deleted file mode 100644
index fbbe3d900664..000000000000
--- a/media-sound/orpheus/files/1.5-gcc34.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -Naur old/src/mixerctl.cc new/src/mixerctl.cc
---- old/src/mixerctl.cc	2004-09-04 02:44:12.797543753 +0200
-+++ new/src/mixerctl.cc	2004-09-04 02:44:47.889365170 +0200
-@@ -50,7 +50,7 @@
- 
-     if((fd = ::open(devname.c_str(), O_RDWR)) != -1) {
- 	if(ioctl(fd, SOUND_MIXER_READ_DEVMASK, &devmask) != -1) {
--	    for(ct = ctVolume; ct != channeltype_end; (int) ct += 1) {
-+	    for(ct = ctVolume; ct != channeltype_end; ct = (mixerctl::channeltype) (ct + 1)) {
- 		if((1 << (int) ct) & devmask) {
- 		    channels.insert(ct);
- 		}
-diff -Naur old/src/uitext.cc new/src/uitext.cc
---- old/src/uitext.cc	2004-09-04 03:36:50.928930920 +0200
-+++ new/src/uitext.cc	2004-09-04 03:45:23.183056456 +0200
-@@ -577,14 +577,16 @@
- 			autosavepl = !autosavepl;
- 			break;
- 		    case 41:
--			if(++((int) playmode) == PlayMode_size)
-+			playmode = (PlayMode) (playmode + 1);
-+			if(playmode == PlayMode_size)
- 			    playmode = Normal;
- 			break;
- 		    case 42:
- 			autoplay = !autoplay;
- 			break;
- 		    case 43:
--			if(++((int) sortorder) == SortOrder_size)
-+			sortorder = (SortOrder) (sortorder + 1);
-+			if(sortorder == SortOrder_size)
- 			    sortorder = byFileName;
- 			break;
- 		    case 44:
-@@ -719,7 +721,7 @@
-     while(!finished) {
- 	m.clear();
- 
--	for(ct = mixerctl::ctVolume; ct != mixerctl::channeltype_end; (int) ct += 1) {
-+	for(ct = mixerctl::ctVolume; ct != mixerctl::channeltype_end; ct = (mixerctl::channeltype) (ct + 1)) {
- 	    if(chavail.count(ct)) {
- 		val = mix.readlevel(ct);
- 		if(val >= 0) {
diff --git a/media-sound/orpheus/files/orpheus-1.5-nolibghttp.patch b/media-sound/orpheus/files/orpheus-1.5-nolibghttp.patch
deleted file mode 100644
index 076d17138f23..000000000000
--- a/media-sound/orpheus/files/orpheus-1.5-nolibghttp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/metadata.xml b/media-sound/orpheus/metadata.xml
index e1774e3d9ad7..ae573a60407f 100644
--- a/media-sound/orpheus/metadata.xml
+++ b/media-sound/orpheus/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
+	<herd>sound</herd>
 </pkgmetadata>
diff --git a/media-sound/orpheus/orpheus-1.5.ebuild b/media-sound/orpheus/orpheus-1.5.ebuild
deleted file mode 100644
index 9d419a51c8b1..000000000000
--- a/media-sound/orpheus/orpheus-1.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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.15 2006/11/29 19:39:59 aballier Exp $
-
-inherit eutils toolchain-funcs
-
-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="cddb ogg"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	ogg? ( >=media-libs/libvorbis-1.0_beta1 )
-	virtual/mpg123
-	cddb? ( gnome-base/libghttp )
-	media-sound/vorbis-tools"
-#	nas? ( >=media-libs/nas-1.4.1 )
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch "${FILESDIR}/${PV}-gcc34.patch"
-	epatch "${FILESDIR}/${PV}-amd64.patch"
-	use cddb || epatch "${FILESDIR}/${P}-nolibghttp.patch"
-
-	#if use nas; then
-	#	cd src
-	#	sed -e "s:^INCLUDES =:INCLUDES = -I/usr/X11R6/include:" \
-	#		-e "s:^splay_LDADD =:splay_LDADD = \$(NAS_LIBS):" \
-	#		Makefile | cat > Makefile
-	#fi
-}
-
-src_compile() {
-	local myconf
-	### Looks like NAS support is broken, at least with NAS 1.5 and
-	### mp3player 3.1.1 (Aug 13, agenkin@thpoon.com)
-	#use nas && myconf="${myconf} --with-nas"
-	#use nas || myconf="${myconf} --disable-nas"
-	myconf="${myconf}"
-
-	econf ${myconf} || die "configure failed"
-	make CC="$(tc-getCC) ${CFLAGS}" CXX="$(tc-getCXX) ${CXXFLAGS}" \
-		|| die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/media-sound/orpheus/orpheus-1.6-r1.ebuild b/media-sound/orpheus/orpheus-1.6-r1.ebuild
index 06b60149f386..3b3151fb31df 100644
--- a/media-sound/orpheus/orpheus-1.6-r1.ebuild
+++ b/media-sound/orpheus/orpheus-1.6-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 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.3 2007/11/08 17:00:22 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/orpheus/orpheus-1.6-r1.ebuild,v 1.4 2009/05/10 14:22:56 ssuominen Exp $
 
-WANT_AUTOCONF=2.5
+EAPI=2
 WANT_AUTOMAKE=1.8
 
 inherit eutils autotools
@@ -14,19 +14,16 @@ SRC_URI="http://konst.org.ua/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~ppc sparc x86"
-IUSE="cddb"
+IUSE=""
 
-DEPEND=">=sys-libs/ncurses-5.2
-	>=media-libs/libvorbis-1.0_beta1
+RDEPEND="sys-libs/ncurses
+	media-libs/libvorbis
 	virtual/mpg123
-	cddb? ( gnome-base/libghttp )
-	media-sound/vorbis-tools"
+	media-sound/vorbis-tools[ogg123]"
+DEPEND="${RDEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/1.5-amd64.patch"
+src_prepare() {
+	epatch "${FILESDIR}"/1.5-amd64.patch
 
 	# Fix a stack-based buffer overflow in kkstrtext.h in ktools library.
 	# Bug 113683, CVE-2005-3863.
@@ -41,15 +38,10 @@ src_unpack() {
 
 	# force not using deprecated libghttp
 	cd "${S}"
-	use cddb || epatch "${FILESDIR}/${P}-nolibghttp.patch"
-}
-
-src_compile() {
-	econf || die "configure failed"
-	emake || die "emake failed"
+	epatch "${FILESDIR}"/${P}-nolibghttp.patch
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog NEWS README TODO
 }
diff --git a/media-sound/orpheus/orpheus-1.6.ebuild b/media-sound/orpheus/orpheus-1.6.ebuild
deleted file mode 100644
index 53804700d0cb..000000000000
--- a/media-sound/orpheus/orpheus-1.6.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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.2 2006/11/29 19:39:59 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="cddb"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	>=media-libs/libvorbis-1.0_beta1
-	virtual/mpg123
-	cddb? ( gnome-base/libghttp )
-	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}"
-	use cddb || 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
-}