Removed 1.1.0 series and 1.1.2-r1 ebuild.

(Portage version: 2.0.51.22)

9 files changed, 6 insertions, 350 deletions

diff --git a/media-libs/flac/ChangeLog b/media-libs/flac/ChangeLog
index afe4ae559906..63fda1f0e1a4 100644
--- a/media-libs/flac/ChangeLog
+++ b/media-libs/flac/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/flac
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.68 2005/08/06 21:05:31 kito Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.69 2005/08/25 10:39:17 flameeyes Exp $
+
+  25 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -files/flac-1.1.0-libtool.patch, -files/flac-1.1.0-m4.patch,
+  -flac-1.1.0.ebuild, -flac-1.1.0-r2.ebuild, -flac-1.1.2-r1.ebuild:
+  Removed 1.1.0 series and 1.1.2-r1 ebuild.
 
   06 Aug 2005; Kito <kito@gentoo.org> files/flac-1.1.2-gas.patch:
   change default as check to not drop an a.out and wait for stdin on Darwin
diff --git a/media-libs/flac/files/digest-flac-1.1.0 b/media-libs/flac/files/digest-flac-1.1.0
deleted file mode 100644
index 614cadc8c556..000000000000
--- a/media-libs/flac/files/digest-flac-1.1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 19b456a27b5fcf502c76cc33f33e1490 flac-1.1.0.tar.gz 1201861
diff --git a/media-libs/flac/files/digest-flac-1.1.0-r2 b/media-libs/flac/files/digest-flac-1.1.0-r2
deleted file mode 100644
index 614cadc8c556..000000000000
--- a/media-libs/flac/files/digest-flac-1.1.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 19b456a27b5fcf502c76cc33f33e1490 flac-1.1.0.tar.gz 1201861
diff --git a/media-libs/flac/files/digest-flac-1.1.2-r1 b/media-libs/flac/files/digest-flac-1.1.2-r1
deleted file mode 100644
index ff97332b0a84..000000000000
--- a/media-libs/flac/files/digest-flac-1.1.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2bfc127cdda02834d0491ab531a20960 flac-1.1.2.tar.gz 1516235
diff --git a/media-libs/flac/files/flac-1.1.0-libtool.patch b/media-libs/flac/files/flac-1.1.0-libtool.patch
deleted file mode 100644
index 04812160b0c1..000000000000
--- a/media-libs/flac/files/flac-1.1.0-libtool.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- flac-1.1.0/configure.moo	2004-03-11 16:54:57.275530648 -0500
-+++ flac-1.1.0/configure	2004-03-11 16:55:05.821231504 -0500
-@@ -3106,7 +3106,7 @@
- # This must be Linux ELF.
- linux-gnu*)
-   case $host_cpu in
--  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* )
-+  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* | x86_64* )
-     lt_cv_deplibs_check_method=pass_all ;;
-   *)
-     # glibc up to 2.1.1 does not perform some relocations on ARM
---- flac-1.1.0/aclocal.m4.foo	2004-03-11 16:57:15.862462232 -0500
-+++ flac-1.1.0/aclocal.m4	2004-03-11 16:57:33.537775176 -0500
-@@ -4085,7 +4085,7 @@
- # This must be Linux ELF.
- linux-gnu*)
-   case $host_cpu in
--  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* )
-+  alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* | x86_64* )
-     lt_cv_deplibs_check_method=pass_all ;;
-   *)
-     # glibc up to 2.1.1 does not perform some relocations on ARM
---- flac-1.1.0/configure.moo	2004-03-11 17:06:38.507927120 -0500
-+++ flac-1.1.0/configure	2004-03-11 17:07:03.874070880 -0500
-@@ -11251,9 +11251,9 @@
- if test x$debug = xtrue; then
- 	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -g -O0 -DDEBUG"
- else
--	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O3 -DNDEBUG"
-+	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -DNDEBUG"
- 	if test x$GCC = xyes; then
--		OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -fomit-frame-pointer -funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__"
-+		OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__"
- 	fi
- fi
- CFLAGS="$OUR_CFLAGS_HEAD $CFLAGS"
---- flac-1.1.0/src/plugin_common/Makefile.in.moo	2004-03-11 17:18:48.054019256 -0500
-+++ flac-1.1.0/src/plugin_common/Makefile.in	2004-03-11 17:18:48.058018648 -0500
-@@ -184,7 +184,7 @@
- CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -fPIC
- DIST_SOURCES = $(libplugin_common_a_SOURCES)
- HEADERS = $(noinst_HEADERS)
- 
---- flac-1.1.0/src/share/utf8/Makefile.in.moo	2004-03-11 17:18:42.004938856 -0500
-+++ flac-1.1.0/src/share/utf8/Makefile.in	2004-03-11 17:18:42.008938248 -0500
-@@ -159,7 +159,7 @@
- CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -fPIC
- DIST_SOURCES = $(libutf8_a_SOURCES)
- DIST_COMMON = Makefile.am Makefile.in
- SOURCES = $(libutf8_a_SOURCES)
---- flac-1.1.0/src/share/getopt/Makefile.in.moo	2004-03-11 17:18:42.013937488 -0500
-+++ flac-1.1.0/src/share/getopt/Makefile.in	2004-03-11 17:18:42.016937032 -0500
-@@ -153,7 +153,7 @@
- CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -fPIC
- DIST_SOURCES = $(libgetopt_a_SOURCES)
- DIST_COMMON = Makefile.am Makefile.in
- SOURCES = $(libgetopt_a_SOURCES)
---- flac-1.1.0/src/share/grabbag/Makefile.in.moo	2004-03-11 17:18:42.022936120 -0500
-+++ flac-1.1.0/src/share/grabbag/Makefile.in	2004-03-11 17:18:42.025935664 -0500
-@@ -160,7 +160,7 @@
- CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -fPIC
- DIST_SOURCES = $(libgrabbag_a_SOURCES)
- DIST_COMMON = Makefile.am Makefile.in
- SOURCES = $(libgrabbag_a_SOURCES)
---- flac-1.1.0/src/share/gain_analysis/Makefile.in.moo	2004-03-11 17:18:42.040933384 -0500
-+++ flac-1.1.0/src/share/gain_analysis/Makefile.in	2004-03-11 17:18:42.043932928 -0500
-@@ -153,7 +153,7 @@
- CCLD = $(CC)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -fPIC
- DIST_SOURCES = $(libgain_analysis_a_SOURCES)
- DIST_COMMON = Makefile.am Makefile.in
- SOURCES = $(libgain_analysis_a_SOURCES)
diff --git a/media-libs/flac/files/flac-1.1.0-m4.patch b/media-libs/flac/files/flac-1.1.0-m4.patch
deleted file mode 100644
index 5dd4df183c18..000000000000
--- a/media-libs/flac/files/flac-1.1.0-m4.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- flac-1.1.0/configure.foo	2003-12-12 01:55:33.000000000 -0500
-+++ flac-1.1.0/configure	2003-12-12 01:56:11.000000000 -0500
-@@ -8161,7 +8161,7 @@
-   elif test "x$ogg_prefix" != "x" ; then
-     OGG_LIBS="-L$ogg_prefix/lib"
-   elif test "x$prefix" != "xNONE" ; then
--    OGG_LIBS="-L$prefix/lib"
-+    OGG_LIBS="-L$libdir"
-   fi
- 
-   OGG_LIBS="$OGG_LIBS -logg"
-@@ -8171,7 +8171,7 @@
-   elif test "x$ogg_prefix" != "x" ; then
-     OGG_CFLAGS="-I$ogg_prefix/include"
-   elif test "$prefix" != "xNONE"; then
--    OGG_CFLAGS="-I$prefix/include"
-+    OGG_CFLAGS=""
-   fi
- 
-   echo "$as_me:$LINENO: checking for Ogg" >&5
---- flac-1.1.0/src/libFLAC/libFLAC.m4.cow	2002-07-01 16:37:39.000000000 -0400
-+++ flac-1.1.0/src/libFLAC/libFLAC.m4	2003-12-12 01:56:51.000000000 -0500
-@@ -18,7 +18,7 @@
-   elif test "x$libFLAC_prefix" != "x" ; then
-     LIBFLAC_LIBS="-L$libFLAC_prefix/lib"
-   elif test "x$prefix" != "xNONE" ; then
--    LIBFLAC_LIBS="-L$prefix/lib"
-+    LIBFLAC_LIBS="-L$libdir"
-   fi
- 
-   LIBFLAC_LIBS="$LIBFLAC_LIBS -lFLAC -lm"
---- flac-1.1.0/src/libFLAC++/libFLAC++.m4.cow	2002-07-01 16:37:39.000000000 -0400
-+++ flac-1.1.0/src/libFLAC++/libFLAC++.m4	2003-12-12 01:56:51.000000000 -0500
-@@ -19,7 +19,7 @@
-   elif test "x$libFLACPP_prefix" != "x" ; then
-     LIBFLACPP_LIBS="-L$libFLACPP_prefix/lib"
-   elif test "x$prefix" != "xNONE" ; then
--    LIBFLACPP_LIBS="-L$prefix/lib"
-+    LIBFLACPP_LIBS="-L$libdir"
-   fi
- 
-   LIBFLACPP_LIBS="$LIBFLACPP_LIBS -lFLAC++ $LIBFLAC_LIBS"
---- flac-1.1.0/src/libOggFLAC/libOggFLAC.m4.cow	2002-08-06 01:31:17.000000000 -0400
-+++ flac-1.1.0/src/libOggFLAC/libOggFLAC.m4	2003-12-12 01:56:51.000000000 -0500
-@@ -18,7 +18,7 @@
-   elif test "x$libOggFLAC_prefix" != "x" ; then
-     LIBOGGFLAC_LIBS="-L$libOggFLAC_prefix/lib"
-   elif test "x$prefix" != "xNONE" ; then
--    LIBOGGFLAC_LIBS="-L$prefix/lib"
-+    LIBOGGFLAC_LIBS="-L$libdir"
-   fi
- 
-   LIBOGGFLAC_LIBS="$LIBOGGFLAC_LIBS -lOggFLAC -lFLAC -lm"
---- flac-1.1.0/src/libOggFLAC++/libOggFLAC++.m4.cow	2002-08-07 13:05:16.000000000 -0400
-+++ flac-1.1.0/src/libOggFLAC++/libOggFLAC++.m4	2003-12-12 01:56:51.000000000 -0500
-@@ -19,7 +19,7 @@
-   elif test "x$libOggFLACPP_prefix" != "x" ; then
-     LIBOGGFLACPP_LIBS="-L$libOggFLACPP_prefix/lib"
-   elif test "x$prefix" != "xNONE" ; then
--    LIBOGGFLACPP_LIBS="-L$prefix/lib"
-+    LIBOGGFLACPP_LIBS="-L$libdir"
-   fi
- 
-   LIBOGGFLACPP_LIBS="$LIBOGGFLACPP_LIBS -lOggFLAC++ $LIBOGGFLAC_LIBS"
diff --git a/media-libs/flac/flac-1.1.0-r2.ebuild b/media-libs/flac/flac-1.1.0-r2.ebuild
deleted file mode 100644
index 09ff136b03a6..000000000000
--- a/media-libs/flac/flac-1.1.0-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.0-r2.ebuild,v 1.12 2005/05/15 02:22:05 flameeyes Exp $
-
-inherit libtool eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="free lossless audio encoder which includes an XMMS plugin"
-HOMEPAGE="http://flac.sourceforge.net/"
-SRC_URI="mirror://sourceforge/flac/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="sse xmms"
-
-RDEPEND=">=media-libs/libogg-1.0_rc2
-	xmms? ( media-sound/xmms )"
-DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )
-	sys-apps/gawk"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	if ! use xmms
-	then
-		cp src/Makefile.in src/Makefile.in.orig
-		sed -e '/^@FLaC__HAS_XMMS_TRUE/d' src/Makefile.in.orig > src/Makefile.in || die
-	fi
-
-	epatch ${FILESDIR}/${P}-m4.patch
-	epatch ${FILESDIR}/${P}-libtool.patch
-
-	elibtoolize --reverse-deps
-}
-
-src_compile() {
-	use hppa && [ "`gcc-fullversion`" == "3.4.0" ] && replace-cpu-flags 2.0 1.0
-
-	econf \
-		--with-pic \
-		`use_enable sse` \
-		|| die
-
-	# the man page ebuild requires docbook2man... yick!
-	sed -i -e 's:include man:include:g' Makefile
-
-	# emake seems to mess up the building of the xmms input plugin
-	make || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-}
-
-# see #59482
-src_test() { :; }
diff --git a/media-libs/flac/flac-1.1.0.ebuild b/media-libs/flac/flac-1.1.0.ebuild
deleted file mode 100644
index d31b176385f3..000000000000
--- a/media-libs/flac/flac-1.1.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.0.ebuild,v 1.23 2005/02/05 12:49:35 luckyduck Exp $
-
-inherit libtool
-
-DESCRIPTION="free lossless audio encoder which includes an XMMS plugin"
-HOMEPAGE="http://flac.sourceforge.net/"
-SRC_URI="mirror://sourceforge/flac/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64 mips"
-IUSE="sse xmms X"
-
-RDEPEND=">=media-libs/libogg-1.0_rc2
-	X? ( xmms? ( media-sound/xmms ) )"
-
-DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )
-	sys-apps/gawk"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	#if X not in use, then don't build in xmms support
-	#if xmms not in use, then don't do it either.
-	#if both X and xmms in use, then do it.
-	if ! use xmms || ! use X
-	then
-		cp src/Makefile.in src/Makefile.in.orig
-		sed -e '/^@FLaC__HAS_XMMS_TRUE/d' src/Makefile.in.orig > src/Makefile.in || die
-	fi
-
-	elibtoolize --reverse-deps
-}
-
-src_compile() {
-	# hppa need -fPIC for to compile when X and xmss are in USE
-	if use xmms && use X && [ "${ARCH}" = "hppa" ]
-	then
-		export CFLAGS="${CFLAGS} -fPIC"
-	fi
-	local myconf
-
-	use sse && myconf="--enable-sse"
-
-	econf ${myconf} || die
-	cp Makefile Makefile.orig
-
-	#the man page ebuild requires docbook2man... yick!
-	sed -e 's:include man:include:g' Makefile.orig > Makefile
-
-	#emake seems to mess up the building of the xmms input plugin
-	make || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-}
-
-# see #59482
-src_test() { :; }
diff --git a/media-libs/flac/flac-1.1.2-r1.ebuild b/media-libs/flac/flac-1.1.2-r1.ebuild
deleted file mode 100644
index cc94b837f3a8..000000000000
--- a/media-libs/flac/flac-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.2-r1.ebuild,v 1.4 2005/05/15 02:22:05 flameeyes Exp $
-
-inherit libtool eutils flag-o-matic
-
-DESCRIPTION="free lossless audio encoder which includes an XMMS plugin"
-HOMEPAGE="http://flac.sourceforge.net/"
-SRC_URI="mirror://sourceforge/flac/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~sparc ~x86"
-IUSE="3dnow debug doc ogg sse xmms"
-
-RDEPEND="ogg? ( >=media-libs/libogg-1.0_rc2 )
-	xmms? ( media-sound/xmms )"
-DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )
-	sys-apps/gawk
-	doc? ( app-doc/doxygen )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	if use xmms ; then
-		epatch "${FILESDIR}"/${P}-xmms-config.patch
-	else
-		sed -i -e '/^@FLaC__HAS_XMMS_TRUE/d' src/Makefile.in || die
-		sed -i -e '/AM_PATH_XMMS/d' configure.in || die
-	fi
-
-	epatch "${FILESDIR}/${P}-m4.patch"
-	epatch "${FILESDIR}/${P}-libtool.patch"
-	epatch "${FILESDIR}/${P}-gas.patch"
-	epatch "${FILESDIR}/${P}-makefile.patch"
-	epatch "${FILESDIR}/${P}-noogg.patch"
-	./autogen.sh || die "autogen failed"
-	libtoolize --copy --force
-	elibtoolize --reverse-deps
-}
-
-src_compile() {
-	use doc || export ac_cv_prog_DOXYGEN=''
-	econf \
-		$(use_enable ogg) \
-		$(use_enable sse) \
-		$(use_enable 3dnow) \
-		$(use_enable debug) \
-		--disable-dependency-tracking || die
-
-	# the man page ebuild requires docbook2man... yick!
-	sed -i -e 's:include man:include:g' Makefile
-
-	# emake seems to mess up the building of the xmms input plugin
-	make || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS README
-}
-
-pkg_postinst() {
-	ewarn "If you've upgraded from a previous version of flac, you may need to re-emerge"
-	ewarn "packages that linked against flac by running:"
-	ewarn "revdep-rebuild"
-}
-
-# see #59482
-src_test() { :; }