arm stable, remove old

(Portage version: 2.1.5.2)

6 files changed, 15 insertions, 178 deletions

diff --git a/media-sound/vorbis-tools/ChangeLog b/media-sound/vorbis-tools/ChangeLog
index 5a2b2a2357d7..ae5cb8a7a75b 100644
--- a/media-sound/vorbis-tools/ChangeLog
+++ b/media-sound/vorbis-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/vorbis-tools
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/ChangeLog,v 1.81 2008/04/17 17:01:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/ChangeLog,v 1.82 2008/05/26 16:57:30 drac Exp $
+
+  26 May 2008; Samuli Suominen <drac@gentoo.org>
+  -files/vorbis-tools-1.1.1-curl-7.16.0.patch,
+  -files/vorbis-tools-1.1.1-utf8.patch, -vorbis-tools-1.1.1-r5.ebuild,
+  -vorbis-tools-1.2.0.ebuild, vorbis-tools-1.2.0-r1.ebuild:
+  arm stable, remove old
 
   17 Apr 2008; Raúl Porcel <armin76@gentoo.org>
   vorbis-tools-1.2.0-r1.ebuild:
diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.1.1-curl-7.16.0.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.1.1-curl-7.16.0.patch
deleted file mode 100644
index 2aabebe19d37..000000000000
--- a/media-sound/vorbis-tools/files/vorbis-tools-1.1.1-curl-7.16.0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- vorbis-tools-1.1.1/ogg123/http_transport.c.orig	2006-12-09 16:34:44.000000000 +1100
-+++ vorbis-tools-1.1.1/ogg123/http_transport.c	2006-12-09 16:39:46.000000000 +1100
-@@ -116,7 +116,6 @@
-   if (inputOpts.ProxyTunnel)
-     curl_easy_setopt (handle, CURLOPT_HTTPPROXYTUNNEL, inputOpts.ProxyTunnel);
-   */
--  curl_easy_setopt(handle, CURLOPT_MUTE, 1);
-   curl_easy_setopt(handle, CURLOPT_ERRORBUFFER, private->error);
-   curl_easy_setopt(handle, CURLOPT_PROGRESSFUNCTION, progress_callback);
-   curl_easy_setopt(handle, CURLOPT_PROGRESSDATA, private);
diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.1.1-utf8.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.1.1-utf8.patch
deleted file mode 100644
index 3dd19547606a..000000000000
--- a/media-sound/vorbis-tools/files/vorbis-tools-1.1.1-utf8.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -urN vorbis-tools-1.1.1.orig/share/charset.c vorbis-tools-1.1.1/share/charset.c
---- vorbis-tools-1.1.1.orig/share/charset.c	2005-06-03 06:15:10.000000000 -0400
-+++ vorbis-tools-1.1.1/share/charset.c	2006-03-08 08:49:56.000000000 -0500
-@@ -27,6 +27,10 @@
-  * 8-bit char, 16-bit short and 32-bit int.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
- #ifndef HAVE_ICONV /* should be ifdef USE_CHARSET_CONVERT */
- 
- #include <stdlib.h>
-diff -urN vorbis-tools-1.1.1.orig/share/iconvert.c vorbis-tools-1.1.1/share/iconvert.c
---- vorbis-tools-1.1.1.orig/share/iconvert.c	2005-06-03 06:15:10.000000000 -0400
-+++ vorbis-tools-1.1.1/share/iconvert.c	2006-03-08 08:49:56.000000000 -0500
-@@ -16,6 +16,10 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
- #ifdef HAVE_ICONV
- 
- #include <assert.h>
-diff -urN vorbis-tools-1.1.1.orig/share/utf8.c vorbis-tools-1.1.1/share/utf8.c
---- vorbis-tools-1.1.1.orig/share/utf8.c	2005-06-03 06:15:10.000000000 -0400
-+++ vorbis-tools-1.1.1/share/utf8.c	2006-03-08 08:49:56.000000000 -0500
-@@ -21,6 +21,10 @@
-  * Convert a string between UTF-8 and the locale's charset.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+# include <config.h>
-+#endif
-+
- #include <stdlib.h>
- #include <string.h>
- 
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.1.1-r5.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.1.1-r5.ebuild
deleted file mode 100644
index a45b0950f855..000000000000
--- a/media-sound/vorbis-tools/vorbis-tools-1.1.1-r5.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/vorbis-tools-1.1.1-r5.ebuild,v 1.10 2008/03/02 18:12:18 dirtyepic Exp $
-
-IUSE="nls flac speex minimal"
-
-WANT_AUTOCONF=2.5
-WANT_AUTOMAKE=1.9
-
-inherit eutils toolchain-funcs flag-o-matic autotools
-
-DESCRIPTION="tools for using the Ogg Vorbis sound file format"
-HOMEPAGE="http://www.vorbis.com/"
-SRC_URI="http://downloads.xiph.org/releases/vorbis/${P}.tar.gz
-	mirror://gentoo/${P}+flac-1.1.3.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-
-RDEPEND=">=media-libs/libvorbis-1.1
-	!minimal? ( >=media-libs/libao-0.8.2
-		>=net-misc/curl-7.9 )
-	speex? ( media-libs/speex )
-	flac? ( media-libs/flac )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	dev-util/pkgconfig"
-
-pkg_setup() {
-	if use flac && ! built_with_use media-libs/flac ogg; then
-		eerror "To be able to play OggFlac files you need to build"
-		eerror "media-libs/flac with +ogg, to build libOggFLAC."
-		die "Missing libOggFLAC library."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-utf8.patch"
-	epatch "${WORKDIR}/${P}+flac-1.1.3-1.patch"
-	epatch "${WORKDIR}/${P}+flac-1.1.3-2.patch"
-	epatch "${WORKDIR}/${P}+flac-1.1.3-3.patch"
-	epatch "${FILESDIR}/${P}-curl-7.16.0.patch"
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_compile() {
-	# largefile support, bug 170677
-	append-flags -D_FILE_OFFSET_BITS=64
-
-	local myconf
-
-	# --with-flac is not supported.  See bug #49763
-	use flac || myconf="${myconf} --without-flac"
-	# --with-speex is not supported. See bug #97316
-	use speex || myconf="${myconf} --without-speex"
-	# bug 143812
-	use minimal && myconf="${myconf} --disable-ogg123"
-
-	# for vcut see bug #143487
-	econf \
-		--enable-vcut \
-		$(use_enable nls) \
-		${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-
-	rm -rf "${D}"/usr/share/doc
-	dodoc AUTHORS README
-	docinto ogg123
-	dodoc ogg123/ogg123rc-example
-}
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.2.0-r1.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.2.0-r1.ebuild
index 82a62e36464e..e332da3a20d3 100644
--- a/media-sound/vorbis-tools/vorbis-tools-1.2.0-r1.ebuild
+++ b/media-sound/vorbis-tools/vorbis-tools-1.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/vorbis-tools-1.2.0-r1.ebuild,v 1.9 2008/04/17 17:01:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/vorbis-tools-1.2.0-r1.ebuild,v 1.10 2008/05/26 16:57:30 drac Exp $
 
 EAPI=1
 
@@ -12,7 +12,7 @@ SRC_URI="http://downloads.xiph.org/releases/vorbis/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="flac nls +ogg123 speex"
 
 RDEPEND=">=media-libs/libvorbis-1.1
@@ -28,18 +28,22 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-with-args.patch \
 		"${FILESDIR}"/${P}-sec.patch
+
 	AT_M4DIR="m4" eautoreconf
 }
 
 src_compile() {
-	econf --docdir=/usr/share/doc/${PF} --enable-vcut \
+	econf --enable-vcut \
 		$(use_enable nls) $(use_enable ogg123) \
 		$(use_with flac) $(use_with speex)
+
 	emake || die "emake failed."
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
+	emake docdir=/usr/share/doc/${PF} DESTDIR="${D}" \
+		install || die "emake install failed."
+
 	dodoc AUTHORS CHANGES README
 	prepalldocs
 }
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.2.0.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.2.0.ebuild
deleted file mode 100644
index 3bc7fe03950b..000000000000
--- a/media-sound/vorbis-tools/vorbis-tools-1.2.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/vorbis-tools/vorbis-tools-1.2.0.ebuild,v 1.11 2008/04/08 17:11:36 armin76 Exp $
-
-EAPI=1
-
-inherit autotools eutils
-
-DESCRIPTION="tools for using the Ogg Vorbis sound file format"
-HOMEPAGE="http://www.vorbis.com"
-SRC_URI="http://downloads.xiph.org/releases/vorbis/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="flac nls +ogg123 speex"
-
-RDEPEND=">=media-libs/libvorbis-1.1
-	flac? ( media-libs/flac )
-	ogg123? ( media-libs/libao net-misc/curl )
-	speex? ( media-libs/speex )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-with-args.patch
-	AT_M4DIR="m4" eautoreconf
-}
-
-src_compile() {
-	econf --docdir=/usr/share/doc/${PF} --enable-vcut \
-		$(use_enable nls) $(use_enable ogg123) \
-		$(use_with flac) $(use_with speex)
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS CHANGES README
-	prepalldocs
-}