From 5b789eb4a3e2032fab0cfa3bbe213c67434c4f0f Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Sun, 3 Jan 2016 16:43:30 +0000 Subject: dev-libs/glib: Create giomodule.cache parent directories if needed Bug #570752 Package-Manager: portage-2.2.26 --- dev-libs/glib/Manifest | 5 + .../files/glib-2.40.0-external-gdbus-codegen.patch | 95 ++++++ dev-libs/glib/glib-2.46.2-r1.ebuild | 322 +++++++++++++++++++++ dev-libs/glib/metadata.xml | 20 ++ 4 files changed, 442 insertions(+) create mode 100644 dev-libs/glib/Manifest create mode 100644 dev-libs/glib/files/glib-2.40.0-external-gdbus-codegen.patch create mode 100644 dev-libs/glib/glib-2.46.2-r1.ebuild create mode 100644 dev-libs/glib/metadata.xml (limited to 'dev-libs') diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest new file mode 100644 index 00000000..6e658d28 --- /dev/null +++ b/dev-libs/glib/Manifest @@ -0,0 +1,5 @@ +AUX glib-2.40.0-external-gdbus-codegen.patch 3901 SHA256 d06d2775c3632212c11eceb715f0da6a3b1ab6d8d901bb2fcb7c1fc3ca6b004a WHIRLPOOL 39dc4d38e6a3450cbba3a1843096da330b6b2bc8954b9cce4a890454e5546d3e6440ddd237772407bd4ffec05b78eb6ddddb5c4cb6c86a86e01a5ad4c96fe8b0 +DIST glib-2.46.2.tar.xz 7344636 SHA256 5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db SHA512 8b5298712710d77b4a47367071f782d2bb3042b149ec8fde8c065f80bf3c5375c94318d19665c0092572e4895e590231a47324d25f371310f02b43feb3009588 WHIRLPOOL 700b69360110351544780ace4dcb14f29505f63d8840882532a4b7c017860b6da86e09cbabca691b7b24cb08b8722e772555de044b8b21e4b0952c8a8e4e6ecb +DIST pkg-config-0.28.tar.gz 1931203 SHA256 6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 WHIRLPOOL db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486 +EBUILD glib-2.46.2-r1.ebuild 10463 SHA256 90d900787798a1df7a7489847f2f3fd93e5b0424420990c10462eb1811d50c27 WHIRLPOOL 7ee03e14b0faa62dacad46ed121d097ac402db90b50cc21bf42ef4da9f59330cc8803a95886e8865474aecf03384d4e161395b6d8f9a5b10fb3471bbd3a2ac91 +MISC metadata.xml 856 SHA256 d672c4abe98897f017bb0b12e4d18a7b18d32a26ba1ba77ae79d496f207df119 WHIRLPOOL d6a031d6d9b30f484908174b2f48266d03f1a2e7272ede4948a81ba76fb3243cbf5c0c458c6d9548fa421c9e883b96c85a797114dfb68df532db7a76adcb08d3 diff --git a/dev-libs/glib/files/glib-2.40.0-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.40.0-external-gdbus-codegen.patch new file mode 100644 index 00000000..50a9370e --- /dev/null +++ b/dev-libs/glib/files/glib-2.40.0-external-gdbus-codegen.patch @@ -0,0 +1,95 @@ +diff --git a/configure.ac b/configure.ac +index a01e58d..59d4527 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -367,14 +367,14 @@ AC_SUBST(PERL_PATH) + # option to specify python interpreter to use; this just sets $PYTHON, so that + # we will fallback to reading $PYTHON if --with-python is not given, and + # python.m4 will get the expected input +-AC_ARG_WITH(python, +- AS_HELP_STRING([--with-python=PATH], +- [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]), +- [PYTHON="$withval"], []) +-if test x"$PYTHON" = xyes; then +- AC_MSG_ERROR([--with-python option requires a path or program argument]) +-fi +-AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5") ++# AC_ARG_WITH(python, ++# AS_HELP_STRING([--with-python=PATH], ++# [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]), ++# [PYTHON="$withval"], []) ++# if test x"$PYTHON" = xyes; then ++# AC_MSG_ERROR([--with-python option requires a path or program argument]) ++# fi ++# AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5") + + + dnl *********************** +@@ -3580,7 +3580,6 @@ gobject/glib-mkenums + gobject/tests/Makefile + gthread/Makefile + gio/Makefile +-gio/gdbus-2.0/codegen/Makefile + gio/gdbus-2.0/codegen/config.py + gio/gnetworking.h + gio/xdgmime/Makefile +diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am +index 47fdd38..c7eb136 100644 +--- a/docs/reference/gio/Makefile.am ++++ b/docs/reference/gio/Makefile.am +@@ -157,8 +157,7 @@ man_MANS += \ + glib-compile-resources.1 \ + gsettings.1 \ + gresource.1 \ +- gdbus.1 \ +- gdbus-codegen.1 ++ gdbus.1 + + XSLTPROC_FLAGS = \ + --nonet \ +diff --git a/gio/Makefile.am b/gio/Makefile.am +index e993e2f..025ad94 100644 +--- a/gio/Makefile.am ++++ b/gio/Makefile.am +@@ -1,6 +1,6 @@ + include $(top_srcdir)/glib.mk + +-SUBDIRS = gdbus-2.0/codegen ++SUBDIRS = + + if OS_UNIX + SUBDIRS += xdgmime +diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am +index 2c54e59..3cd3c5a 100644 +--- a/gio/tests/Makefile.am ++++ b/gio/tests/Makefile.am +@@ -437,10 +437,8 @@ gnotification_SOURCES = $(gdbus_sessionbus_sources) gnotifica + + BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h + gdbus-test-codegen.o: gdbus-test-codegen-generated.h +-gdbus-test-codegen-generated.h: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen +- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ +- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ +- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ ++gdbus-test-codegen-generated.h: test-codegen.xml Makefile ++ $(AM_V_GEN) gdbus-codegen \ + --interface-prefix org.project. \ + --generate-c-code gdbus-test-codegen-generated \ + --c-generate-object-manager \ +diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am +index d6d1412..62ef706 100644 +--- a/gio/tests/gdbus-object-manager-example/Makefile.am ++++ b/gio/tests/gdbus-object-manager-example/Makefile.am +@@ -11,10 +11,8 @@ GDBUS_GENERATED = \ + gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml \ + $(NULL) + +-$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen +- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ +- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ +- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ ++$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile ++ $(AM_V_GEN) gdbus-codegen \ + --interface-prefix org.gtk.GDBus.Example.ObjectManager. \ + --c-namespace Example \ + --c-generate-object-manager \ diff --git a/dev-libs/glib/glib-2.46.2-r1.ebuild b/dev-libs/glib/glib-2.46.2-r1.ebuild new file mode 100644 index 00000000..c0c16857 --- /dev/null +++ b/dev-libs/glib/glib-2.46.2-r1.ebuild @@ -0,0 +1,322 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# Until bug #537330 glib is a reverse dependency of pkgconfig and, then +# adding new dependencies end up making stage3 to grow. Every addition needs +# then to be think very closely. + +EAPI="5" +PYTHON_COMPAT=( python2_7 ) +# Building with --disable-debug highly unrecommended. It will build glib in +# an unusable form as it disables some commonly used API. Please do not +# convert this to the use_enable form, as it results in a broken build. +GCONF_DEBUG="yes" +# Completely useless with or without USE static-libs, people need to use +# pkg-config +GNOME2_LA_PUNT="yes" + +inherit autotools bash-completion-r1 gnome2 libtool eutils flag-o-matic multilib \ + pax-utils python-r1 toolchain-funcs versionator virtualx linux-info multilib-minimal + +DESCRIPTION="The GLib library of C routines" +HOMEPAGE="http://www.gtk.org/" +SRC_URI="${SRC_URI} + http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf + +LICENSE="LGPL-2+" +SLOT="2" +IUSE="dbus fam kernel_linux +mime selinux static-libs systemtap test utils xattr" +REQUIRED_USE=" + utils? ( ${PYTHON_REQUIRED_USE} ) + test? ( ${PYTHON_REQUIRED_USE} ) +" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" + +RDEPEND=" + !=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] + >=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] + selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) + xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) + fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] ) + utils? ( + ${PYTHON_DEPS} + >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] + || ( + >=dev-libs/elfutils-0.142 + >=dev-libs/libelf-0.8.12 + >=sys-freebsd/freebsd-lib-9.2_rc1 + ) + ) +" +DEPEND="${RDEPEND} + app-text/docbook-xml-dtd:4.1.2 + >=dev-libs/libxslt-1.0 + >=sys-devel/gettext-0.11 + >=dev-util/gtk-doc-am-1.20 + systemtap? ( >=dev-util/systemtap-1.3 ) + test? ( + sys-devel/gdb + ${PYTHON_DEPS} + >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] + >=sys-apps/dbus-1.2.14 ) + !& /dev/null; then + if has_version sys-apps/dbus; then + export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include" + export DBUS1_LIBS="-ldbus-1" + fi + export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)" + export LIBFFI_LIBS="-lffi" + fi + + # These configure tests don't work when cross-compiling. + if tc-is-cross-compiler ; then + # https://bugzilla.gnome.org/show_bug.cgi?id=756473 + case ${CHOST} in + hppa*|metag*) export glib_cv_stack_grows=yes ;; + *) export glib_cv_stack_grows=no ;; + esac + # https://bugzilla.gnome.org/show_bug.cgi?id=756474 + export glib_cv_uscore=no + # https://bugzilla.gnome.org/show_bug.cgi?id=756475 + export ac_cv_func_posix_get{pwuid,grgid}_r=yes + fi + + local myconf + + case "${CHOST}" in + *-mingw*) myconf="${myconf} --with-threads=win32" ;; + *) myconf="${myconf} --with-threads=posix" ;; + esac + + # FIXME: Always use internal libpcre, bug #254659 + # (maybe consider going back to system lib) + # libelf used only by the gresource bin + ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \ + $(use_enable xattr) \ + $(use_enable fam) \ + $(use_enable selinux) \ + $(use_enable static-libs static) \ + $(use_enable systemtap dtrace) \ + $(use_enable systemtap systemtap) \ + $(multilib_native_use_enable utils libelf) \ + --disable-compile-warnings \ + --enable-man \ + --with-pcre=internal \ + --with-xml-catalog="${EPREFIX}/etc/xml/catalog" + + if multilib_is_native_abi; then + local d + for d in glib gio gobject; do + ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die + done + fi +} + +multilib_src_test() { + export XDG_CONFIG_DIRS=/etc/xdg + export XDG_DATA_DIRS=/usr/local/share:/usr/share + export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" + export LC_TIME=C # bug #411967 + python_export_best + + # Related test is a bit nitpicking + mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" + chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" + + # Hardened: gdb needs this, bug #338891 + if host-is-pax ; then + pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \ + || die "Hardened adjustment failed" + fi + + # Need X for dbus-launch session X11 initialization + Xemake check +} + +multilib_src_install() { + gnome2_src_install completiondir="$(get_bashcompdir)" +} + +multilib_src_install_all() { + DOCS="AUTHORS ChangeLog* NEWS* README" + einstalldocs + + if use utils ; then + python_replicate_script "${ED}"/usr/bin/gtester-report + else + rm "${ED}usr/bin/gtester-report" + rm "${ED}usr/share/man/man1/gtester-report.1" + fi + + # Do not install charset.alias even if generated, leave it to libiconv + rm -f "${ED}/usr/lib/charset.alias" + + # Don't install gdb python macros, bug 291328 + rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/" +} + +pkg_preinst() { + gnome2_pkg_preinst + + # Make gschemas.compiled belong to glib alone + local cache="usr/share/glib-2.0/schemas/gschemas.compiled" + + if [[ -e ${EROOT}${cache} ]]; then + cp "${EROOT}"${cache} "${ED}"/${cache} || die + else + touch "${ED}"/${cache} || die + fi + + multilib_pkg_preinst() { + # Make giomodule.cache belong to glib alone + local cache="usr/$(get_libdir)/gio/giomodule.cache" + + if [[ -e ${EROOT}${cache} ]]; then + cp "${EROOT}"${cache} "${ED}"/${cache} || die + else + if [[ ! -d "${ED}"/${cache%/*} ]] ; then + mkdir -p "${ED}"/${cache%/*} || die "Fail to create giomodule.cache parent directories" + fi + + touch "${ED}"/${cache} || die + fi + } + + multilib_foreach_abi multilib_pkg_preinst +} + +pkg_postinst() { + # force (re)generation of gschemas.compiled + GNOME2_ECLASS_GLIB_SCHEMAS="force" + + gnome2_pkg_postinst + + multilib_pkg_postinst() { + gnome2_giomodule_cache_update \ + || die "Update GIO modules cache failed (for ${ABI})" + } + multilib_foreach_abi multilib_pkg_postinst + + if has_version ' + + + gnome + + Enable dependencies required by glib libraries + using dbus service to manage settings saving + Pull in shared MIME database that many glib-based + applications require at runtime to detect or open files. Warning: + do not disable this flag unless installing on a headless server. + Build support for profiling and tracing using + dev-util/systemtap + Install gtester-report utility to generate test + report files for your software; build gresource utility with + ELF support. + + + cpe:/a:gnome:glib + + -- cgit v1.2.3