amd64 stable wrt #305921

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

3 files changed, 9 insertions, 56 deletions

diff --git a/media-sound/paprefs/ChangeLog b/media-sound/paprefs/ChangeLog
index 67bcfe2620b9..899cb81194a1 100644
--- a/media-sound/paprefs/ChangeLog
+++ b/media-sound/paprefs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/paprefs
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/paprefs/ChangeLog,v 1.19 2009/12/10 18:00:49 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/paprefs/ChangeLog,v 1.20 2010/02/19 18:46:48 ssuominen Exp $
+
+  19 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> paprefs-0.9.9.ebuild:
+  amd64 stable wrt #305921
 
   10 Dec 2009; Samuli Suominen <ssuominen@gentoo.org> paprefs-0.9.6.ebuild,
   paprefs-0.9.8.ebuild, paprefs-0.9.9.ebuild:
diff --git a/media-sound/paprefs/paprefs-0.9.8.ebuild b/media-sound/paprefs/paprefs-0.9.8.ebuild
deleted file mode 100644
index 2a50a8194f66..000000000000
--- a/media-sound/paprefs/paprefs-0.9.8.ebuild
+++ /dev/null
@@ -1,49 +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/paprefs/paprefs-0.9.8.ebuild,v 1.3 2009/12/10 18:00:49 ssuominen Exp $
-
-EAPI=2
-inherit autotools
-
-DESCRIPTION="PulseAudio Preferences, configuration dialog for PulseAudio"
-HOMEPAGE="http://0pointer.de/lennart/projects/paprefs"
-SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="nls"
-
-# Icon Theme is used for Icon=preferences-desktop in desktop entry.
-RDEPEND=">=dev-cpp/gtkmm-2.4
-	>=dev-cpp/libglademm-2.4
-	>=dev-cpp/gconfmm-2.6
-	>=dev-libs/libsigc++-2.2:2
-	>=media-sound/pulseaudio-0.9.5[glib]
-	|| ( x11-themes/tango-icon-theme x11-themes/gnome-icon-theme )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext
-		dev-util/intltool )
-	dev-util/pkgconfig"
-
-src_prepare() {
-	# This package was intltoolized with broken version. Please drop this
-	# hack from next ebuild.
-	if use nls; then
-		intltoolize --force --copy --automake || die "intltoolize failed"
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-lynx \
-		$(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dohtml -r doc
-	dodoc README
-}
diff --git a/media-sound/paprefs/paprefs-0.9.9.ebuild b/media-sound/paprefs/paprefs-0.9.9.ebuild
index dedfccd85598..268bbeb57f89 100644
--- a/media-sound/paprefs/paprefs-0.9.9.ebuild
+++ b/media-sound/paprefs/paprefs-0.9.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/paprefs/paprefs-0.9.9.ebuild,v 1.2 2009/12/10 18:00:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/paprefs/paprefs-0.9.9.ebuild,v 1.3 2010/02/19 18:46:48 ssuominen Exp $
 
 EAPI=2
 
@@ -10,10 +10,9 @@ SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc ~x86"
 IUSE="nls"
 
-# Icon Theme is used for Icon=preferences-desktop in desktop entry.
 RDEPEND=">=dev-cpp/gtkmm-2.4
 	>=dev-cpp/libglademm-2.4
 	>=dev-cpp/gconfmm-2.6
@@ -33,7 +32,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install || die
 	dohtml -r doc
 	dodoc README
 }