From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Plptx-0001qZ-B7 for garchives@archives.gentoo.org; Sat, 05 Feb 2011 21:42:41 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8F462E0AA8; Sat, 5 Feb 2011 21:42:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3CC16E06F4 for ; Sat, 5 Feb 2011 21:42:33 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 91A661B4098 for ; Sat, 5 Feb 2011 21:42:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id F11218006E for ; Sat, 5 Feb 2011 21:42:31 +0000 (UTC) From: "Dennis Schridde" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Dennis Schridde" Message-ID: <890bf2bd501ac2088077d6bf4bbde6bd4a1f482e.devurandom@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: dev-libs/libdbusmenu/, dev-libs/libdbusmenu/files/ X-VCS-Repository: proj/kde X-VCS-Files: dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.patch dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-gtk.patch dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-tests.patch dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-vala.patch dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch dev-libs/libdbusmenu/libdbusmenu-0.3.16-r1.ebuild dev-libs/libdbusmenu/libdbusmenu-0.3.16-r2.ebuild dev-libs/libdbusmenu/libdbusmenu-0.3.94-r1.ebuild dev-libs/libdbusmenu/libdbusmenu-0.3.94-r2.ebuild X-VCS-Directories: dev-libs/libdbusmenu/ dev-libs/libdbusmenu/files/ X-VCS-Committer: devurandom X-VCS-Committer-Name: Dennis Schridde X-VCS-Revision: 890bf2bd501ac2088077d6bf4bbde6bd4a1f482e Date: Sat, 5 Feb 2011 21:42:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 70c3e67db04bc3a0e97829dde57d8688 commit: 890bf2bd501ac2088077d6bf4bbde6bd4a1f482e Author: Dennis Schridde gmx net> AuthorDate: Sat Feb 5 20:15:40 2011 +0000 Commit: Dennis Schridde gmx net> CommitDate: Sat Feb 5 20:15:40 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D890bf2bd [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 =3D> libdbusmenu-0.3.16-r2.ebuild} | 0 ...3.94-r1.ebuild =3D> 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-dumpe= r.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.14-optional-dumper.p= atch 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 @@ =20 X11_REQUIRED_VERSION=3D1.3 =20 +AC_ARG_ENABLE([dumper], + AC_HELP_STRING([--disable-dumper], [Disable dbusmenudumper tool]), -+ [enable_dumper=3D$enableval], enable_dumper=3Dauto) ++ [enable_dumper=3D$enableval], [enable_dumper=3Dauto]) +AM_CONDITIONAL([WANT_DBUSMENUDUMPER], [test "x$enable_dumper" !=3D "xno= "]) + -+if test "x$enable_dumper" !=3D "xno" ; then ++AS_IF([test "x$enable_dumper" !=3D "xno"],[ PKG_CHECK_MODULES(DBUSMENUDUMPER, gtk+-2.0 >=3D $GTK_REQUIRED_VERSION - x11 >=3D $X11_REQUIRED_VERSION) -+fi +- x11 >=3D $X11_REQUIRED_VERSION) ++ x11 >=3D $X11_REQUIRED_VERSION, ++ [have_dumper=3Dyes] ++) ++]) =20 AC_SUBST(DBUSMENUDUMPER_CFLAGS) AC_SUBST(DBUSMENUDUMPER_LIBS) +@@ -193,1 +193,6 @@ +=20 ++AS_IF([test "x$have_dumper" =3D "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.p= atch 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 @@ =20 GTK_REQUIRED_VERSION=3D2.16 =20 +AC_ARG_ENABLE([gtk], + AC_HELP_STRING([--disable-gtk], [Disable libdbusmenu-gtk library]), -+ [enable_gtk=3D$enableval], enable_gtk=3Dauto) ++ [enable_gtk=3D$enableval], [enable_gtk=3Dauto]) +AM_CONDITIONAL([WANT_LIBDBUSMENUGTK], [test "x$enable_gtk" !=3D "xno"]) + -+if test "x$enable_gtk" !=3D "xno"; then ++AS_IF([test "x$enable_gtk" !=3D "xno"],[ PKG_CHECK_MODULES(DBUSMENUGTK, gtk+-2.0 >=3D $GTK_REQUIRED_VERSION glib-2.0 >=3D $GLIB_REQUIRED_VERSION dbus-glib-1 >=3D $DBUS_REQUIRED_VERSION - libxml-2.0 >=3D $XML_REQUIRED_VERSION) -+fi +- libxml-2.0 >=3D $XML_REQUIRED_VERSION) ++ libxml-2.0 >=3D $XML_REQUIRED_VERSION, ++ [have_gtk=3Dyes] ++) ++]) =20 AC_SUBST(DBUSMENUGTK_CFLAGS) AC_SUBST(DBUSMENUGTK_LIBS) +@@ -193,1 +192,6 @@ +=20 ++AS_IF([test "x$have_gtk" =3D "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 @@ =20 XVFB_RUN=3D". $(srcdir)/run-xvfb.sh" =20 + 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.pat= ch 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=3D0.6.0 GIO_UNIX_REQUIRED_VERSION=3D2.24 =20 +AC_ARG_ENABLE([tests], + AC_HELP_STRING([--disable-tests], [Disable tests]), -+ [enable_tests=3D$enableval], enable_tests=3Dauto) ++ [enable_tests=3D$enableval], [enable_tests=3Dauto]) +AM_CONDITIONAL([WANT_TESTS], [test "x$enable_tests" !=3D "xno"]) + -+if test "x$enable_tests" !=3D "xno" ; then ++AS_IF([test "x$enable_tests" !=3D "xno"],[ PKG_CHECK_MODULES(DBUSMENUTESTS, json-glib-1.0 >=3D $JSON_GLIB_REQUIRE= D_VERSION - gio-unix-2.0 >=3D $GIO_UNIX_REQUIRED= _VERSION) -+fi +- gio-unix-2.0 >=3D $GIO_UNIX_REQUIRED= _VERSION) ++ gio-unix-2.0 >=3D $GIO_UNIX_REQUIRED= _VERSION, ++ [have_tests=3Dyes] ++) ++]) =20 AC_SUBST(DBUSMENUTESTS_CFLAGS) AC_SUBST(DBUSMENUTESTS_LIBS) +@@ -193,1 +193,6 @@ +=20 ++AS_IF([test "x$have_tests" =3D "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 @@ =20 +AC_ARG_ENABLE([vala], + AC_HELP_STRING([--disable-vala], [Disable vala]), -+ [enable_vala=3D$enableval], enable_vala=3Dauto) -+AM_CONDITIONAL([WANT_VALA], [test "x$enable_vala" !=3D "xno"]) ++ [enable_vala=3D$enableval], [enable_vala=3Dauto]) + -+if test "x$enable_vala" !=3D "xno" ; then -+if test "x$enable_introspection" =3D "xno" ; then -+ AC_MSG_ERROR([Vala bindings require introspection support, please --en= able-introspection]) -+fi ++AS_IF([test "x$enable_vala" !=3D "xno"],[ ++ AM_COND_IF([HAVE_INTROSPECTION],,[ ++ AC_MSG_ERROR([Vala bindings require introspection support, please --e= nable-introspection]) ++ ]) AC_PATH_PROG([VALA_API_GEN], [vapigen]) -+fi ++]) ++AM_CONDITIONAL([HAVE_VALA], [test -n "$VALA_API_GEN"]) =20 ########################### # XSLT Processor +@@ -193,1 +193,6 @@ +=20 ++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 ######################### =20 -+if WANT_VALA ++if HAVE_VALA if HAVE_INTROSPECTION =20 vapidir =3D $(datadir)/vala/vapi @@ -40,7 +47,7 @@ # VAPI Files ######################### =20 -+if WANT_VALA ++if HAVE_VALA if HAVE_INTROSPECTION =20 vapidir =3D $(datadir)/vala/vapi diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.p= atch 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=3D2.16 GTK3_REQUIRED_VERSION=3D2.91 =20 +AC_ARG_ENABLE([gtk], + AC_HELP_STRING([--disable-gtk], [Disable libdbusmenu-gtk library]), -+ [enable_gtk=3D$enableval], enable_gtk=3Dauto) ++ [enable_gtk=3D$enableval], [enable_gtk=3Dauto]) +AM_CONDITIONAL([WANT_LIBDBUSMENUGTK], [test "x$enable_gtk" !=3D "xno"]) + AC_ARG_WITH([gtk], @@ -14,13 +14,16 @@ [Which version of gtk to use @<:@default=3D2@:>@])], [], [with_gtk=3D2]) -+AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" =3D x3]) ++AM_CONDITIONAL([USE_GTK3], [test "x$with_gtk" =3D "x3"]) + -+if test "x$enable_gtk" !=3D "xno" ; then ++AS_IF([test "x$enable_gtk" !=3D "xno"],[ AS_IF([test "x$with_gtk" =3D x3], [PKG_CHECK_MODULES(DBUSMENUGTK, gtk+-3.0 >=3D $GTK3_REQUIRED_V= ERSION glib-2.0 >=3D $GLIB_REQUIRED_V= ERSION - libxml-2.0 >=3D $XML_REQUIRED_= VERSION) +- libxml-2.0 >=3D $XML_REQUIRED_= VERSION) ++ libxml-2.0 >=3D $XML_REQUIRED_= VERSION, ++ [have_gtk=3Dyes] ++) - 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" =3D x2], [PKG_CHECK_MODULES(DBUSMENUGTK, gtk+-2.0 >=3D $GTK_REQUIRED_VE= RSION glib-2.0 >=3D $GLIB_REQUIRED_V= ERSION - libxml-2.0 >=3D $XML_REQUIRED_= VERSION) +- libxml-2.0 >=3D $XML_REQUIRED_= VERSION) ++ libxml-2.0 >=3D $XML_REQUIRED_= VERSION, ++ [have_gtk=3Dyes] ++) - 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" =3D x3]) -+fi ++]) +AC_SUBST(DBUSMENUGTK_CFLAGS) +AC_SUBST(DBUSMENUGTK_LIBS) =20 ########################### # Dependencies - dumper +@@ -193,1 +193,6 @@ +=20 ++AS_IF([test "x$enable_gtk" =3D "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