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 1Pllmz-0000D0-I5 for garchives@archives.gentoo.org; Sat, 05 Feb 2011 17:19:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A95721C074; Sat, 5 Feb 2011 17:19:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 6896A1C0A8 for ; Sat, 5 Feb 2011 17:19:05 +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 519BF1B405A for ; Sat, 5 Feb 2011 17:19:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 80E9F800A0 for ; Sat, 5 Feb 2011 17:00:22 +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: <6a7db316653a72172956cf36547b35e39c256c9a.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.16-fix-introspection.patch dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-optional-vala.patch dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-fix-introspection.patch dev-libs/libdbusmenu/libdbusmenu-0.3.16-r1.ebuild dev-libs/libdbusmenu/libdbusmenu-0.3.16.ebuild dev-libs/libdbusmenu/libdbusmenu-0.3.94-r1.ebuild dev-libs/libdbusmenu/libdbusmenu-0.3.94.ebuild dev-libs/libdbusmenu/metadata.xml X-VCS-Directories: dev-libs/libdbusmenu/ dev-libs/libdbusmenu/files/ X-VCS-Committer: devurandom X-VCS-Committer-Name: Dennis Schridde X-VCS-Revision: 6a7db316653a72172956cf36547b35e39c256c9a Date: Sat, 5 Feb 2011 17:00:22 +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: 05bc33aaaa981620ad0f4f036e45b79d commit: 6a7db316653a72172956cf36547b35e39c256c9a Author: Dennis Schridde gmx net> AuthorDate: Sat Feb 5 16:13:47 2011 +0000 Commit: Dennis Schridde gmx net> CommitDate: Sat Feb 5 17:00:12 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D6a7db316 [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 =3D> libdbusmenu-0.3.16-r1.ebuild} | 19 ++++++- ...-0.3.94.ebuild =3D> 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-introspect= ion.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-fix-introspecti= on.patch new file mode 100644 index 0000000..5977795 --- /dev/null +++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.16-fix-introspection.pat= ch @@ -0,0 +1,11 @@ +--- ./libdbusmenu-glib/Makefile.am.orig 2011-02-05 16:38:38.713641727 +0= 100 ++++ ./libdbusmenu-glib/Makefile.am 2011-02-05 16:38:44.917448353 +0100 +@@ -123,7 +123,7 @@ +=20 + introspection_sources =3D $(libdbusmenu_glibinclude_HEADERS) +=20 +-Dbusmenu_Glib-0.2.gir: libdbusmenu-glib.la ++Dbusmenu-Glib-0.2.gir: libdbusmenu-glib.la + Dbusmenu_Glib_0_2_gir_INCLUDES =3D \ + GObject-2.0 + Dbusmenu_Glib_0_2_gir_CFLAGS =3D $(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 + ########################### +=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"]) ++ ++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 + AC_PATH_PROG([VALA_API_GEN], [vapigen]) ++fi +=20 + ########################### + # 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 + ######################### +=20 ++if WANT_VALA + if HAVE_INTROSPECTION +=20 + vapidir =3D $(datadir)/vala/vapi +@@ -154,4 +155,5 @@ + CLEANFILES +=3D $(vapi_DATA) DbusmenuGtk$(VER)-0.4.tmp.gir +=20 + endif ++endif +=20 +--- libdbusmenu-glib/Makefile.am.orig 2011-02-05 15:08:49.613538681 +010= 0 ++++ libdbusmenu-glib/Makefile.am 2011-02-05 15:06:23.826443241 +0100 +@@ -165,6 +165,7 @@ + # VAPI Files + ######################### +=20 ++if WANT_VALA + if HAVE_INTROSPECTION +=20 + vapidir =3D $(datadir)/vala/vapi +@@ -176,4 +177,5 @@ + CLEANFILES +=3D $(vapi_DATA) +=20 + endif ++endif +=20 diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-fix-introspect= ion.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-fix-introspecti= on.patch new file mode 100644 index 0000000..a259942 --- /dev/null +++ b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-fix-introspection.pat= ch @@ -0,0 +1,11 @@ +--- ./libdbusmenu-glib/Makefile.am.orig 2011-02-05 16:16:34.481082458 +0= 100 ++++ ./libdbusmenu-glib/Makefile.am 2011-02-05 16:20:31.703396315 +0100 +@@ -138,7 +138,7 @@ +=20 + introspection_sources =3D $(libdbusmenu_glibinclude_HEADERS) +=20 +-Dbusmenu_Glib-0.4.gir: libdbusmenu-glib.la ++Dbusmenu-Glib-0.4.gir: libdbusmenu-glib.la + Dbusmenu_Glib_0_4_gir_INCLUDES =3D \ + GObject-2.0 + Dbusmenu_Glib_0_4_gir_CFLAGS =3D $(DBUSMENUGLIB_CFLAGS) -I$(top_srcdir) diff --git a/dev-libs/libdbusmenu/libdbusmenu-0.3.16.ebuild b/dev-libs/li= bdbusmenu/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=3D"http://launchpad.net/dbusmenu/$(get_version_= component_range 1-2)/${PV}/ LICENSE=3D"LGPL-3" SLOT=3D"0" KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"gtk +introspection test" +IUSE=3D"gtk +introspection test vala" =20 -# Needs running dbus and a program called "dbus-test-runner" +# Needs dev-util/dbus-test-runner (not yet in tree) RESTRICT=3D"test" =20 RDEPEND=3D"dev-libs/glib:2 @@ -25,10 +25,20 @@ RDEPEND=3D"dev-libs/glib:2 DEPEND=3D"${RDEPEND} introspection? ( >=3Ddev-libs/gobject-introspection-0.6.7 ) test? ( dev-libs/json-glib[introspection=3D] ) + vala? ( dev-lang/vala:0 ) dev-util/intltool dev-util/pkgconfig" =20 +pkg_setup() { + if use vala && use !introspection ; then + eerror "Vala bindings (USE=3Dvala) require introspection support (USE=3D= introspection)" + die "Vala bindings (USE=3Dvala) require introspection support (USE=3Di= ntrospection)" + 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/M= akefile.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) } =20 src_test() { diff --git a/dev-libs/libdbusmenu/libdbusmenu-0.3.94.ebuild b/dev-libs/li= bdbusmenu/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=3D"http://launchpad.net/dbusmenu/${MY_MAJOR_VER= SION}/${PV}/+download/${P}. LICENSE=3D"LGPL-3" SLOT=3D"0" KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"gtk gtk3 +introspection test" +IUSE=3D"gtk gtk3 +introspection test vala" =20 # Needs dev-util/dbus-test-runner (not yet in tree) RESTRICT=3D"test" @@ -33,10 +33,20 @@ RDEPEND=3D"dev-libs/glib:2 DEPEND=3D"${RDEPEND} introspection? ( >=3Ddev-libs/gobject-introspection-0.6.7 ) test? ( dev-libs/json-glib[introspection=3D] ) + vala? ( dev-lang/vala:0 ) dev-util/intltool dev-util/pkgconfig" =20 +pkg_setup() { + if use vala && use !introspection ; then + eerror "Vala bindings (USE=3Dvala) require introspection support (USE=3D= introspection)" + die "Vala bindings (USE=3Dvala) require introspection support (USE=3Di= ntrospection)" + 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/M= akefile.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} } =20 diff --git a/dev-libs/libdbusmenu/metadata.xml b/dev-libs/libdbusmenu/met= adata.xml index fb2117a..bb3e5c1 100644 --- a/dev-libs/libdbusmenu/metadata.xml +++ b/dev-libs/libdbusmenu/metadata.xml @@ -5,5 +5,6 @@ Build experimental gtk3 version instead of using= gtk2 Use dev-libs/gobject-introspection for = introspection + Enable bindings for dev-lang/vala