libdbusmenu: Add 0.4.5 and 0.4.90

(Portage version: 2.2.0_alpha44/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 84F20B43)

4 files changed, 295 insertions, 3 deletions

diff --git a/dev-libs/libdbusmenu/Manifest b/dev-libs/libdbusmenu/Manifest
index 2db43c4..ad31f62 100644
--- a/dev-libs/libdbusmenu/Manifest
+++ b/dev-libs/libdbusmenu/Manifest
@@ -7,13 +7,18 @@ AUX libdbusmenu-0.3.16-optional-tests.patch 1530 RMD160 c19af1685c486d9899a8e6ac
 AUX libdbusmenu-0.3.16-optional-vala.patch 1500 RMD160 3f180c443d3c734a2a0126385cdb03b90ce5f3fd SHA1 e84dadeea86767b5d9dc4b479465cc605afd1a49 SHA256 6fe47c788a6ba8496e52e5eb0410ae990a82a152cf94559b609f5037ad9a3225
 AUX libdbusmenu-0.3.94-decouple-testapp.patch 452 RMD160 d1b40ffc8d7cfbd181c8d1ce572a1f355902e0d3 SHA1 70a59fba59195835278f1946f4ecf398bead49de SHA256 1bc6ec38ae035466cf7db56efac359d19ebeabb90f6571c95d4e94af85f9574d
 AUX libdbusmenu-0.4.4-optional-gtk.patch 3772 RMD160 1a6049c1e24b6869eba85908123eef53cc3a87ad SHA1 3a1c24423fa34532da42b65221f4f8b5fbc93af9 SHA256 9d51fc010109a69e28cf8d05e1afa7a40685051f6fb1a79a84340ccb1407a0c5
+AUX libdbusmenu-0.4.90-optional-gtk.patch 3524 RMD160 4053f4f25c629494e744f4941c0bccf85cc07ddb SHA1 3692f1bd71cfe09c22aa016c7de08fe3dfc0f468 SHA256 3776c45fc1372f11264f366d2d05e0b1670d1173638540e313a050d2ebe9f637
 DIST libdbusmenu-0.4.4.tar.gz 1297118 RMD160 1bc6e31be2008fa2ec6842067b86d3e8beadddc6 SHA1 f94e06a16617a7ab704eb5d6a9a78165bcf37e32 SHA256 89c3b44cdda252717406152fac10f9845cbafbb55cf402e9361b341f6f6a64c6
+DIST libdbusmenu-0.4.5.tar.gz 1395039 RMD160 b5ea31328375a00b987d47049793cd09c6696b36 SHA1 53caeaf71378574cb8b0b48b3053a9a1f58356ef SHA256 4e8f00326f4bc51ab84cac276080f90070a0976099a5d305294e8f1c0d62add1
+DIST libdbusmenu-0.4.90.tar.gz 693434 RMD160 07853642047487622404c991d45c8c9e1c801073 SHA1 b82cd33bfc02e5293bf9e5dc00c35c26e8cb1e3c SHA256 c430d37036a1f08b3ae52114fcc95141f843e45e41e0ccf9270455d8eb6b457b
 EBUILD libdbusmenu-0.4.4.ebuild 2517 RMD160 34ba6d2e1346166aa87ba63facb20036a6944376 SHA1 560e3be03a42902d9b6a3d1e7d957199ba1ea786 SHA256 20e5880969f09a6e38edcca9004e3c152cfab8e0b6f6c56a342197362e06de66
+EBUILD libdbusmenu-0.4.5.ebuild 2524 RMD160 d92ae6c03be81e5ff8d01d7730e09d4e26ec3786 SHA1 63d5e5f05941c0a2eabc5123e0f466c531e1a04e SHA256 12748a60891c253e0098617c5783c90b58d165663474ca8eb93e17536a77c3a4
+EBUILD libdbusmenu-0.4.90.ebuild 2526 RMD160 9abb503bbc485ccef2cfe827c1c5fe8501979c3c SHA1 2458ca3e57cd451a4535811f8bdf295cf0be7f67 SHA256 9069f0a844ba2cabfbf57dc08bfd16f51597082ec10bb63a62e44cd439e8b389
 MISC metadata.xml 329 RMD160 ca3029bd8fece0ce6888b9689d554bf0ad4ed1dc SHA1 c8739c065cdaba2b7259fd44e8e6fc890efa1f37 SHA256 244b7f61aed94c089d2b5421c017ed225943c76eec8b1b20b536fd83fe58cd94
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk31DZgACgkQmWq1bYTyC0NadwEAp0hBpu6mmjO8fvfxKkiQ5pj/
-vSs+gMmWRbfgHV4QeUEA/3/si0fIGlaJCpyqnq70SQAPVvAAL/ohLzfXpWNnz8OY
-=jm/n
+iF4EAREIAAYFAk4d358ACgkQmWq1bYTyC0NRJgEAtLx+mGD2qtOgff8kIi3qT+Jn
+OScruknB2l5sGK3c6SQBAMkxQntSn2/BjwaEvq7xmc6VkTXsW3/QbHYWc7tmg/EK
+=scFm
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.4.90-optional-gtk.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.4.90-optional-gtk.patch
new file mode 100644
index 0000000..5a2a35b
--- /dev/null
+++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.4.90-optional-gtk.patch
@@ -0,0 +1,129 @@
+diff --git a/Makefile.am b/Makefile.am
+index c2c0980..2fb4c84 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -3,9 +3,13 @@ EXTRA_DIST = \
+ 	COPYING-GPL3 \
+ 	m4/introspection.m4
+ 
++if WANT_LIBDBUSMENUGTK
++LIBDBUSMENUGTK_SUBDIR = libdbusmenu-gtk
++endif
++
+ SUBDIRS = \
+ 	libdbusmenu-glib \
+-	libdbusmenu-gtk \
++	$(LIBDBUSMENUGTK_SUBDIR) \
+ 	tools \
+ 	tests \
+ 	docs \
+diff --git a/configure.ac b/configure.ac
+index 465d8bf..47ea915 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -58,27 +58,37 @@ AC_SUBST(DBUSMENUGLIB_LIBS)
+ GTK_REQUIRED_VERSION=2.16
+ GTK3_REQUIRED_VERSION=2.91
+ 
++AC_ARG_ENABLE([gtk],
++	AC_HELP_STRING([--disable-gtk], [Disable libdbusmenu-gtk library]),
++	[enable_gtk=$enableval], [enable_gtk=auto])
++AM_CONDITIONAL([WANT_LIBDBUSMENUGTK], [test "x$enable_gtk" != "xno"])
++
+ AC_ARG_WITH([gtk],
+   [AS_HELP_STRING([--with-gtk],
+     [Which version of gtk to use @<:@default=2@:>@])],
+   [],
+   [with_gtk=3])
++AM_CONDITIONAL([USE_GTK3], [test "x$with_gtk" = "x3"])
++
++AS_IF([test "x$enable_gtk" != "xno"],[
+ AS_IF([test "x$with_gtk" = x3],
+         [PKG_CHECK_MODULES(DBUSMENUGTK,  gtk+-3.0 >= $GTK3_REQUIRED_VERSION
+-                                         glib-2.0 >= $GLIB_REQUIRED_VERSION)
+-         AC_SUBST(DBUSMENUGTK_CFLAGS)
+-         AC_SUBST(DBUSMENUGTK_LIBS)
++                                         glib-2.0 >= $GLIB_REQUIRED_VERSION,
++                                         [have_gtk=yes]
++)
+          AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available])
+         ],
+       [test "x$with_gtk" = x2],
+         [PKG_CHECK_MODULES(DBUSMENUGTK,  gtk+-2.0 >= $GTK_REQUIRED_VERSION
+-                                         glib-2.0 >= $GLIB_REQUIRED_VERSION)
+-         AC_SUBST(DBUSMENUGTK_CFLAGS)
+-         AC_SUBST(DBUSMENUGTK_LIBS)
++                                         glib-2.0 >= $GLIB_REQUIRED_VERSION,
++                                         [have_gtk=yes]
++)
+         ],
+       [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])]
+ )
+-AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3])
++])
++AC_SUBST(DBUSMENUGTK_CFLAGS)
++AC_SUBST(DBUSMENUGTK_LIBS)
+ 
+ ###########################
+ # Dependencies - dumper
+@@ -199,3 +209,8 @@ libdbusmenu Configuration:
+ 	GTK+ Version:           $with_gtk
+ ])
+ 
++AS_IF([test "x$enable_gtk" = "xyes"],
++	AC_MSG_NOTICE([	Gtk:                    yes (gtk$with_gtk)]),
++	AC_MSG_NOTICE([	Gtk:                    no])
++)
++
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index a4763da..e6882af 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -13,13 +13,17 @@ TESTS = \
+ 	test-glib-proxy \
+ 	test-glib-simple-items \
+ 	test-glib-submenu \
+-	test-json \
++	test-json
++
++if WANT_LIBDBUSMENUGTK
++TESTS += \
+ 	test-gtk-objects-test \
+ 	test-gtk-label \
+ 	test-gtk-shortcut \
+ 	test-gtk-reorder \
+ 	test-gtk-submenu \
+ 	test-gtk-parser-test
++endif
+ 
+ XFAIL_TESTS = \
+ 	test-glib-proxy
+@@ -44,20 +48,24 @@ check_PROGRAMS = \
+ 	test-glib-proxy-client \
+ 	test-glib-proxy-server \
+ 	test-glib-proxy-proxy \
+-	test-gtk-objects \
+ 	test-glib-submenu-client \
+ 	test-glib-submenu-server \
++	test-glib-simple-items \
++	test-json-client \
++	test-json-server
++
++if WANT_LIBDBUSMENUGTK
++check_PROGRAMS += \
++	test-gtk-objects \
+ 	test-gtk-label-client \
+ 	test-gtk-label-server \
+ 	test-gtk-shortcut-client \
+ 	test-gtk-shortcut-server \
+-	test-glib-simple-items \
+ 	test-gtk-reorder-server \
+-	test-json-client \
+-	test-json-server \
+ 	test-gtk-submenu-server \
+ 	test-gtk-submenu-client \
+ 	test-gtk-parser
++endif
+ 
+ XVFB_RUN=". $(srcdir)/run-xvfb.sh"
+ 
diff --git a/dev-libs/libdbusmenu/libdbusmenu-0.4.5.ebuild b/dev-libs/libdbusmenu/libdbusmenu-0.4.5.ebuild
new file mode 100644
index 0000000..7633871
--- /dev/null
+++ b/dev-libs/libdbusmenu/libdbusmenu-0.4.5.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/libdbusmenu-0.3.16-r2.ebuild,v 1.1 2011/02/07 09:56:46 tampakrap Exp $
+
+EAPI=3
+
+inherit autotools eutils versionator virtualx
+
+MY_MAJOR_VERSION="$(get_version_component_range 1-2)"
+if version_is_at_least "${MY_MAJOR_VERSION}.50" ; then
+	MY_MAJOR_VERSION="$(get_major_version).$(($(get_version_component_range 2)+1))"
+fi
+
+DESCRIPTION="Library to pass menu structure across DBus"
+HOMEPAGE="https://launchpad.net/dbusmenu"
+SRC_URI="http://launchpad.net/dbusmenu/${MY_MAJOR_VERSION}/${PV}/+download/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk +introspection test vala"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/dbus-glib
+	dev-libs/libxml2:2
+	gtk? ( x11-libs/gtk+:2 )"
+DEPEND="${RDEPEND}
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
+	test? (
+		dev-libs/json-glib[introspection=]
+		dev-util/dbus-test-runner
+	)
+	vala? ( dev-lang/vala:0.10 )
+	dev-util/intltool
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	if use vala && use !introspection ; then
+		eerror "Vala bindings (USE=vala) require introspection support (USE=introspection)"
+		die "Vala bindings (USE=vala) require introspection support (USE=introspection)"
+	fi
+}
+
+src_prepare() {
+	# Make Vala bindings optional, launchpad-bug #713685
+	epatch "${FILESDIR}/${PN}-0.3.16-optional-vala.patch"
+	# Make tests optional, launchpad-bug #552526
+	epatch "${FILESDIR}/${PN}-0.3.16-optional-tests.patch"
+	# Make libdbusmenu-gtk library optional, launchpad-bug #552530
+	epatch "${FILESDIR}/${PN}-0.4.4-optional-gtk.patch"
+	# Decouple testapp from libdbusmenu-gtk, launchpad-bug #709761
+	epatch "${FILESDIR}/${PN}-0.3.94-decouple-testapp.patch"
+	# Make dbusmenudumper optional, launchpad-bug #643871
+	epatch "${FILESDIR}/${PN}-0.3.14-optional-dumper.patch"
+	# Fixup undeclared HAVE_INTROSPECTION, launchpad-bug #552538
+	epatch "${FILESDIR}/${PN}-0.3.14-fix-aclocal.patch"
+	# Drop -Werror in a release
+	sed -e 's:-Werror::g' -i libdbusmenu-glib/Makefile.am libdbusmenu-gtk/Makefile.am || die "sed failed"
+	eautoreconf
+}
+
+src_configure() {
+	VALA_API_GEN=$(type -p vapigen-0.10) \
+		econf \
+		$(use_enable gtk) \
+		$(use_enable gtk dumper) \
+		$(use_enable introspection) \
+		$(use_enable test tests) \
+		$(use_enable vala)
+}
+
+src_test() {
+	Xemake check || die "testsuite failed"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install || die "make install failed"
+	dodoc AUTHORS || die "dodoc failed"
+}
diff --git a/dev-libs/libdbusmenu/libdbusmenu-0.4.90.ebuild b/dev-libs/libdbusmenu/libdbusmenu-0.4.90.ebuild
new file mode 100644
index 0000000..e3e983a
--- /dev/null
+++ b/dev-libs/libdbusmenu/libdbusmenu-0.4.90.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/libdbusmenu-0.3.16-r2.ebuild,v 1.1 2011/02/07 09:56:46 tampakrap Exp $
+
+EAPI=3
+
+inherit autotools eutils versionator virtualx
+
+MY_MAJOR_VERSION="$(get_version_component_range 1-2)"
+if version_is_at_least "${MY_MAJOR_VERSION}.50" ; then
+	MY_MAJOR_VERSION="$(get_major_version).$(($(get_version_component_range 2)+1))"
+fi
+
+DESCRIPTION="Library to pass menu structure across DBus"
+HOMEPAGE="https://launchpad.net/dbusmenu"
+SRC_URI="http://launchpad.net/dbusmenu/${MY_MAJOR_VERSION}/${PV}/+download/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk +introspection test vala"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/dbus-glib
+	dev-libs/libxml2:2
+	gtk? ( x11-libs/gtk+:2 )"
+DEPEND="${RDEPEND}
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
+	test? (
+		>=dev-libs/json-glib-0.13.4[introspection=]
+		dev-util/dbus-test-runner
+	)
+	vala? ( dev-lang/vala:0.12 )
+	dev-util/intltool
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	if use vala && use !introspection ; then
+		eerror "Vala bindings (USE=vala) require introspection support (USE=introspection)"
+		die "Vala bindings (USE=vala) require introspection support (USE=introspection)"
+	fi
+}
+
+src_prepare() {
+	# Make Vala bindings optional, launchpad-bug #713685
+	epatch "${FILESDIR}/${PN}-0.3.16-optional-vala.patch"
+	# Make tests optional, launchpad-bug #552526
+	epatch "${FILESDIR}/${PN}-0.3.16-optional-tests.patch"
+	# Make libdbusmenu-gtk library optional, launchpad-bug #552530
+	epatch "${FILESDIR}/${P}-optional-gtk.patch"
+	# Decouple testapp from libdbusmenu-gtk, launchpad-bug #709761
+	epatch "${FILESDIR}/${PN}-0.3.94-decouple-testapp.patch"
+	# Make dbusmenudumper optional, launchpad-bug #643871
+	epatch "${FILESDIR}/${PN}-0.3.14-optional-dumper.patch"
+	# Fixup undeclared HAVE_INTROSPECTION, launchpad-bug #552538
+	epatch "${FILESDIR}/${PN}-0.3.14-fix-aclocal.patch"
+	# Drop -Werror in a release
+	sed -e 's:-Werror::g' -i libdbusmenu-glib/Makefile.am libdbusmenu-gtk/Makefile.am || die "sed failed"
+	eautoreconf
+}
+
+src_configure() {
+	VALA_API_GEN=$(type -p vapigen-0.12) \
+		econf \
+		$(use_enable gtk) \
+		$(use_enable gtk dumper) \
+		$(use_enable introspection) \
+		$(use_enable test tests) \
+		$(use_enable vala)
+}
+
+src_test() {
+	Xemake check || die "testsuite failed"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install || die "make install failed"
+	dodoc AUTHORS || die "dodoc failed"
+}