punt old, tidy

(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

3 files changed, 6 insertions, 79 deletions

diff --git a/x11-libs/libnotify/libnotify-0.5.2.ebuild b/x11-libs/libnotify/libnotify-0.5.2.ebuild
index ab5daf0fa970..30ecb7ce7fe5 100644
--- a/x11-libs/libnotify/libnotify-0.5.2.ebuild
+++ b/x11-libs/libnotify/libnotify-0.5.2.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libnotify/libnotify-0.5.2.ebuild,v 1.3 2011/03/16 11:04:33 hwoarang Exp $
-
-EAPI="3"
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libnotify/libnotify-0.5.2.ebuild,v 1.4 2011/03/29 08:47:17 ssuominen Exp $
 
+EAPI=3
 inherit gnome.org
 
 DESCRIPTION="Notifications library"
@@ -34,6 +33,6 @@ src_configure() {
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS || die "dodoc failed"
+	emake install DESTDIR="${D}" || die
+	dodoc AUTHORS ChangeLog NEWS || die
 }
diff --git a/x11-libs/libnotify/libnotify-0.7.1.ebuild b/x11-libs/libnotify/libnotify-0.7.1.ebuild
deleted file mode 100644
index f4861dcff015..000000000000
--- a/x11-libs/libnotify/libnotify-0.7.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libnotify/libnotify-0.7.1.ebuild,v 1.8 2011/03/13 11:50:46 ssuominen Exp $
-
-EAPI=3
-inherit autotools eutils gnome.org
-
-DESCRIPTION="Notifications library"
-HOMEPAGE="http://www.galago-project.org/"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/introspection-20110205.m4.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="doc +introspection test"
-
-RDEPEND=">=dev-libs/glib-2.26:2
-	x11-libs/gdk-pixbuf:2
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/gtk-doc-am
-	doc? ( >=dev-util/gtk-doc-1.14 )
-	test? ( >=x11-libs/gtk+-2.90:3 )"
-PDEPEND="|| (
-	x11-misc/notification-daemon
-	xfce-extra/xfce4-notifyd
-	x11-misc/notify-osd
-	>=x11-wm/awesome-3.4.4
-	kde-base/knotify
-)"
-
-src_unpack() {
-	# If gobject-introspection is installed, we don't need the extra .m4
-	if has_version "dev-libs/gobject-introspection"; then
-		unpack ${P}.tar.bz2
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	# Add configure switch for gtk+:3 based tests
-	# and make tests build only when needed
-	epatch "${FILESDIR}"/${PN}-0.7.1-gtk3-tests.patch
-
-	AT_M4DIR=${WORKDIR} eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		--disable-dependency-tracking \
-		$(use_enable introspection) \
-		$(use_enable test tests)
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS ChangeLog NEWS || die
-
-	find "${ED}" -name '*.la' -exec rm -f '{}' +
-}
-
-pkg_preinst() {
-	preserve_old_lib /usr/$(get_libdir)/libnotify.so.1
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libnotify.so.1
-}
diff --git a/x11-libs/libnotify/libnotify-0.7.2.ebuild b/x11-libs/libnotify/libnotify-0.7.2.ebuild
index 9a81ea759357..039c8ad83286 100644
--- a/x11-libs/libnotify/libnotify-0.7.2.ebuild
+++ b/x11-libs/libnotify/libnotify-0.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libnotify/libnotify-0.7.2.ebuild,v 1.1 2011/03/23 02:18:19 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libnotify/libnotify-0.7.2.ebuild,v 1.2 2011/03/29 08:47:17 ssuominen Exp $
 
 EAPI=3
 inherit autotools eutils gnome.org
@@ -60,7 +60,7 @@ src_install() {
 	emake install DESTDIR="${D}" || die
 	dodoc AUTHORS ChangeLog NEWS || die
 
-	find "${ED}" -name '*.la' -exec rm -f '{}' +
+	find "${ED}" -name '*.la' -exec rm -f {} +
 }
 
 pkg_preinst() {