Version bump.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 13 insertions, 106 deletions

diff --git a/media-sound/aumix/ChangeLog b/media-sound/aumix/ChangeLog
index 4f40a0de2cb9..cd268f20cdd8 100644
--- a/media-sound/aumix/ChangeLog
+++ b/media-sound/aumix/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/aumix
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aumix/ChangeLog,v 1.67 2010/04/14 11:50:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aumix/ChangeLog,v 1.68 2010/06/11 17:33:32 ssuominen Exp $
+
+*aumix-2.9.1 (11 Jun 2010)
+
+  11 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> +aumix-2.9.1.ebuild:
+  Version bump.
 
 *aumix-2.9 (14 Apr 2010)
 
diff --git a/media-sound/aumix/aumix-2.8-r5.ebuild b/media-sound/aumix/aumix-2.8-r5.ebuild
deleted file mode 100644
index 8960227ccc09..000000000000
--- a/media-sound/aumix/aumix-2.8-r5.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aumix/aumix-2.8-r5.ebuild,v 1.1 2009/05/12 11:43:57 ssuominen Exp $
-
-EAPI=2
-inherit eutils
-
-DESCRIPTION="Aumix volume/mixer control program"
-HOMEPAGE="http://jpj.net/~trevor/aumix.html"
-SRC_URI="http://jpj.net/~trevor/aumix/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="gpm gtk nls"
-
-RDEPEND=">=sys-libs/ncurses-5.2
-	gpm? ( >=sys-libs/gpm-1.19.3 )
-	gtk? ( >=x11-libs/gtk+-2:2 )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	sys-apps/findutils
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-nohome.patch \
-		"${FILESDIR}"/${P}-close-dialogs.patch \
-		"${FILESDIR}"/${P}-save_load.patch \
-		"${FILESDIR}"/${P}-nls.patch \
-		"${FILESDIR}"/${P}-mute.patch \
-		"${FILESDIR}"/${P}-noninter_strncpy.patch
-
-	# Prevent autotools from rerunning, bug #70379.
-	touch aclocal.m4 configure
-	find . -name Makefile.in -o -name stamp-h.in -print0 | xargs -0 touch;
-	touch configure
-}
-
-src_configure() {
-	local myconf="--without-gtk1"
-
-	use gtk || myconf="${myconf} --without-gtk"
-	use gpm || myconf="${myconf} --without-gpm"
-
-	econf \
-		$(use_enable nls) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
-
-	newinitd "${FILESDIR}"/aumix.rc6 aumix
-
-	if use gtk; then
-		doicon data/aumix.xpm
-		make_desktop_entry aumix Aumix aumix
-	fi
-}
diff --git a/media-sound/aumix/aumix-2.9.ebuild b/media-sound/aumix/aumix-2.9.1.ebuild
index cb19c797d4ef..7730049f21c1 100644
--- a/media-sound/aumix/aumix-2.9.ebuild
+++ b/media-sound/aumix/aumix-2.9.1.ebuild
@@ -1,39 +1,27 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aumix/aumix-2.9.ebuild,v 1.1 2010/04/14 11:50:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aumix/aumix-2.9.1.ebuild,v 1.1 2010/06/11 17:33:32 ssuominen Exp $
 
 EAPI=2
 inherit eutils
 
 DESCRIPTION="Aumix volume/mixer control program"
 HOMEPAGE="http://jpj.net/~trevor/aumix.html"
-SRC_URI="http://jpj.net/~trevor/aumix/${P}.tar.bz2"
+SRC_URI="http://jpj.net/~trevor/aumix/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE="gpm gtk nls"
 
-RDEPEND=">=sys-libs/ncurses-5.2
-	gpm? ( >=sys-libs/gpm-1.19.3 )
+RDEPEND="sys-libs/ncurses
+	gpm? ( sys-libs/gpm )
 	gtk? ( x11-libs/gtk+:2 )
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
-	sys-apps/findutils
+	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
 
-src_prepare() {
-	# 2.9 was released, none of this was applied. why?
-	epatch "${FILESDIR}"/${PN}-2.8-nohome.patch \
-		"${FILESDIR}"/${PN}-2.8-save_load.patch \
-		"${FILESDIR}"/${PN}-2.8-nls.patch \
-		"${FILESDIR}"/${PN}-2.8-mute.patch \
-		"${FILESDIR}"/${PN}-2.8-noninter_strncpy.patch
-
-	# Prevent autotools from rerunning, bug #70379.
-	find . -print0 |xargs -0 touch
-}
-
 src_configure() {
 	local myconf
 
@@ -42,7 +30,7 @@ src_configure() {
 
 	econf \
 		$(use_enable nls) \
-		--without-gtk1 \
+		--disable-dependency-tracking \
 		${myconf}
 }
 
@@ -54,6 +42,6 @@ src_install() {
 
 	if use gtk; then
 		doicon data/aumix.xpm
-		make_desktop_entry aumix Aumix aumix
+		make_desktop_entry aumix Aumix
 	fi
 }
diff --git a/media-sound/aumix/files/aumix-2.8-noninter_strncpy.patch b/media-sound/aumix/files/aumix-2.8-noninter_strncpy.patch
deleted file mode 100644
index 2c68873c29ae..000000000000
--- a/media-sound/aumix/files/aumix-2.8-noninter_strncpy.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur aumix-2.8.orig/src/common.c aumix-2.8/src/common.c
---- aumix-2.8.orig/src/common.c	2002-10-29 23:27:51.000000000 +0200
-+++ aumix-2.8/src/common.c	2009-05-12 14:36:08.000000000 +0300
-@@ -612,17 +612,18 @@
- int             SetShowNoninter(int dev)
- {
- /* Change or display settings from the command line. */
--	char           *devstr, dest;
-+	char           *devstr;
-+	char            dest[4];
- 	int             change = 0, tmp, left, right;
- 	/* Increase or decrease levels, optionally by a number. */
- 	if (!strncmp(optarg, "+", 1) || !strncmp(optarg, "-", 1)) {
- 		ErrorExitWarn(ReadLevel(dev, &tmp), 'e');
- 		right = tmp >> 8;	/* I'll take the high byte, */
- 		left = tmp & 0xFF;	/* and you take the low byte. */
--		strncpy(&dest, (optarg + 1), 3);
-+		strncpy(dest, (optarg + 1), 3);
- 		change = 1;	/* For compatibility with versions 1.15 to 1.17, assume one if no number was given. */
--		if (atoi(&dest))
--			change = atoi(&dest);
-+		if (atoi(dest))
-+			change = atoi(dest);
- 		if (*optarg == '+') {	/* increase */
- 			right += change;
- 			left += change;