5 files changed, 14 insertions, 98 deletions
diff --git a/media-sound/bossogg/ChangeLog b/media-sound/bossogg/ChangeLog
index 49e5618fcf80..dfb8f5f7d7c5 100644
--- a/media-sound/bossogg/ChangeLog
+++ b/media-sound/bossogg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/bossogg
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bossogg/ChangeLog,v 1.17 2005/12/26 14:55:15 lu_zero Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bossogg/ChangeLog,v 1.18 2006/02/04 15:15:17 flameeyes Exp $
+
+  04 Feb 2006; Diego Pettenò <flameeyes@gentoo.org> -bossogg-0.13.6.ebuild,
+  bossogg-0.13.6-r2.ebuild, bossogg-0.13.6-r3.ebuild:
+  Old version cleanup. Remove dependency on autoconf/automake as autotools
+  eclass takes care of that. Fix autotools calls in stable (libtoolize after
+  aclocal might screw up things in very bad ways).
 
   26 Dec 2005; Luca Barbato <lu_zero@gentoo.org> bossogg-0.13.5.ebuild,
   bossogg-0.13.6.ebuild, bossogg-0.13.6-r2.ebuild:
diff --git a/media-sound/bossogg/bossogg-0.13.6-r2.ebuild b/media-sound/bossogg/bossogg-0.13.6-r2.ebuild
index 3a527144846a..bf8d27811603 100644
--- a/media-sound/bossogg/bossogg-0.13.6-r2.ebuild
+++ b/media-sound/bossogg/bossogg-0.13.6-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bossogg/bossogg-0.13.6-r2.ebuild,v 1.3 2005/12/26 14:55:15 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bossogg/bossogg-0.13.6-r2.ebuild,v 1.4 2006/02/04 15:15:17 flameeyes Exp $
 
-inherit eutils
+inherit eutils autotools
 
 IUSE="vorbis mad flac"
 
@@ -23,25 +23,15 @@ DEPEND=">=media-libs/libao-0.8.3
 RDEPEND="${DEPEND}
 	 dev-python/pysqlite"
 
-DEPEND="${DEPEND}
-	>=sys-devel/automake-1.7"
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 
 	epatch ${FILESDIR}/${P}-Makefile.patch
-	touch NEWS AUTHORS
-
-	export WANT_AUTOMAKE=1.7
-	export WANT_AUTOCONF=2.5
-	aclocal || die
-	automake || die
-	autoconf || die
+	eautoreconf
 }
 
 src_compile() {
-	libtoolize --copy --force	# per bug number 83003
 	econf --enable-shout \
 	      `use_enable vorbis` \
 	      `use_enable flac` \
diff --git a/media-sound/bossogg/bossogg-0.13.6-r3.ebuild b/media-sound/bossogg/bossogg-0.13.6-r3.ebuild
index dcef4d6b6dc7..49b2f4cfee6a 100644
--- a/media-sound/bossogg/bossogg-0.13.6-r3.ebuild
+++ b/media-sound/bossogg/bossogg-0.13.6-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bossogg/bossogg-0.13.6-r3.ebuild,v 1.2 2005/11/07 10:42:52 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bossogg/bossogg-0.13.6-r3.ebuild,v 1.3 2006/02/04 15:15:17 flameeyes Exp $
 
 inherit eutils autotools
 
@@ -25,10 +25,6 @@ DEPEND=">=media-libs/libao-0.8.3
 RDEPEND="${DEPEND}
 	 dev-python/pysqlite"
 
-DEPEND="${DEPEND}
-	>=sys-devel/autoconf-2.5
-	=sys-devel/automake-1.7*"
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
diff --git a/media-sound/bossogg/bossogg-0.13.6.ebuild b/media-sound/bossogg/bossogg-0.13.6.ebuild
deleted file mode 100644
index d48c113b303c..000000000000
--- a/media-sound/bossogg/bossogg-0.13.6.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bossogg/bossogg-0.13.6.ebuild,v 1.13 2005/12/26 14:55:15 lu_zero Exp $
-
-inherit eutils
-
-IUSE="vorbis mad flac"
-
-DESCRIPTION="Bossogg Music Server"
-HOMEPAGE="http://bossogg.wishy.org"
-SRC_URI="mirror://sourceforge/bossogg/${P}.tar.gz"
-
-KEYWORDS="x86 sparc amd64"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND=">=media-libs/libao-0.8.3
-	media-libs/libshout
-	flac? ( media-libs/flac )
-	vorbis? ( media-libs/libvorbis )
-	mad? ( media-sound/madplay media-libs/id3lib )"
-
-RDEPEND="${DEPEND}
-	 dev-python/pysqlite"
-
-DEPEND="${DEPEND}
-	>=sys-devel/automake-1.7"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${P}-Makefile.patch
-	touch NEWS AUTHORS
-
-	export WANT_AUTOMAKE=1.7
-	export WANT_AUTOCONF=2.5
-	aclocal || die
-	automake || die
-	autoconf || die
-	elibtoolize
-}
-
-src_compile() {
-	econf --enable-shout \
-	      `use_enable vorbis` \
-	      `use_enable flac` \
-	      `use_enable mad mp3` \
-	      `use_enable mad id3` || die "could not configure"
-
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc README TODO API
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/bossogg.initd bossogg
-}
-
-pkg_postinst() {
-	enewgroup bossogg
-	enewuser bossogg -1 /bin/bash /var/bossogg bossogg -G audio
-
-	if ! [ -d /var/bossogg ]; then
-		mkdir /var/bossogg
-		chown bossogg:bossogg /var/bossogg
-	fi
-
-	einfo "After running the /etc/init.d/bossogg service for the first"
-	einfo "time, /var/bossogg/.bossogg/bossogg.conf will be created."
-	einfo "Please edit this file and restart the service to setup."
-	einfo "the server."
-}
diff --git a/media-sound/bossogg/files/digest-bossogg-0.13.6 b/media-sound/bossogg/files/digest-bossogg-0.13.6
deleted file mode 100644
index 20eba3e830e5..000000000000
--- a/media-sound/bossogg/files/digest-bossogg-0.13.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cdb4708339bb2487549cf225a29ce889 bossogg-0.13.6.tar.gz 338025