3 files changed, 62 insertions, 7 deletions
diff --git a/dev-libs/libunique/ChangeLog b/dev-libs/libunique/ChangeLog
index b14e09c5cdfa..8d3457d7d486 100644
--- a/dev-libs/libunique/ChangeLog
+++ b/dev-libs/libunique/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libunique
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libunique/ChangeLog,v 1.38 2011/04/10 10:52:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libunique/ChangeLog,v 1.39 2011/04/24 17:05:44 nirbheek Exp $
+
+*libunique-3.0.0 (24 Apr 2011)
+
+  24 Apr 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  libunique-1.1.6.ebuild, +libunique-3.0.0.ebuild:
+  Move libunique:3 from the gnome overlay to tree, use GNOME2_LA_PUNT
+  instead of a 'find' call, ~hppa dropped w.r.t. KEYWORDREQ bug 364693
 
   10 Apr 2011; Samuli Suominen <ssuominen@gentoo.org> libunique-1.1.6.ebuild:
   Punt useless libtool file.
diff --git a/dev-libs/libunique/libunique-1.1.6.ebuild b/dev-libs/libunique/libunique-1.1.6.ebuild
index 52b474f5e106..ade113d4c47b 100644
--- a/dev-libs/libunique/libunique-1.1.6.ebuild
+++ b/dev-libs/libunique/libunique-1.1.6.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libunique/libunique-1.1.6.ebuild,v 1.16 2011/04/10 10:52:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libunique/libunique-1.1.6.ebuild,v 1.17 2011/04/24 17:05:44 nirbheek Exp $
 
 EAPI="2"
+GNOME2_LA_PUNT="yes"
 
 inherit gnome2 virtualx
 
@@ -50,8 +51,3 @@ src_test() {
 	cp "${FILESDIR}/run-tests" . || die "Unable to cp \${FILESDIR}/run-tests"
 	Xemake -f run-tests || die "Tests failed"
 }
-
-src_install() {
-	gnome2_src_install
-	find "${D}" -name '*.la' -exec rm -f {} +
-}
diff --git a/dev-libs/libunique/libunique-3.0.0.ebuild b/dev-libs/libunique/libunique-3.0.0.ebuild
new file mode 100644
index 000000000000..65c86068297c
--- /dev/null
+++ b/dev-libs/libunique/libunique-3.0.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libunique/libunique-3.0.0.ebuild,v 1.1 2011/04/24 17:05:44 nirbheek Exp $
+
+EAPI="3"
+GCONF_DEBUF="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 virtualx
+
+DESCRIPTION="a library for writing single instance application"
+HOMEPAGE="http://live.gnome.org/LibUnique"
+
+LICENSE="LGPL-2.1"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
+IUSE="doc +introspection"
+
+RDEPEND=">=dev-libs/glib-2.25.7:2
+	>=x11-libs/gtk+-2.90.0:3[introspection?]
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.17
+	doc? ( >=dev-util/gtk-doc-1.13 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.0 )"
+# For eautoreconf
+#	dev-util/gtk-doc-am
+
+pkg_setup() {
+	DOCS="AUTHORS NEWS ChangeLog README TODO"
+	# --disable-dbus means gdbus is used instead of dbus-glib
+	G2CONF="${G2CONF}
+		--disable-static
+		--disable-maintainer-flags
+		--disable-dbus
+		$(use_enable introspection)"
+}
+
+src_test() {
+	cd "${S}/tests"
+
+	# Fix environment variable leakage (due to `su` etc)
+	unset DBUS_SESSION_BUS_ADDRESS
+
+	# Force Xemake to use Xvfb, bug 279840
+	unset XAUTHORITY
+	unset DISPLAY
+
+	cp "${FILESDIR}/run-tests" . || die "Unable to cp \${FILESDIR}/run-tests"
+	Xemake -f run-tests || die "Tests failed"
+}