mgorny 15/04/19 16:30:45 Modified: metadata.xml ChangeLog Added: libdbusmenu-12.10.2-r2.ebuild Log: Enable optional GTK+2 support. Enable multilib support. Remove gtk-doc install hacks, just install into the proper gtk-doc location. Based on the work done by Karol Herbst on https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/65. Part of bug #462764. (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.8 dev-libs/libdbusmenu/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdbusmenu/metadata.xml?rev=1.8&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdbusmenu/metadata.xml?rev=1.8&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdbusmenu/metadata.xml?r1=1.7&r2=1.8 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/metadata.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- metadata.xml 5 Apr 2015 16:09:44 -0000 1.7 +++ metadata.xml 19 Apr 2015 16:30:45 -0000 1.8 @@ -7,6 +7,7 @@ <email>[email protected]</email> </maintainer> <use> + <flag name="gtk" restrict=">=dev-libs/libdbusmenu-12.10.2-r2">Enable support for GTK+2</flag> <flag name="gtk3">Enable support for GTK+3</flag> <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag> </use> 1.36 dev-libs/libdbusmenu/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdbusmenu/ChangeLog?rev=1.36&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdbusmenu/ChangeLog?rev=1.36&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdbusmenu/ChangeLog?r1=1.35&r2=1.36 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/ChangeLog,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- ChangeLog 8 Apr 2015 17:51:55 -0000 1.35 +++ ChangeLog 19 Apr 2015 16:30:45 -0000 1.36 @@ -1,6 +1,16 @@ # 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.35 2015/04/08 17:51:55 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdbusmenu/ChangeLog,v 1.36 2015/04/19 16:30:45 mgorny Exp $ + +*libdbusmenu-12.10.2-r2 (19 Apr 2015) + + 19 Apr 2015; Michał Górny <[email protected]> + +files/libdbusmenu-12.10.2-gtk2-signal-fix.patch, + +libdbusmenu-12.10.2-r2.ebuild, metadata.xml: + Enable optional GTK+2 support. Enable multilib support. Remove gtk-doc install + hacks, just install into the proper gtk-doc location. Based on the work done + by Karol Herbst on https://github.com/gentoo/gentoo-portage-rsync- + mirror/pull/65. Part of bug #462764. 08 Apr 2015; Michał Górny <[email protected]> libdbusmenu-12.10.2-r1.ebuild: Drop old Python implementations 1.1 dev-libs/libdbusmenu/libdbusmenu-12.10.2-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdbusmenu/libdbusmenu-12.10.2-r2.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libdbusmenu/libdbusmenu-12.10.2-r2.ebuild?rev=1.1&content-type=text/plain Index: libdbusmenu-12.10.2-r2.ebuild =================================================================== # 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 $ EAPI=5 VALA_MIN_API_VERSION=0.16 VALA_USE_DEPEND=vapigen PYTHON_COMPAT=( python2_7 ) inherit eutils flag-o-matic multilib-minimal 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 gtk gtk3 +introspection" RDEPEND=" >=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}] >=dev-libs/json-glib-0.13.4[${MULTILIB_USEDEP}] >=dev-libs/glib-2.32[${MULTILIB_USEDEP}] dev-libs/libxml2[${MULTILIB_USEDEP}] gtk? ( x11-libs/gtk+:2[introspection?,${MULTILIB_USEDEP}] ) gtk3? ( >=x11-libs/gtk+-3.2:3[introspection?,${MULTILIB_USEDEP}] ) introspection? ( >=dev-libs/gobject-introspection-1 ) !<${CATEGORY}/${PN}-0.5.1-r200" DEPEND="${RDEPEND} app-text/gnome-doc-utils dev-util/intltool virtual/pkgconfig[${MULTILIB_USEDEP}] introspection? ( $(vala_depend) )" src_prepare() { if use introspection; then vala_src_prepare export VALA_API_GEN="${VAPIGEN}" fi python_fix_shebang tools # remove reliance on custom Ubuntu hacks in old GTK+2 epatch "${FILESDIR}/${P}-gtk2-signal-fix.patch" epatch_user } multilib_src_configure() { append-flags -Wno-error #414323 local myconf=( --disable-gtk --disable-static --disable-silent-rules --disable-scrollkeeper # dumper extra tool is only for GTK+-2.x, tests use valgrind which is stupid --disable-dumper $(multilib_native_use_enable introspection) $(multilib_native_use_enable introspection vala) $(use_enable debug massivedebugging) ) local ECONF_SOURCE=${S} econf "${myconf[@]}" GTK_VARIANTS=( $(usex gtk 2 '') $(usex gtk3 3 '') ) local MULTIBUILD_VARIANTS=( "${GTK_VARIANTS[@]}" ) local top_builddir=${BUILD_DIR} gtk_configure() { local gtkconf=( "${myconf[@]}" --enable-gtk --with-gtk="${MULTIBUILD_VARIANT}" ) mkdir -p "${BUILD_DIR}" || die cd "${BUILD_DIR}" || die econf "${gtkconf[@]}" rm -r libdbusmenu-glib || die ln -s "${top_builddir}"/libdbusmenu-glib libdbusmenu-glib || die } [[ ${GTK_VARIANTS[@]} ]] && multibuild_foreach_variant gtk_configure } gtk_emake() { emake -C "${BUILD_DIR}"/libdbusmenu-gtk "${@}" multilib_is_native_abi && \ emake -C "${BUILD_DIR}"/docs/libdbusmenu-gtk "${@}" } multilib_src_compile() { emake local MULTIBUILD_VARIANTS=( "${GTK_VARIANTS[@]}" ) [[ ${GTK_VARIANTS[@]} ]] && multibuild_foreach_variant \ gtk_emake } src_test() { :; } #440192 multilib_src_install() { emake -j1 DESTDIR="${D}" install local MULTIBUILD_VARIANTS=( "${GTK_VARIANTS[@]}" ) [[ ${GTK_VARIANTS[@]} ]] && multibuild_foreach_variant \ gtk_emake -j1 install DESTDIR="${D}" } multilib_src_install_all() { einstalldocs prune_libtool_files } pkg_preinst() { # kill old symlinks that Portage will preserve and break install if [[ -L ${EROOT}/usr/share/gtk-doc/html/libdbusmenu-glib ]]; then rm -v "${EROOT}/usr/share/gtk-doc/html/libdbusmenu-glib" || die fi if [[ -L ${EROOT}/usr/share/gtk-doc/html/libdbusmenu-gtk ]]; then rm -v "${EROOT}/usr/share/gtk-doc/html/libdbusmenu-gtk" || die fi }
