public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/kde:master commit in: dev-libs/libdbusmenu/, dev-libs/libdbusmenu/files/
@ 2011-02-05 17:00 Dennis Schridde
  0 siblings, 0 replies; 4+ messages in thread
From: Dennis Schridde @ 2011-02-05 17:00 UTC (permalink / raw
  To: gentoo-commits

commit:     6a7db316653a72172956cf36547b35e39c256c9a
Author:     Dennis Schridde <devurandom <AT> gmx <DOT> net>
AuthorDate: Sat Feb  5 16:13:47 2011 +0000
Commit:     Dennis Schridde <devurandom <AT> gmx <DOT> net>
CommitDate: Sat Feb  5 17:00:12 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6a7db316

[dev-libs/libdbusmenu] Optional Vala, fix parallel-build of introspection, revbump

Bug: 353308

(Portage version: 2.2.0_alpha20/git/Linux x86_64, signed Manifest commit with key 50ED256E)

---
 .../libdbusmenu-0.3.16-fix-introspection.patch     |   11 ++++
 .../files/libdbusmenu-0.3.16-optional-vala.patch   |   52 ++++++++++++++++++++
 .../libdbusmenu-0.3.94-fix-introspection.patch     |   11 ++++
 ...-0.3.16.ebuild => libdbusmenu-0.3.16-r1.ebuild} |   19 ++++++-
 ...-0.3.94.ebuild => libdbusmenu-0.3.94-r1.ebuild} |   15 +++++-
 dev-libs/libdbusmenu/metadata.xml                  |    1 +
 6 files changed, 105 insertions(+), 4 deletions(-)

diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-fix-introspection.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-fix-introspection.patch
new file mode 100644
index 0000000..5977795
--- /dev/null
+++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-fix-introspection.patch
@@ -0,0 +1,11 @@
+--- ./libdbusmenu-glib/Makefile.am.orig	2011-02-05 16:38:38.713641727 +0100
++++ ./libdbusmenu-glib/Makefile.am	2011-02-05 16:38:44.917448353 +0100
+@@ -123,7 +123,7 @@
+ 
+ introspection_sources = $(libdbusmenu_glibinclude_HEADERS)
+ 
+-Dbusmenu_Glib-0.2.gir: libdbusmenu-glib.la
++Dbusmenu-Glib-0.2.gir: libdbusmenu-glib.la
+ Dbusmenu_Glib_0_2_gir_INCLUDES = \
+ 	GObject-2.0
+ Dbusmenu_Glib_0_2_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS)

diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-vala.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-vala.patch
new file mode 100644
index 0000000..9aceb88
--- /dev/null
+++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-vala.patch
@@ -0,0 +1,52 @@
+--- configure.ac.orig	2011-02-05 15:01:31.212827464 +0100
++++ configure.ac	2011-02-05 15:13:08.310031260 +0100
+@@ -143,7 +143,17 @@
+ # Vala API Generation
+ ###########################
+ 
++AC_ARG_ENABLE([vala],
++	AC_HELP_STRING([--disable-vala], [Disable vala]),
++	[enable_vala=$enableval], enable_vala=auto)
++AM_CONDITIONAL([WANT_VALA], [test "x$enable_vala" != "xno"])
++
++if test "x$enable_vala" != "xno" ; then
++if test "x$enable_introspection" = "xno" ; then
++	AC_MSG_ERROR([Vala bindings require introspection support, please --enable-introspection])
++fi
+ AC_PATH_PROG([VALA_API_GEN], [vapigen])
++fi
+ 
+ ###########################
+ # XSLT Processor
+--- libdbusmenu-gtk/Makefile.am.orig	2011-02-05 15:09:06.429965757 +0100
++++ libdbusmenu-gtk/Makefile.am	2011-02-05 15:08:14.742722310 +0100
+@@ -131,6 +131,7 @@
+ # VAPI Files
+ #########################
+ 
++if WANT_VALA
+ if HAVE_INTROSPECTION
+ 
+ vapidir = $(datadir)/vala/vapi
+@@ -154,4 +155,5 @@
+ CLEANFILES += $(vapi_DATA) DbusmenuGtk$(VER)-0.4.tmp.gir
+ 
+ endif
++endif
+ 
+--- libdbusmenu-glib/Makefile.am.orig	2011-02-05 15:08:49.613538681 +0100
++++ libdbusmenu-glib/Makefile.am	2011-02-05 15:06:23.826443241 +0100
+@@ -165,6 +165,7 @@
+ # VAPI Files
+ #########################
+ 
++if WANT_VALA
+ if HAVE_INTROSPECTION
+ 
+ vapidir = $(datadir)/vala/vapi
+@@ -176,4 +177,5 @@
+ CLEANFILES += $(vapi_DATA)
+ 
+ endif
++endif
+ 

diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-fix-introspection.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-fix-introspection.patch
new file mode 100644
index 0000000..a259942
--- /dev/null
+++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-fix-introspection.patch
@@ -0,0 +1,11 @@
+--- ./libdbusmenu-glib/Makefile.am.orig	2011-02-05 16:16:34.481082458 +0100
++++ ./libdbusmenu-glib/Makefile.am	2011-02-05 16:20:31.703396315 +0100
+@@ -138,7 +138,7 @@
+ 
+ introspection_sources = $(libdbusmenu_glibinclude_HEADERS)
+ 
+-Dbusmenu_Glib-0.4.gir: libdbusmenu-glib.la
++Dbusmenu-Glib-0.4.gir: libdbusmenu-glib.la
+ Dbusmenu_Glib_0_4_gir_INCLUDES = \
+ 	GObject-2.0
+ Dbusmenu_Glib_0_4_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS) -I$(top_srcdir)

diff --git a/dev-libs/libdbusmenu/libdbusmenu-0.3.16.ebuild b/dev-libs/libdbusmenu/libdbusmenu-0.3.16-r1.ebuild
similarity index 74%
rename from dev-libs/libdbusmenu/libdbusmenu-0.3.16.ebuild
rename to dev-libs/libdbusmenu/libdbusmenu-0.3.16-r1.ebuild
index e3e418f..c912279 100644
--- a/dev-libs/libdbusmenu/libdbusmenu-0.3.16.ebuild
+++ b/dev-libs/libdbusmenu/libdbusmenu-0.3.16-r1.ebuild
@@ -13,9 +13,9 @@ SRC_URI="http://launchpad.net/dbusmenu/$(get_version_component_range 1-2)/${PV}/
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gtk +introspection test"
+IUSE="gtk +introspection test vala"
 
-# Needs running dbus and a program called "dbus-test-runner"
+# Needs dev-util/dbus-test-runner (not yet in tree)
 RESTRICT="test"
 
 RDEPEND="dev-libs/glib:2
@@ -25,10 +25,20 @@ RDEPEND="dev-libs/glib:2
 DEPEND="${RDEPEND}
 	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
 	test? ( dev-libs/json-glib[introspection=] )
+	vala? ( dev-lang/vala:0 )
 	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}/${P}-optional-vala.patch"
 	# Make tests optional, launchpad-bug #552526
 	epatch "${FILESDIR}/${P}-optional-tests.patch"
 	# Make libdbusmenu-gtk library optional, launchpad-bug #552530
@@ -39,6 +49,8 @@ src_prepare() {
 	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"
+	# Fix introspection generation, launchpad-bug #713690
+	epatch "${FILESDIR}/${P}-fix-introspection.patch"
 	# Drop -Werror in a release
 	sed -e 's:-Werror::g' -i libdbusmenu-glib/Makefile.am libdbusmenu-gtk/Makefile.am || die "sed failed"
 	eautoreconf
@@ -49,7 +61,8 @@ src_configure() {
 		$(use_enable gtk) \
 		$(use_enable gtk dumper) \
 		$(use_enable introspection) \
-		$(use_enable test tests)
+		$(use_enable test tests) \
+		$(use_enable vala)
 }
 
 src_test() {

diff --git a/dev-libs/libdbusmenu/libdbusmenu-0.3.94.ebuild b/dev-libs/libdbusmenu/libdbusmenu-0.3.94-r1.ebuild
similarity index 80%
rename from dev-libs/libdbusmenu/libdbusmenu-0.3.94.ebuild
rename to dev-libs/libdbusmenu/libdbusmenu-0.3.94-r1.ebuild
index 7317cc5..47b58a0 100644
--- a/dev-libs/libdbusmenu/libdbusmenu-0.3.94.ebuild
+++ b/dev-libs/libdbusmenu/libdbusmenu-0.3.94-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="http://launchpad.net/dbusmenu/${MY_MAJOR_VERSION}/${PV}/+download/${P}.
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gtk gtk3 +introspection test"
+IUSE="gtk gtk3 +introspection test vala"
 
 # Needs dev-util/dbus-test-runner (not yet in tree)
 RESTRICT="test"
@@ -33,10 +33,20 @@ RDEPEND="dev-libs/glib:2
 DEPEND="${RDEPEND}
 	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
 	test? ( dev-libs/json-glib[introspection=] )
+	vala? ( dev-lang/vala:0 )
 	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 tests 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
@@ -47,6 +57,8 @@ src_prepare() {
 	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"
+	# Fix introspection generation, launchpad-bug #713690
+	epatch "${FILESDIR}/${PN}-0.3.16-fix-introspection.patch"
 	# Drop -Werror in a release
 	sed -e 's:-Werror::g' -i libdbusmenu-glib/Makefile.am libdbusmenu-gtk/Makefile.am || die "sed failed"
 	eautoreconf
@@ -65,6 +77,7 @@ src_configure() {
 		$(use_enable gtk dumper) \
 		$(use_enable introspection) \
 		$(use_enable test tests) \
+		$(use_enable vala) \
 		${conf}
 }
 

diff --git a/dev-libs/libdbusmenu/metadata.xml b/dev-libs/libdbusmenu/metadata.xml
index fb2117a..bb3e5c1 100644
--- a/dev-libs/libdbusmenu/metadata.xml
+++ b/dev-libs/libdbusmenu/metadata.xml
@@ -5,5 +5,6 @@
   <use>
     <flag name="gtk3">Build experimental gtk3 version instead of using gtk2</flag>
     <flag name="introspection">Use dev-libs/gobject-introspection for introspection</flag>
+	<flag name="vala">Enable bindings for dev-lang/vala</flag>
   </use>
 </pkgmetadata>



^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-libs/libdbusmenu/, dev-libs/libdbusmenu/files/
@ 2011-02-05 21:42 Dennis Schridde
  0 siblings, 0 replies; 4+ messages in thread
From: Dennis Schridde @ 2011-02-05 21:42 UTC (permalink / raw
  To: gentoo-commits

commit:     890bf2bd501ac2088077d6bf4bbde6bd4a1f482e
Author:     Dennis Schridde <devurandom <AT> gmx <DOT> net>
AuthorDate: Sat Feb  5 20:15:40 2011 +0000
Commit:     Dennis Schridde <devurandom <AT> gmx <DOT> net>
CommitDate: Sat Feb  5 20:15:40 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=890bf2bd

[dev-libs/libdbusmenu] Improve patches based on upstream request, revbump

(Portage version: 2.2.0_alpha20/git/Linux x86_64, signed Manifest commit with key 50ED256E)

---
 .../files/libdbusmenu-0.3.14-optional-dumper.patch |   20 +++++++++++---
 .../files/libdbusmenu-0.3.16-optional-gtk.patch    |   21 +++++++++++---
 .../files/libdbusmenu-0.3.16-optional-tests.patch  |   20 +++++++++++---
 .../files/libdbusmenu-0.3.16-optional-vala.patch   |   25 +++++++++++------
 .../files/libdbusmenu-0.3.94-optional-gtk.patch    |   27 ++++++++++++++-----
 ...3.16-r1.ebuild => libdbusmenu-0.3.16-r2.ebuild} |    0
 ...3.94-r1.ebuild => libdbusmenu-0.3.94-r2.ebuild} |    0
 7 files changed, 82 insertions(+), 31 deletions(-)

diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.patch
index 3edc237..3a06262 100644
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.patch
+++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.patch
@@ -1,21 +1,31 @@
 --- configure.ac.orig	2010-09-20 21:51:50.289828895 +0200
 +++ configure.ac	2010-09-20 22:05:38.292979567 +0200
-@@ -63,8 +63,15 @@
+@@ -63,8 +63,17 @@
  
  X11_REQUIRED_VERSION=1.3
  
 +AC_ARG_ENABLE([dumper],
 +	AC_HELP_STRING([--disable-dumper], [Disable dbusmenudumper tool]),
-+	[enable_dumper=$enableval], enable_dumper=auto)
++	[enable_dumper=$enableval], [enable_dumper=auto])
 +AM_CONDITIONAL([WANT_DBUSMENUDUMPER], [test "x$enable_dumper" != "xno"])
 +
-+if test "x$enable_dumper" != "xno" ; then
++AS_IF([test "x$enable_dumper" != "xno"],[
  PKG_CHECK_MODULES(DBUSMENUDUMPER, gtk+-2.0 >= $GTK_REQUIRED_VERSION
-                                   x11 >= $X11_REQUIRED_VERSION)
-+fi
+-                                  x11 >= $X11_REQUIRED_VERSION)
++                                  x11 >= $X11_REQUIRED_VERSION,
++                                  [have_dumper=yes]
++)
++])
  
  AC_SUBST(DBUSMENUDUMPER_CFLAGS)
  AC_SUBST(DBUSMENUDUMPER_LIBS)
+@@ -193,1 +193,6 @@
+ 
++AS_IF([test "x$have_dumper" = "xyes"],
++   AC_MSG_NOTICE([	Dumper:                 yes]),
++   AC_MSG_NOTICE([	Dumper:                 no])
++)
++
 --- tools/Makefile.am.orig	2010-09-20 22:02:07.280175897 +0200
 +++ tools/Makefile.am	2010-09-20 22:05:15.621664358 +0200
 @@ -3,5 +3,9 @@

diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-gtk.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-gtk.patch
index dd33d4a..844fa14 100644
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-gtk.patch
+++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-gtk.patch
@@ -1,23 +1,33 @@
 --- configure.ac.orig	2010-09-20 21:51:50.289828895 +0200
 +++ configure.ac	2010-09-20 21:58:03.536293089 +0200
-@@ -49,10 +49,17 @@
+@@ -49,10 +49,19 @@
  
  GTK_REQUIRED_VERSION=2.16
  
 +AC_ARG_ENABLE([gtk],
 +	AC_HELP_STRING([--disable-gtk], [Disable libdbusmenu-gtk library]),
-+	[enable_gtk=$enableval], enable_gtk=auto)
++	[enable_gtk=$enableval], [enable_gtk=auto])
 +AM_CONDITIONAL([WANT_LIBDBUSMENUGTK], [test "x$enable_gtk" != "xno"])
 +
-+if test "x$enable_gtk" != "xno"; then
++AS_IF([test "x$enable_gtk" != "xno"],[
  PKG_CHECK_MODULES(DBUSMENUGTK,  gtk+-2.0 >= $GTK_REQUIRED_VERSION
                                  glib-2.0 >= $GLIB_REQUIRED_VERSION
                                  dbus-glib-1 >= $DBUS_REQUIRED_VERSION
-                                 libxml-2.0 >= $XML_REQUIRED_VERSION)
-+fi
+-                                libxml-2.0 >= $XML_REQUIRED_VERSION)
++                                libxml-2.0 >= $XML_REQUIRED_VERSION,
++                                [have_gtk=yes]
++)
++])
  
  AC_SUBST(DBUSMENUGTK_CFLAGS)
  AC_SUBST(DBUSMENUGTK_LIBS)
+@@ -193,1 +192,6 @@
+ 
++AS_IF([test "x$have_gtk" = "xyes"],
++	AC_MSG_NOTICE([	Gtk:                    yes]),
++	AC_MSG_NOTICE([	Gtk:                    no])
++)
++
 --- Makefile.am.orig	2010-09-20 21:58:41.616751481 +0200
 +++ Makefile.am	2010-09-20 21:59:23.492035983 +0200
 @@ -5,5 +5,9 @@
@@ -79,3 +89,4 @@
  
  XVFB_RUN=". $(srcdir)/run-xvfb.sh"
  
+

diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch
index a6d0536..e047cd8 100644
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch
+++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch
@@ -1,21 +1,31 @@
 --- configure.ac.orig	2010-09-20 21:51:50.289828895 +0200
 +++ configure.ac	2010-09-20 22:01:21.623107607 +0200
-@@ -76,8 +76,15 @@
+@@ -76,8 +76,17 @@
  JSON_GLIB_REQUIRED_VERSION=0.6.0
  GIO_UNIX_REQUIRED_VERSION=2.24
  
 +AC_ARG_ENABLE([tests],
 +	AC_HELP_STRING([--disable-tests], [Disable tests]),
-+	[enable_tests=$enableval], enable_tests=auto)
++	[enable_tests=$enableval], [enable_tests=auto])
 +AM_CONDITIONAL([WANT_TESTS], [test "x$enable_tests" != "xno"])
 +
-+if test "x$enable_tests" != "xno" ; then
++AS_IF([test "x$enable_tests" != "xno"],[
  PKG_CHECK_MODULES(DBUSMENUTESTS,  json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
-                                   gio-unix-2.0  >= $GIO_UNIX_REQUIRED_VERSION)
-+fi
+-                                  gio-unix-2.0  >= $GIO_UNIX_REQUIRED_VERSION)
++                                  gio-unix-2.0  >= $GIO_UNIX_REQUIRED_VERSION,
++                                  [have_tests=yes]
++)
++])
  
  AC_SUBST(DBUSMENUTESTS_CFLAGS)
  AC_SUBST(DBUSMENUTESTS_LIBS)
+@@ -193,1 +193,6 @@
+ 
++AS_IF([test "x$have_tests" = "xyes"],
++	AC_MSG_NOTICE([	Tests:                  yes]),
++	AC_MSG_NOTICE([	Tests:                  no])
++)
++
 --- Makefile.am.orig	2010-09-20 21:58:41.616751481 +0200
 +++ Makefile.am	2010-09-20 22:01:55.525674385 +0200
 @@ -5,2 +5,6 @@

diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-vala.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-vala.patch
index 9aceb88..72fcd57 100644
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-vala.patch
+++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-vala.patch
@@ -6,25 +6,32 @@
  
 +AC_ARG_ENABLE([vala],
 +	AC_HELP_STRING([--disable-vala], [Disable vala]),
-+	[enable_vala=$enableval], enable_vala=auto)
-+AM_CONDITIONAL([WANT_VALA], [test "x$enable_vala" != "xno"])
++	[enable_vala=$enableval], [enable_vala=auto])
 +
-+if test "x$enable_vala" != "xno" ; then
-+if test "x$enable_introspection" = "xno" ; then
-+	AC_MSG_ERROR([Vala bindings require introspection support, please --enable-introspection])
-+fi
++AS_IF([test "x$enable_vala" != "xno"],[
++	AM_COND_IF([HAVE_INTROSPECTION],,[
++		AC_MSG_ERROR([Vala bindings require introspection support, please --enable-introspection])
++	])
  AC_PATH_PROG([VALA_API_GEN], [vapigen])
-+fi
++])
++AM_CONDITIONAL([HAVE_VALA], [test -n "$VALA_API_GEN"])
  
  ###########################
  # XSLT Processor
+@@ -193,1 +193,6 @@
+ 
++AM_COND_IF([HAVE_VALA],
++	AC_MSG_NOTICE([	Vala bindings:          yes]),
++	AC_MSG_NOTICE([	Vala bindings           no])
++)
++
 --- libdbusmenu-gtk/Makefile.am.orig	2011-02-05 15:09:06.429965757 +0100
 +++ libdbusmenu-gtk/Makefile.am	2011-02-05 15:08:14.742722310 +0100
 @@ -131,6 +131,7 @@
  # VAPI Files
  #########################
  
-+if WANT_VALA
++if HAVE_VALA
  if HAVE_INTROSPECTION
  
  vapidir = $(datadir)/vala/vapi
@@ -40,7 +47,7 @@
  # VAPI Files
  #########################
  
-+if WANT_VALA
++if HAVE_VALA
  if HAVE_INTROSPECTION
  
  vapidir = $(datadir)/vala/vapi

diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch
index c19ee99..e178447 100644
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch
+++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch
@@ -1,12 +1,12 @@
 --- configure.ac.orig	2011-01-29 20:37:03.892284177 +0100
 +++ configure.ac	2011-01-29 20:42:10.969923186 +0100
-@@ -58,29 +58,35 @@
+@@ -58,29 +58,39 @@
  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)
++	[enable_gtk=$enableval], [enable_gtk=auto])
 +AM_CONDITIONAL([WANT_LIBDBUSMENUGTK], [test "x$enable_gtk" != "xno"])
 +
  AC_ARG_WITH([gtk],
@@ -14,13 +14,16 @@
      [Which version of gtk to use @<:@default=2@:>@])],
    [],
    [with_gtk=2])
-+AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3])
++AM_CONDITIONAL([USE_GTK3], [test "x$with_gtk" = "x3"])
 +
-+if test "x$enable_gtk" != "xno" ; then
++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
-                                          libxml-2.0 >= $XML_REQUIRED_VERSION)
+-                                         libxml-2.0 >= $XML_REQUIRED_VERSION)
++                                         libxml-2.0 >= $XML_REQUIRED_VERSION,
++                                         [have_gtk=yes]
++)
 -         AC_SUBST(DBUSMENUGTK_CFLAGS)
 -         AC_SUBST(DBUSMENUGTK_LIBS)
           AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available])
@@ -28,19 +31,29 @@
        [test "x$with_gtk" = x2],
          [PKG_CHECK_MODULES(DBUSMENUGTK,  gtk+-2.0 >= $GTK_REQUIRED_VERSION
                                           glib-2.0 >= $GLIB_REQUIRED_VERSION
-                                          libxml-2.0 >= $XML_REQUIRED_VERSION)
+-                                         libxml-2.0 >= $XML_REQUIRED_VERSION)
++                                         libxml-2.0 >= $XML_REQUIRED_VERSION,
++                                         [have_gtk=yes]
++)
 -         AC_SUBST(DBUSMENUGTK_CFLAGS)
 -         AC_SUBST(DBUSMENUGTK_LIBS)
          ],
        [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])]
  )
 -AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3])
-+fi
++])
 +AC_SUBST(DBUSMENUGTK_CFLAGS)
 +AC_SUBST(DBUSMENUGTK_LIBS)
  
  ###########################
  # Dependencies - dumper
+@@ -193,1 +193,6 @@
+ 
++AS_IF([test "x$enable_gtk" = "xyes"],
++	AC_MSG_NOTICE([	Gtk:                    yes (gtk$with_gtk)]),
++	AC_MSG_NOTICE([	Gtk:                    no])
++)
++
 --- Makefile.am.orig	2010-09-20 21:58:41.616751481 +0200
 +++ Makefile.am	2010-09-20 21:59:23.492035983 +0200
 @@ -5,5 +5,9 @@

diff --git a/dev-libs/libdbusmenu/libdbusmenu-0.3.16-r1.ebuild b/dev-libs/libdbusmenu/libdbusmenu-0.3.16-r2.ebuild
similarity index 100%
rename from dev-libs/libdbusmenu/libdbusmenu-0.3.16-r1.ebuild
rename to dev-libs/libdbusmenu/libdbusmenu-0.3.16-r2.ebuild

diff --git a/dev-libs/libdbusmenu/libdbusmenu-0.3.94-r1.ebuild b/dev-libs/libdbusmenu/libdbusmenu-0.3.94-r2.ebuild
similarity index 100%
rename from dev-libs/libdbusmenu/libdbusmenu-0.3.94-r1.ebuild
rename to dev-libs/libdbusmenu/libdbusmenu-0.3.94-r2.ebuild



^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-libs/libdbusmenu/, dev-libs/libdbusmenu/files/
@ 2011-02-09 20:11 Dennis Schridde
  0 siblings, 0 replies; 4+ messages in thread
From: Dennis Schridde @ 2011-02-09 20:11 UTC (permalink / raw
  To: gentoo-commits

commit:     659b7ad4e04745fa11cee95ec44a553de2536fa6
Author:     Dennis Schridde <devurandom <AT> gmx <DOT> net>
AuthorDate: Wed Feb  9 20:08:17 2011 +0000
Commit:     Dennis Schridde <devurandom <AT> gmx <DOT> net>
CommitDate: Wed Feb  9 20:08:17 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=659b7ad4

[dev-libs/libdbusmenu-0.3.16] Remove, migrated to Gentoo mainline

(Portage version: 2.2.0_alpha23/git/Linux x86_64, signed Manifest commit with key 50ED256E)

---
 .../libdbusmenu-0.3.16-decouple-testapp.patch      |    9 --
 .../libdbusmenu-0.3.16-fix-introspection.patch     |   11 ---
 .../files/libdbusmenu-0.3.16-optional-gtk.patch    |   92 --------------------
 dev-libs/libdbusmenu/libdbusmenu-0.3.16-r2.ebuild  |   80 -----------------
 4 files changed, 0 insertions(+), 192 deletions(-)

diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-decouple-testapp.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-decouple-testapp.patch
deleted file mode 100644
index d98ffab..0000000
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-decouple-testapp.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- tools/testapp/Makefile.am.orig	2011-01-29 13:42:00.984605528 +0100
-+++ tools/testapp/Makefile.am	2011-01-29 13:44:45.523514281 +0100
-@@ -12,6 +13,4 @@
- 
- dbusmenu_testapp_LDADD = \
- 	$(builddir)/../../libdbusmenu-glib/libdbusmenu-glib.la \
--	$(builddir)/../../libdbusmenu-gtk/libdbusmenu-gtk.la \
--	$(DBUSMENUGTK_LIBS) \
- 	$(DBUSMENUTESTS_LIBS)

diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-fix-introspection.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-fix-introspection.patch
deleted file mode 100644
index 5977795..0000000
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-fix-introspection.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./libdbusmenu-glib/Makefile.am.orig	2011-02-05 16:38:38.713641727 +0100
-+++ ./libdbusmenu-glib/Makefile.am	2011-02-05 16:38:44.917448353 +0100
-@@ -123,7 +123,7 @@
- 
- introspection_sources = $(libdbusmenu_glibinclude_HEADERS)
- 
--Dbusmenu_Glib-0.2.gir: libdbusmenu-glib.la
-+Dbusmenu-Glib-0.2.gir: libdbusmenu-glib.la
- Dbusmenu_Glib_0_2_gir_INCLUDES = \
- 	GObject-2.0
- Dbusmenu_Glib_0_2_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS)

diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-gtk.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-gtk.patch
deleted file mode 100644
index 844fa14..0000000
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-gtk.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- configure.ac.orig	2010-09-20 21:51:50.289828895 +0200
-+++ configure.ac	2010-09-20 21:58:03.536293089 +0200
-@@ -49,10 +49,19 @@
- 
- GTK_REQUIRED_VERSION=2.16
- 
-+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"])
-+
-+AS_IF([test "x$enable_gtk" != "xno"],[
- PKG_CHECK_MODULES(DBUSMENUGTK,  gtk+-2.0 >= $GTK_REQUIRED_VERSION
-                                 glib-2.0 >= $GLIB_REQUIRED_VERSION
-                                 dbus-glib-1 >= $DBUS_REQUIRED_VERSION
--                                libxml-2.0 >= $XML_REQUIRED_VERSION)
-+                                libxml-2.0 >= $XML_REQUIRED_VERSION,
-+                                [have_gtk=yes]
-+)
-+])
- 
- AC_SUBST(DBUSMENUGTK_CFLAGS)
- AC_SUBST(DBUSMENUGTK_LIBS)
-@@ -193,1 +192,6 @@
- 
-+AS_IF([test "x$have_gtk" = "xyes"],
-+	AC_MSG_NOTICE([	Gtk:                    yes]),
-+	AC_MSG_NOTICE([	Gtk:                    no])
-+)
-+
---- Makefile.am.orig	2010-09-20 21:58:41.616751481 +0200
-+++ Makefile.am	2010-09-20 21:59:23.492035983 +0200
-@@ -5,5 +5,9 @@
- 
-+if WANT_LIBDBUSMENUGTK
-+LIBDBUSMENUGTK_SUBDIR = libdbusmenu-gtk
-+endif
-+
- SUBDIRS = \
- 	libdbusmenu-glib \
--	libdbusmenu-gtk \
-+	$(LIBDBUSMENUGTK_SUBDIR) \
- 	tools \
---- tests/Makefile.am.orig	2011-01-29 14:37:11.863805482 +0100
-+++ tests/Makefile.am	2011-01-29 14:38:48.910883303 +0100
-@@ -11,12 +11,16 @@
- 	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
-+endif
- 
- check_PROGRAMS = \
- 	glib-server-nomenu \
-@@ -30,19 +34,23 @@
- 	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
-+endif
- 
- XVFB_RUN=". $(srcdir)/run-xvfb.sh"
- 
-

diff --git a/dev-libs/libdbusmenu/libdbusmenu-0.3.16-r2.ebuild b/dev-libs/libdbusmenu/libdbusmenu-0.3.16-r2.ebuild
deleted file mode 100644
index 7cc9790..0000000
--- a/dev-libs/libdbusmenu/libdbusmenu-0.3.16-r2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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.2.8.ebuild,v 1.2 2010/09/14 07:41:41 reavertm 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 )
-	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}/${P}-optional-vala.patch"
-	# Make tests optional, launchpad-bug #552526
-	epatch "${FILESDIR}/${P}-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}/${P}-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"
-	# Fix introspection generation, launchpad-bug #713690
-	epatch "${FILESDIR}/${P}-fix-introspection.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() {
-	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="${D}" install || die "make install failed"
-	dodoc AUTHORS || die "dodoc failed"
-}



^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-libs/libdbusmenu/, dev-libs/libdbusmenu/files/
@ 2011-11-01 22:22 Andreas Hüttel
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Hüttel @ 2011-11-01 22:22 UTC (permalink / raw
  To: gentoo-commits

commit:     24041512a56cb3543ecd76770a2155288684e2fc
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Tue Nov  1 22:22:29 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Nov  1 22:22:29 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=24041512

[dev-libs/libdbusmenu] Moved to main tree

---
 .../files/libdbusmenu-0.3.14-fix-aclocal.patch     |    8 --
 .../files/libdbusmenu-0.3.14-optional-dumper.patch |   68 -----------
 .../files/libdbusmenu-0.3.16-optional-tests.patch  |   55 ---------
 .../files/libdbusmenu-0.3.16-optional-vala.patch   |   59 ----------
 .../libdbusmenu-0.3.94-decouple-testapp.patch      |   20 ----
 .../libdbusmenu-0.3.94-fix-introspection.patch     |   11 --
 .../files/libdbusmenu-0.3.94-optional-gtk.patch    |  119 --------------------
 dev-libs/libdbusmenu/libdbusmenu-0.3.94-r2.ebuild  |   86 --------------
 dev-libs/libdbusmenu/libdbusmenu-0.5.1.ebuild      |   62 ----------
 dev-libs/libdbusmenu/metadata.xml                  |   10 --
 10 files changed, 0 insertions(+), 498 deletions(-)

diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-fix-aclocal.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-fix-aclocal.patch
deleted file mode 100644
index d4fdcaa..0000000
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-fix-aclocal.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- Makefile.am.orig	2010-09-20 21:58:41.616751481 +0200
-+++ Makefile.am	2010-09-20 22:21:12.976592367 +0200
-@@ -1,3 +1,5 @@
-+ACLOCAL_AMFLAGS = -I m4
-+
- EXTRA_DIST = \
- 	COPYING.2.1 \
- 	COPYING-GPL3 \

diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.patch
deleted file mode 100644
index 644c799..0000000
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- configure.ac.orig	2010-09-20 21:51:50.289828895 +0200
-+++ configure.ac	2010-09-20 22:05:38.292979567 +0200
-@@ -63,8 +63,17 @@
- 
- X11_REQUIRED_VERSION=1.3
- 
-+AC_ARG_ENABLE([dumper],
-+	AC_HELP_STRING([--disable-dumper], [Disable dbusmenudumper tool]),
-+	[enable_dumper=$enableval], [enable_dumper=auto])
-+AM_CONDITIONAL([WANT_DBUSMENUDUMPER], [test "x$enable_dumper" != "xno"])
-+
-+AS_IF([test "x$enable_dumper" != "xno"],[
- PKG_CHECK_MODULES(DBUSMENUDUMPER, gtk+-2.0 >= $GTK_REQUIRED_VERSION
--                                  x11 >= $X11_REQUIRED_VERSION)
-+                                  x11 >= $X11_REQUIRED_VERSION,
-+                                  [have_dumper=yes]
-+)
-+])
- 
- AC_SUBST(DBUSMENUDUMPER_CFLAGS)
- AC_SUBST(DBUSMENUDUMPER_LIBS)
-@@ -193,1 +193,6 @@
- 
-+AS_IF([test "x$have_dumper" = "xyes"],
-+   AC_MSG_NOTICE([	Dumper:                 yes]),
-+   AC_MSG_NOTICE([	Dumper:                 no])
-+)
-+
---- tools/Makefile.am.orig	2010-09-20 22:02:07.280175897 +0200
-+++ tools/Makefile.am	2010-09-20 22:05:15.621664358 +0200
-@@ -3,5 +3,9 @@
- 
--libexec_PROGRAMS = dbusmenu-dumper
-+libexec_PROGRAMS =
-+
-+if WANT_DBUSMENUDUMPER
-+libexec_PROGRAMS += dbusmenu-dumper
-+endif
- 
- libexec_SCRIPTS = dbusmenu-bench
- 
---- tests/Makefile.am.orig	2011-02-07 00:01:11.066461559 +0100
-+++ tests/Makefile.am	2011-02-07 00:02:33.487751202 +0100
-@@ -10,6 +10,10 @@
- 	test-glib-properties \
- 	test-glib-proxy \
- 	test-glib-simple-items \
--	test-glib-submenu \
-+	test-glib-submenu
-+
-+if WANT_DBUSMENUDUMPER
-+TESTS += \
- 	test-json
-+endif
- 
-@@ -36,7 +40,11 @@
- 	test-glib-proxy-proxy \
- 	test-glib-submenu-client \
- 	test-glib-submenu-server \
--	test-glib-simple-items \
-+	test-glib-simple-items
-+
-+if WANT_DBUSMENUDUMPER
-+check_PROGRAMS += \
- 	test-json-client \
- 	test-json-server
-+endif
- 

diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch
deleted file mode 100644
index e047cd8..0000000
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- configure.ac.orig	2010-09-20 21:51:50.289828895 +0200
-+++ configure.ac	2010-09-20 22:01:21.623107607 +0200
-@@ -76,8 +76,17 @@
- JSON_GLIB_REQUIRED_VERSION=0.6.0
- GIO_UNIX_REQUIRED_VERSION=2.24
- 
-+AC_ARG_ENABLE([tests],
-+	AC_HELP_STRING([--disable-tests], [Disable tests]),
-+	[enable_tests=$enableval], [enable_tests=auto])
-+AM_CONDITIONAL([WANT_TESTS], [test "x$enable_tests" != "xno"])
-+
-+AS_IF([test "x$enable_tests" != "xno"],[
- PKG_CHECK_MODULES(DBUSMENUTESTS,  json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
--                                  gio-unix-2.0  >= $GIO_UNIX_REQUIRED_VERSION)
-+                                  gio-unix-2.0  >= $GIO_UNIX_REQUIRED_VERSION,
-+                                  [have_tests=yes]
-+)
-+])
- 
- AC_SUBST(DBUSMENUTESTS_CFLAGS)
- AC_SUBST(DBUSMENUTESTS_LIBS)
-@@ -193,1 +193,6 @@
- 
-+AS_IF([test "x$have_tests" = "xyes"],
-+	AC_MSG_NOTICE([	Tests:                  yes]),
-+	AC_MSG_NOTICE([	Tests:                  no])
-+)
-+
---- Makefile.am.orig	2010-09-20 21:58:41.616751481 +0200
-+++ Makefile.am	2010-09-20 22:01:55.525674385 +0200
-@@ -5,2 +5,6 @@
- 
-+if WANT_TESTS
-+TESTS_SUBDIR = tests
-+endif
-+
- SUBDIRS = \
-@@ -9,3 +9,3 @@
- 	tools \
--	tests \
-+	$(TESTS_SUBDIR) \
- 	docs \
---- tools/testapp/Makefile.am.orig    2011-01-29 13:42:00.984605528 +0100
-+++ tools/testapp/Makefile.am 2011-01-29 13:44:45.523514281 +0100
-@@ -1,5 +1,9 @@
- 
--libexec_PROGRAMS = dbusmenu-testapp
-+libexec_PROGRAMS =
-+
-+if WANT_TESTS
-+libexec_PROGRAMS += dbusmenu-testapp
-+endif
- 
- dbusmenu_testapp_SOURCES = \
-    main.c

diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-vala.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-vala.patch
deleted file mode 100644
index 72fcd57..0000000
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-vala.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- configure.ac.orig	2011-02-05 15:01:31.212827464 +0100
-+++ configure.ac	2011-02-05 15:13:08.310031260 +0100
-@@ -143,7 +143,17 @@
- # Vala API Generation
- ###########################
- 
-+AC_ARG_ENABLE([vala],
-+	AC_HELP_STRING([--disable-vala], [Disable vala]),
-+	[enable_vala=$enableval], [enable_vala=auto])
-+
-+AS_IF([test "x$enable_vala" != "xno"],[
-+	AM_COND_IF([HAVE_INTROSPECTION],,[
-+		AC_MSG_ERROR([Vala bindings require introspection support, please --enable-introspection])
-+	])
- AC_PATH_PROG([VALA_API_GEN], [vapigen])
-+])
-+AM_CONDITIONAL([HAVE_VALA], [test -n "$VALA_API_GEN"])
- 
- ###########################
- # XSLT Processor
-@@ -193,1 +193,6 @@
- 
-+AM_COND_IF([HAVE_VALA],
-+	AC_MSG_NOTICE([	Vala bindings:          yes]),
-+	AC_MSG_NOTICE([	Vala bindings           no])
-+)
-+
---- libdbusmenu-gtk/Makefile.am.orig	2011-02-05 15:09:06.429965757 +0100
-+++ libdbusmenu-gtk/Makefile.am	2011-02-05 15:08:14.742722310 +0100
-@@ -131,6 +131,7 @@
- # VAPI Files
- #########################
- 
-+if HAVE_VALA
- if HAVE_INTROSPECTION
- 
- vapidir = $(datadir)/vala/vapi
-@@ -154,4 +155,5 @@
- CLEANFILES += $(vapi_DATA) DbusmenuGtk$(VER)-0.4.tmp.gir
- 
- endif
-+endif
- 
---- libdbusmenu-glib/Makefile.am.orig	2011-02-05 15:08:49.613538681 +0100
-+++ libdbusmenu-glib/Makefile.am	2011-02-05 15:06:23.826443241 +0100
-@@ -165,6 +165,7 @@
- # VAPI Files
- #########################
- 
-+if HAVE_VALA
- if HAVE_INTROSPECTION
- 
- vapidir = $(datadir)/vala/vapi
-@@ -176,4 +177,5 @@
- CLEANFILES += $(vapi_DATA)
- 
- endif
-+endif
- 

diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-decouple-testapp.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-decouple-testapp.patch
deleted file mode 100644
index 64812a4..0000000
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-decouple-testapp.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- tools/testapp/Makefile.am.orig	2011-01-29 20:50:54.266939219 +0100
-+++ tools/testapp/Makefile.am	2011-01-29 20:51:16.185268917 +0100
-@@ -1,10 +1,4 @@
- 
--if USE_GTK3
--VER=3
--else
--VER=
--endif
--
- libexec_PROGRAMS =
- 
- if WANT_TESTS
-@@ -22,6 +16,4 @@
- 
- dbusmenu_testapp_LDADD = \
- 	$(builddir)/../../libdbusmenu-glib/libdbusmenu-glib.la \
--	$(builddir)/../../libdbusmenu-gtk/libdbusmenu-gtk$(VER).la \
--	$(DBUSMENUGTK_LIBS) \
- 	$(DBUSMENUTESTS_LIBS)

diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-fix-introspection.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-fix-introspection.patch
deleted file mode 100644
index a259942..0000000
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-fix-introspection.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./libdbusmenu-glib/Makefile.am.orig	2011-02-05 16:16:34.481082458 +0100
-+++ ./libdbusmenu-glib/Makefile.am	2011-02-05 16:20:31.703396315 +0100
-@@ -138,7 +138,7 @@
- 
- introspection_sources = $(libdbusmenu_glibinclude_HEADERS)
- 
--Dbusmenu_Glib-0.4.gir: libdbusmenu-glib.la
-+Dbusmenu-Glib-0.4.gir: libdbusmenu-glib.la
- Dbusmenu_Glib_0_4_gir_INCLUDES = \
- 	GObject-2.0
- Dbusmenu_Glib_0_4_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS) -I$(top_srcdir)

diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch
deleted file mode 100644
index e178447..0000000
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch
+++ /dev/null
@@ -1,119 +0,0 @@
---- configure.ac.orig	2011-01-29 20:37:03.892284177 +0100
-+++ configure.ac	2011-01-29 20:42:10.969923186 +0100
-@@ -58,29 +58,39 @@
- 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=2])
-+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
--                                         libxml-2.0 >= $XML_REQUIRED_VERSION)
-+                                         libxml-2.0 >= $XML_REQUIRED_VERSION,
-+                                         [have_gtk=yes]
-+)
--         AC_SUBST(DBUSMENUGTK_CFLAGS)
--         AC_SUBST(DBUSMENUGTK_LIBS)
-          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
--                                         libxml-2.0 >= $XML_REQUIRED_VERSION)
-+                                         libxml-2.0 >= $XML_REQUIRED_VERSION,
-+                                         [have_gtk=yes]
-+)
--         AC_SUBST(DBUSMENUGTK_CFLAGS)
--         AC_SUBST(DBUSMENUGTK_LIBS)
-         ],
-       [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
-@@ -193,1 +193,6 @@
- 
-+AS_IF([test "x$enable_gtk" = "xyes"],
-+	AC_MSG_NOTICE([	Gtk:                    yes (gtk$with_gtk)]),
-+	AC_MSG_NOTICE([	Gtk:                    no])
-+)
-+
---- Makefile.am.orig	2010-09-20 21:58:41.616751481 +0200
-+++ Makefile.am	2010-09-20 21:59:23.492035983 +0200
-@@ -5,5 +5,9 @@
- 
-+if WANT_LIBDBUSMENUGTK
-+LIBDBUSMENUGTK_SUBDIR = libdbusmenu-gtk
-+endif
-+
- SUBDIRS = \
- 	libdbusmenu-glib \
--	libdbusmenu-gtk \
-+	$(LIBDBUSMENUGTK_SUBDIR) \
- 	tools \
---- tests/Makefile.am.orig	2011-01-29 20:47:16.721588701 +0100
-+++ tests/Makefile.am	2011-01-29 20:45:10.116455527 +0100
-@@ -11,13 +11,17 @@
- 	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
- 
- check_PROGRAMS = \
- 	glib-server-nomenu \
-@@ -31,20 +35,24 @@
- 	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.3.94-r2.ebuild b/dev-libs/libdbusmenu/libdbusmenu-0.3.94-r2.ebuild
deleted file mode 100644
index 11eda14..0000000
--- a/dev-libs/libdbusmenu/libdbusmenu-0.3.94-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-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 gtk3 +introspection test vala"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/dbus-glib
-	dev-libs/libxml2:2
-	gtk? (
-		gtk3? ( x11-libs/gtk+:3 )
-		!gtk3? ( 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 )
-	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 tests 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}/${P}-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"
-	# Fix introspection generation, launchpad-bug #713690
-	epatch "${FILESDIR}/${P}-fix-introspection.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() {
-	local conf
-	if use gtk3 ; then
-		conf="${conf} --with-gtk=3"
-	else
-		conf="${conf} --with-gtk=2"
-	fi
-
-	econf \
-		$(use_enable gtk) \
-		$(use_enable gtk dumper) \
-		$(use_enable introspection) \
-		$(use_enable test tests) \
-		$(use_enable vala) \
-		${conf}
-}
-
-src_test() {
-	Xemake check
-}

diff --git a/dev-libs/libdbusmenu/libdbusmenu-0.5.1.ebuild b/dev-libs/libdbusmenu/libdbusmenu-0.5.1.ebuild
deleted file mode 100644
index b8366e4..0000000
--- a/dev-libs/libdbusmenu/libdbusmenu-0.5.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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_configure() {
-	VALA_API_GEN=$(type -p vapigen-0.10) \
-		econf \
-		--with-gtk=2 \
-		$(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/metadata.xml b/dev-libs/libdbusmenu/metadata.xml
deleted file mode 100644
index bb3e5c1..0000000
--- a/dev-libs/libdbusmenu/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>kde</herd>
-  <use>
-    <flag name="gtk3">Build experimental gtk3 version instead of using gtk2</flag>
-    <flag name="introspection">Use dev-libs/gobject-introspection for introspection</flag>
-	<flag name="vala">Enable bindings for dev-lang/vala</flag>
-  </use>
-</pkgmetadata>



^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-11-01 22:22 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-09 20:11 [gentoo-commits] proj/kde:master commit in: dev-libs/libdbusmenu/, dev-libs/libdbusmenu/files/ Dennis Schridde
  -- strict thread matches above, loose matches on Subject: below --
2011-11-01 22:22 Andreas Hüttel
2011-02-05 21:42 Dennis Schridde
2011-02-05 17:00 Dennis Schridde

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox