DEPEND on sys-devel/gettext by Ben Kohler <bkohler@gmail.com>, bug #555000. Remove old.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0xFDF4F788)

4 files changed, 8 insertions, 148 deletions

diff --git a/dev-libs/libdbusmenu/ChangeLog b/dev-libs/libdbusmenu/ChangeLog
index 5b830831900d..d741ddd0ba24 100644
--- a/dev-libs/libdbusmenu/ChangeLog
+++ b/dev-libs/libdbusmenu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libdbusmenu
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/ChangeLog,v 1.37 2015/06/09 14:20:35 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/ChangeLog,v 1.38 2015/07/15 20:22:15 johu Exp $
+
+  15 Jul 2015; Johannes Huber <johu@gentoo.org> -libdbusmenu-0.6.2-r1.ebuild,
+  -libdbusmenu-12.10.2-r1.ebuild, libdbusmenu-12.10.2-r2.ebuild:
+  DEPEND on sys-devel/gettext by Ben Kohler <bkohler@gmail.com>, bug #555000.
+  Remove old.
 
   09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Updating remote-id in metadata.xml
diff --git a/dev-libs/libdbusmenu/libdbusmenu-0.6.2-r1.ebuild b/dev-libs/libdbusmenu/libdbusmenu-0.6.2-r1.ebuild
deleted file mode 100644
index ea160ddd3cbf..000000000000
--- a/dev-libs/libdbusmenu/libdbusmenu-0.6.2-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/libdbusmenu-0.6.2-r1.ebuild,v 1.1 2015/04/05 16:09:44 mgorny Exp $
-
-EAPI=4
-VALA_MIN_API_VERSION=0.16
-VALA_USE_DEPEND=vapigen
-
-inherit eutils flag-o-matic vala
-
-DESCRIPTION="Library to pass menu structure across DBus"
-HOMEPAGE="http://launchpad.net/dbusmenu"
-SRC_URI="http://launchpad.net/${PN/lib}/${PV%.*}/${PV}/+download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
-IUSE="debug gtk3 +introspection"
-
-RDEPEND=">=dev-libs/glib-2.32
-	>=dev-libs/dbus-glib-0.100
-	dev-libs/libxml2
-	gtk3? ( >=x11-libs/gtk+-3.2:3[introspection?] )
-	introspection? ( >=dev-libs/gobject-introspection-1 )
-	!<${CATEGORY}/${PN}-0.5.1-r200"
-DEPEND="${RDEPEND}
-	app-text/gnome-doc-utils
-	dev-util/intltool
-	virtual/pkgconfig
-	introspection? ( $(vala_depend) )"
-
-src_prepare() {
-	if use introspection; then
-		vala_src_prepare
-		export VALA_API_GEN="${VAPIGEN}"
-	fi
-}
-
-src_configure() {
-	append-flags -Wno-error #414323
-
-	# dumper extra tool is only for GTK+-2.x, tests use valgrind which is stupid
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-static \
-		--disable-silent-rules \
-		--disable-scrollkeeper \
-		$(use_enable gtk3 gtk) \
-		--disable-dumper \
-		--disable-tests \
-		$(use_enable introspection) \
-		$(use_enable introspection vala) \
-		$(use_enable debug massivedebugging) \
-		--with-html-dir=/usr/share/doc/${PF}/html \
-		--with-gtk=3
-}
-
-src_test() { :; } #440192
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog README
-
-	local a b
-	for a in ${PN}-{glib,gtk}; do
-		b=/usr/share/doc/${PF}/html/${a}
-		[[ -d ${ED}/${b} ]] && dosym ${b} /usr/share/gtk-doc/html/${a}
-	done
-
-	prune_libtool_files
-}
diff --git a/dev-libs/libdbusmenu/libdbusmenu-12.10.2-r1.ebuild b/dev-libs/libdbusmenu/libdbusmenu-12.10.2-r1.ebuild
deleted file mode 100644
index 4388793c0177..000000000000
--- a/dev-libs/libdbusmenu/libdbusmenu-12.10.2-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/libdbusmenu-12.10.2-r1.ebuild,v 1.2 2015/04/08 17:51:55 mgorny Exp $
-
-EAPI=5
-
-VALA_MIN_API_VERSION=0.16
-VALA_USE_DEPEND=vapigen
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils flag-o-matic python-single-r1 vala
-
-DESCRIPTION="Library to pass menu structure across DBus"
-HOMEPAGE="http://launchpad.net/dbusmenu"
-SRC_URI="http://launchpad.net/${PN/lib}/${PV%.*}/${PV}/+download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1 LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug gtk3 +introspection"
-
-RDEPEND="
-	>=dev-libs/dbus-glib-0.100
-	>=dev-libs/json-glib-0.13.4
-	>=dev-libs/glib-2.32
-	dev-libs/libxml2
-	gtk3? ( >=x11-libs/gtk+-3.2:3[introspection?] )
-	introspection? ( >=dev-libs/gobject-introspection-1 )
-	!<${CATEGORY}/${PN}-0.5.1-r200"
-DEPEND="${RDEPEND}
-	app-text/gnome-doc-utils
-	dev-util/intltool
-	virtual/pkgconfig
-	introspection? ( $(vala_depend) )"
-
-src_prepare() {
-	if use introspection; then
-		vala_src_prepare
-		export VALA_API_GEN="${VAPIGEN}"
-	fi
-	python_fix_shebang tools
-}
-
-src_configure() {
-	append-flags -Wno-error #414323
-
-	# dumper extra tool is only for GTK+-2.x, tests use valgrind which is stupid
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-static \
-		--disable-silent-rules \
-		--disable-scrollkeeper \
-		$(use_enable gtk3 gtk) \
-		--disable-dumper \
-		$(use_enable introspection) \
-		$(use_enable introspection vala) \
-		$(use_enable debug massivedebugging) \
-		--with-html-dir=/usr/share/doc/${PF}/html \
-		--with-gtk=3
-}
-
-src_test() { :; } #440192
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-	einstalldocs
-
-	local a b
-	for a in ${PN}-{glib,gtk}; do
-		b=/usr/share/doc/${PF}/html/${a}
-		[[ -d ${ED}/${b} ]] && dosym ${b} /usr/share/gtk-doc/html/${a}
-	done
-
-	prune_libtool_files
-}
diff --git a/dev-libs/libdbusmenu/libdbusmenu-12.10.2-r2.ebuild b/dev-libs/libdbusmenu/libdbusmenu-12.10.2-r2.ebuild
index 68ff88ccfa7a..ef77f64b7f9a 100644
--- a/dev-libs/libdbusmenu/libdbusmenu-12.10.2-r2.ebuild
+++ b/dev-libs/libdbusmenu/libdbusmenu-12.10.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/libdbusmenu-12.10.2-r2.ebuild,v 1.1 2015/04/19 16:30:45 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/libdbusmenu-12.10.2-r2.ebuild,v 1.2 2015/07/15 20:22:15 johu Exp $
 
 EAPI=5
 
@@ -31,6 +31,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	app-text/gnome-doc-utils
 	dev-util/intltool
+	sys-devel/gettext
 	virtual/pkgconfig[${MULTILIB_USEDEP}]
 	introspection? ( $(vala_depend) )"