Remove deprecated libghttp support wrt #244128

(Portage version: 2.1.6.13/cvs/Linux x86_64)

7 files changed, 22 insertions, 184 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/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
-}