old

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

3 files changed, 17 insertions, 49 deletions

diff --git a/net-libs/gupnp-ui/ChangeLog b/net-libs/gupnp-ui/ChangeLog
index c2a0d79f2742..fefb92322790 100644
--- a/net-libs/gupnp-ui/ChangeLog
+++ b/net-libs/gupnp-ui/ChangeLog
@@ -1,20 +1,17 @@
 # ChangeLog for net-libs/gupnp-ui
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp-ui/ChangeLog,v 1.4 2008/11/24 18:27:46 ssuominen Exp $
-
-  24 Nov 2008; <ssuominen@gentoo.org> metadata.xml:
-  Re-assign to net-p2p herd.
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp-ui/ChangeLog,v 1.5 2009/06/18 07:48:27 ssuominen Exp $
 
 *gupnp-ui-0.1.1 (28 Oct 2008)
 
   28 Oct 2008; Olivier Crête <tester@gentoo.org> +gupnp-ui-0.1.1.ebuild:
   Version bump, bug #241338
 
-  01 Nov 2007; Samuli Suominen <drac@gentoo.org> gupnp-ui-0.1.ebuild:
-  keyword ~amd64.
+  01 Nov 2007; Samuli Suominen <ssuominen@gentoo.org> gupnp-ui-0.1.ebuild:
+  Keyword ~amd64.
 
 *gupnp-ui-0.1 (13 Sep 2007)
 
-  13 Sep 2007; Samuli Suominen <drac@gentoo.org> +gupnp-ui-0.1.ebuild:
+  13 Sep 2007; Samuli Suominen <ssuominen@gentoo.org> +gupnp-ui-0.1.ebuild:
   Initial commit.
 
diff --git a/net-libs/gupnp-ui/gupnp-ui-0.1.1.ebuild b/net-libs/gupnp-ui/gupnp-ui-0.1.1.ebuild
index 1b534d068163..df9a0f177319 100644
--- a/net-libs/gupnp-ui/gupnp-ui-0.1.1.ebuild
+++ b/net-libs/gupnp-ui/gupnp-ui-0.1.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp-ui/gupnp-ui-0.1.1.ebuild,v 1.1 2008/10/28 21:42:52 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp-ui/gupnp-ui-0.1.1.ebuild,v 1.2 2009/06/18 07:48:27 ssuominen Exp $
+
+EAPI=2
 
 DESCRIPTION="Collection of simple GTK+ widgets on top of GUPnP."
 HOMEPAGE="http://gupnp.org"
@@ -9,22 +11,21 @@ SRC_URI="http://gupnp.org/sources/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc"
+IUSE=""
 
-RDEPEND=">=x11-libs/gtk+-2
-	>=net-libs/gupnp-0.3"
+RDEPEND="x11-libs/gtk+:2
+	net-libs/gupnp"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	sys-devel/gettext
-	doc? ( dev-util/gtk-doc )"
+	sys-devel/gettext"
 
-src_compile() {
-	econf $(use_enable doc gtk-doc)
-	emake || die "emake failed."
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--disable-gtk-doc
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS NEWS README
-	use doc || rm -rf "${D}"/usr/share/gtk-doc/html/${PN}
 }
diff --git a/net-libs/gupnp-ui/gupnp-ui-0.1.ebuild b/net-libs/gupnp-ui/gupnp-ui-0.1.ebuild
deleted file mode 100644
index 1b12c14aadc7..000000000000
--- a/net-libs/gupnp-ui/gupnp-ui-0.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gupnp-ui/gupnp-ui-0.1.ebuild,v 1.2 2007/11/01 16:35:40 drac Exp $
-
-DESCRIPTION="Collection of simple GTK+ widgets on top of GUPnP."
-HOMEPAGE="http://gupnp.org"
-SRC_URI="http://gupnp.org/sources/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=x11-libs/gtk+-2
-	>=net-libs/gupnp-0.3"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	sys-devel/gettext
-	doc? ( dev-util/gtk-doc )"
-
-src_compile() {
-	econf $(use_enable doc gtk-doc)
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS NEWS README
-	use doc || rm -rf "${D}"/usr/share/gtk-doc/html/${PN}
-}