tRemove some unused packages. - parlay - yet another gentoo overlay (HTM) git clone https://git.parazyd.org/parlay (DIR) Log (DIR) Files (DIR) Refs (DIR) README --- (DIR) commit e3608149ba6f2e097fb866ba16433c39632ff485 (DIR) parent 5f8b847be3d8c19c5bc86d2060ca4c50dfb319f5 (HTM) Author: parazyd <parazyd@dyne.org> Date: Thu, 15 Dec 2016 15:54:55 +0100 Remove some unused packages. Diffstat: D dev-libs/glib/Manifest | 2 -- D dev-libs/glib/files/glib-2.40.0-ex… | 95 ------------------------------ D dev-libs/glib/files/glib-2.46.2-fi… | 30 ------------------------------ D dev-libs/glib/files/glib-2.46.2-me… | 25 ------------------------- D dev-libs/glib/files/glib-2.46.2-mu… | 98 ------------------------------- D dev-libs/glib/files/glib-2.48.0-GC… | 44 ------------------------------- D dev-libs/glib/files/glib-gettext.p… | 13 ------------- D dev-libs/glib/glib-2.46.2-r99.ebui… | 326 ------------------------------- D dev-libs/protobuf/Manifest | 1 - D dev-libs/protobuf/files/70protobuf… | 3 --- D dev-libs/protobuf/files/proto.vim | 1 - D dev-libs/protobuf/files/protobuf-2… | 28 ---------------------------- D dev-libs/protobuf/files/protobuf-2… | 14 -------------- D dev-libs/protobuf/files/protobuf-2… | 15 --------------- D dev-libs/protobuf/files/protobuf-2… | 256 ------------------------------- D dev-libs/protobuf/files/protobuf-3… | 89 ------------------------------- D dev-libs/protobuf/files/protobuf-3… | 24 ------------------------ D dev-libs/protobuf/protobuf-3.0.0_b… | 102 ------------------------------- 18 files changed, 0 insertions(+), 1166 deletions(-) --- (DIR) diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest t@@ -1,2 +0,0 @@ -DIST glib-2.46.2.tar.xz 7344636 SHA256 5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db SHA512 8b5298712710d77b4a47367071f782d2bb3042b149ec8fde8c065f80bf3c5375c94318d19665c0092572e4895e590231a47324d25f371310f02b43feb3009588 WHIRLPOOL 700b69360110351544780ace4dcb14f29505f63d8840882532a4b7c017860b6da86e09cbabca691b7b24cb08b8722e772555de044b8b21e4b0952c8a8e4e6ecb -DIST pkg-config-0.28.tar.gz 1931203 SHA256 6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 WHIRLPOOL db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486 (DIR) 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 t@@ -1,95 +0,0 @@ -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 \ (DIR) diff --git a/dev-libs/glib/files/glib-2.46.2-fix-gstrerror-on-non-glibc.patch b/dev-libs/glib/files/glib-2.46.2-fix-gstrerror-on-non-glibc.patch t@@ -1,30 +0,0 @@ -From feb4fb2842ef123b16b0cdf8d50be192e30862be Mon Sep 17 00:00:00 2001 -From: Dan Winship <danw@gnome.org> -Date: Mon, 16 Nov 2015 16:57:38 -0500 -Subject: Fix g_strerror() on non-glibc - -When using one of the codepaths that copies the error string into buf, -make sure the string gets strdup() afterward. - -https://bugzilla.gnome.org/show_bug.cgi?id=758194 ---- - glib/gstrfuncs.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c -index 6712a64..0e2498f 100644 ---- a/glib/gstrfuncs.c -+++ b/glib/gstrfuncs.c -@@ -1293,6 +1293,8 @@ g_strerror (gint errnum) - if (error) - g_print ("%s\n", error->message); - } -+ else if (msg == (const gchar *)buf) -+ msg = g_strdup (buf); - - g_hash_table_insert (errors, GINT_TO_POINTER (errnum), (char *) msg); - } --- -cgit v0.12 - - (DIR) diff --git a/dev-libs/glib/files/glib-2.46.2-memleak.patch b/dev-libs/glib/files/glib-2.46.2-memleak.patch t@@ -1,25 +0,0 @@ -From e98e1eff83c742c73a148dd7b75c00d77e0cee40 Mon Sep 17 00:00:00 2001 -From: Evangelos Foutras <evangelos@foutrelis.com> -Date: Wed, 25 Nov 2015 23:29:18 +0200 -Subject: GDBusProxy: Fix a memory leak during initialization - -https://bugzilla.gnome.org/show_bug.cgi?id=758641 ---- - gio/gdbusproxy.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/gio/gdbusproxy.c b/gio/gdbusproxy.c -index 52a22fb..7b1140f 100644 ---- a/gio/gdbusproxy.c -+++ b/gio/gdbusproxy.c -@@ -1720,6 +1720,7 @@ async_initable_init_second_finish (GAsyncInitable *initable, - if (result != NULL) - { - process_get_all_reply (proxy, result); -+ g_variant_unref (result); - } - - proxy->priv->initialized = TRUE; --- -cgit v0.12 - (DIR) diff --git a/dev-libs/glib/files/glib-2.46.2-musl.patch b/dev-libs/glib/files/glib-2.46.2-musl.patch t@@ -1,98 +0,0 @@ -Reverting commit https://github.com/GNOME/glib/commit/2fe992b099bfd3fb121a71b7af43e116b2142b5d - -musl's does not run ctors in the assumed order that glib-2.46 expects: - -- glib_init() should be called before gobject_init_ctor(). - - -diff --git glib/glib-init.c glib/glib-init.c -index e7002e6..24efe9d 100644 ---- glib/glib-init.c -+++ glib/glib-init.c -@@ -233,7 +233,6 @@ glib_init (void) - { - g_messages_prefixed_init (); - g_debug_init (); -- g_quark_init (); - } - - #if defined (G_OS_WIN32) -diff --git glib/glib-init.h glib/glib-init.h -index b56f7e2..de6be78 100644 ---- glib/glib-init.h -+++ glib/glib-init.h -@@ -25,8 +25,6 @@ - extern GLogLevelFlags g_log_always_fatal; - extern GLogLevelFlags g_log_msg_prefix; - --void g_quark_init (void); -- - #ifdef G_OS_WIN32 - #include <windows.h> - -diff --git glib/gquark.c glib/gquark.c -index 9e51a92..d620533 100644 ---- glib/gquark.c -+++ glib/gquark.c -@@ -40,7 +40,6 @@ - #include "gthread.h" - #include "gtestutils.h" - #include "glib_trace.h" --#include "glib-init.h" - - #define QUARK_BLOCK_SIZE 2048 - #define QUARK_STRING_BLOCK_SIZE (4096 - sizeof (gsize)) -@@ -54,16 +53,6 @@ static gint quark_seq_id = 0; - static gchar *quark_block = NULL; - static gint quark_block_offset = 0; - --void --g_quark_init (void) --{ -- g_assert (quark_seq_id == 0); -- quark_ht = g_hash_table_new (g_str_hash, g_str_equal); -- quarks = g_new (gchar*, QUARK_BLOCK_SIZE); -- quarks[0] = NULL; -- quark_seq_id = 1; --} -- - /** - * SECTION:quarks - * @title: Quarks -@@ -138,9 +127,10 @@ g_quark_try_string (const gchar *string) - return 0; - - G_LOCK (quark_global); -- quark = GPOINTER_TO_UINT (g_hash_table_lookup (quark_ht, string)); -+ if (quark_ht) -+ quark = GPOINTER_TO_UINT (g_hash_table_lookup (quark_ht, string)); - G_UNLOCK (quark_global); -- -+ - return quark; - } - -@@ -179,7 +169,8 @@ quark_from_string (const gchar *string, - { - GQuark quark = 0; - -- quark = GPOINTER_TO_UINT (g_hash_table_lookup (quark_ht, string)); -+ if (quark_ht) -+ quark = GPOINTER_TO_UINT (g_hash_table_lookup (quark_ht, string)); - - if (!quark) - { -@@ -292,6 +283,13 @@ quark_new (gchar *string) - */ - g_atomic_pointer_set (&quarks, quarks_new); - } -+ if (!quark_ht) -+ { -+ g_assert (quark_seq_id == 0); -+ quark_ht = g_hash_table_new (g_str_hash, g_str_equal); -+ quarks[quark_seq_id] = NULL; -+ g_atomic_int_inc (&quark_seq_id); -+ } - - quark = quark_seq_id; - g_atomic_pointer_set (&quarks[quark], string); (DIR) diff --git a/dev-libs/glib/files/glib-2.48.0-GContextSpecificGroup.patch b/dev-libs/glib/files/glib-2.48.0-GContextSpecificGroup.patch t@@ -1,44 +0,0 @@ -From 62f320e6bb09b4e6454e6a49dc3a844b13b9cc34 Mon Sep 17 00:00:00 2001 -From: Allison Ryan Lortie <desrt@desrt.ca> -Date: Tue, 26 Apr 2016 10:39:42 +0200 -Subject: [PATCH] GContextSpecificGroup: detach sources - -GContextSpecificGroup has been somewhat broken for a rather long time: -when we remove the last reference on an object held in the group, we try -to clean up the source, but fail to actually remove it from the -mainloop. - -We will soon stop emitting signals on the source (due to it having been -removed from the hash table) but any "in flight" signals will still be -delivered on the source, which continues to exist. This is a problem if -the event is being delivered just as the object is being destroyed. - -This also means that we leave the source attached to the mainloop -forever (and next time will create a new one)... - -This is demonstrated with the GtkAppChooser dialog which writes an -update to the mimeapps.list file just as it is closing, triggering the -app info monitor to fire just as it is being destroyed. - -Karl Tomlinson correctly analysed the problem and proposed this fix. - -https://bugzilla.gnome.org/show_bug.cgi?id=762994 ---- - gio/gcontextspecificgroup.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/gio/gcontextspecificgroup.c b/gio/gcontextspecificgroup.c -index b0eb279..211d765 100644 ---- a/gio/gcontextspecificgroup.c -+++ b/gio/gcontextspecificgroup.c -@@ -234,6 +234,7 @@ g_context_specific_group_remove (GContextSpecificGroup *group, - - g_assert (css->instance == instance); - -+ g_source_destroy ((GSource *) css); - g_source_unref ((GSource *) css); - g_main_context_unref (context); - } --- -2.8.1 - (DIR) diff --git a/dev-libs/glib/files/glib-gettext.patch b/dev-libs/glib/files/glib-gettext.patch t@@ -1,13 +0,0 @@ -diff --git a/m4macros/glib-gettext.m4 b/m4macros/glib-gettext.m4 -index 5217fd8..78205ab 100644 ---- a/m4macros/glib-gettext.m4 -+++ b/m4macros/glib-gettext.m4 -@@ -36,6 +36,8 @@ dnl We go to great lengths to make sure that aclocal won't - dnl try to pull in the installed version of these macros - dnl when running aclocal in the glib directory. - dnl -+m4_ifdef([glib_DEFUN],[m4_undefine([glib_DEFUN])]) -+m4_ifdef([glib_REQUIRE],[m4_undefine([glib_REQUIRE])]) - m4_copy([AC_DEFUN],[glib_DEFUN]) - m4_copy([AC_REQUIRE],[glib_REQUIRE]) - dnl (DIR) diff --git a/dev-libs/glib/glib-2.46.2-r99.ebuild b/dev-libs/glib/glib-2.46.2-r99.ebuild t@@ -1,326 +0,0 @@ -# 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} - https://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=" - !<dev-util/gdbus-codegen-${PV} - >=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}] - virtual/libelf:0= - ) -" -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-util/gtk-doc-1.15-r2 -" -# gobject-introspection blocker to ensure people don't mix -# different g-i and glib major versions - -PDEPEND="!<gnome-base/gvfs-1.6.4-r990 - dbus? ( gnome-base/dconf ) - mime? ( x11-misc/shared-mime-info ) -" -# shared-mime-info needed for gio/xdgmime, bug #409481 -# dconf is needed to be able to save settings, bug #498436 -# Earlier versions of gvfs do not work with glib - -MULTILIB_CHOST_TOOLS=( - /usr/bin/gio-querymodules -) - -pkg_setup() { - if use kernel_linux ; then - CONFIG_CHECK="~INOTIFY_USER" - if use test; then - CONFIG_CHECK="~IPV6" - WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." - fi - linux-info_pkg_setup - fi -} - -src_prepare() { - # GDBusProxy: Fix a memory leak during initialization (from 2.46 branch) - epatch "${FILESDIR}"/${P}-memleak.patch - - # Fix for MUSL - epatch "${FILESDIR}"/${P}-musl.patch - - # Fix for glib-gettext - epatch "${FILESDIR}"/glib-gettext.patch - - # Prevent build failure in stage3 where pkgconfig is not available, bug #481056 - mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die - - if use test; then - # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 - if ! has_version dev-util/desktop-file-utils ; then - ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," - ewarn "think on installing it to get these tests run." - sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die - sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die - fi - - # gdesktopappinfo requires existing terminal (gnome-terminal or any - # other), falling back to xterm if one doesn't exist - if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then - ewarn "Some tests will be skipped due to missing terminal program" - sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die - fi - - # Disable tests requiring dbus-python and pygobject; bugs #349236, #377549, #384853 - if ! has_version dev-python/dbus-python || ! has_version 'dev-python/pygobject:3' ; then - ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:3" - ewarn "not being present on your system, think on installing them to get these tests run." - sed -i -e "/connection\/filter/d" gio/tests/gdbus-connection.c || die - sed -i -e "/connection\/large_message/d" gio/tests/gdbus-connection-slow.c || die - sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || die - sed -i -e "/gdbus\/proxy-well-known-name/d" gio/tests/gdbus-proxy-well-known-name.c || die - sed -i -e "/gdbus\/introspection-parser/d" gio/tests/gdbus-introspection.c || die - sed -i -e "/g_test_add_func/d" gio/tests/gdbus-threading.c || die - sed -i -e "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die - # needed to prevent gdbus-threading from asserting - ln -sfn $(type -P true) gio/tests/gdbus-testserver.py - fi - - # Some tests need ipv6, upstream bug #667468 - # https://bugs.gentoo.org/show_bug.cgi?id=508752 - if [[ ! -f /proc/net/if_net6 ]]; then - sed -i -e "/gdbus\/peer-to-peer/d" gio/tests/gdbus-peer.c || die - sed -i -e "/gdbus\/delayed-message-processing/d" gio/tests/gdbus-peer.c || die - sed -i -e "/gdbus\/nonce-tcp/d" gio/tests/gdbus-peer.c || die - fi - - # This test is prone to fail, bug #504024, upstream bug #723719 - sed -i -e '/gdbus-close-pending/d' gio/tests/Makefile.am || die - - # https://bugzilla.gnome.org/show_bug.cgi?id=722604 - sed -i -e "/timer\/stop/d" glib/tests/timer.c || die - sed -i -e "/timer\/basic/d" glib/tests/timer.c || die - else - # Don't build tests, also prevents extra deps, bug #512022 - sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die - fi - - # gdbus-codegen is a separate package - epatch "${FILESDIR}"/${PN}-2.40.0-external-gdbus-codegen.patch - - # crash in Firefox when choosing default application, fixed in 2.48.1; bug #577686 - epatch "${FILESDIR}"/${PN}-2.48.0-GContextSpecificGroup.patch - - # fixes https://bugzilla.gnome.org/show_bug.cgi?id=758194 - epatch "${FILESDIR}"/${PN}-2.46.2-fix-gstrerror-on-non-glibc.patch - - # leave python shebang alone - sed -e '/${PYTHON}/d' \ - -i glib/Makefile.{am,in} || die - - epatch_user - - # Also needed to prevent cross-compile failures, see bug #267603 - eautoreconf - - gnome2_src_prepare - - epunt_cxx -} - -multilib_src_configure() { - # Avoid circular depend with dev-util/pkgconfig and - # native builds (cross-compiles won't need pkg-config - # in the target ROOT to work here) - if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /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)" - keepdir /usr/$(get_libdir)/gio/modules -} - -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 - 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 -} - -pkg_postrm() { - gnome2_pkg_postrm - - if [[ -z ${REPLACED_BY_VERSION} ]]; then - multilib_pkg_postrm() { - rm -f "${EROOT}"usr/$(get_libdir)/gio/giomodule.cache - } - multilib_foreach_abi multilib_pkg_postrm - rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled - fi -} (DIR) diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest t@@ -1 +0,0 @@ -DIST protobuf-3.0.0_beta3_p1.tar.gz 3673779 SHA256 494726c9a6a45a20cd085795a26e4f05627e9b3b1fa5ab21a8b0edc5db8173dc SHA512 bebe655ffa6f8dd9bfbf4d2fcce160de6d45f50fd802b8907833cde3f232b7b44186d06fe9cc01ed5dc7b4a040fd3069e2ec7d2704da596e8d3af80f8dba7e8b WHIRLPOOL d35dca8e402741e4d30c9c787f5927c7fe7f22619ddb3ca20d302c27fbeb929cecd55cc7e6785b28acb76c89893d2baf7fce3f685a3f186006e1e30a2901ae1b (DIR) diff --git a/dev-libs/protobuf/files/70protobuf-gentoo.el b/dev-libs/protobuf/files/70protobuf-gentoo.el t@@ -1,3 +0,0 @@ -(add-to-list 'load-path "@SITELISP@") -(add-to-list 'auto-mode-alist '("\\.proto\\'" . protobuf-mode)) -(autoload 'protobuf-mode "protobuf-mode" "Google protobuf mode." t) (DIR) diff --git a/dev-libs/protobuf/files/proto.vim b/dev-libs/protobuf/files/proto.vim t@@ -1 +0,0 @@ -au BufRead,BufNewFile *.proto set filetype=proto (DIR) diff --git a/dev-libs/protobuf/files/protobuf-2.3.0-asneeded-2.patch b/dev-libs/protobuf/files/protobuf-2.3.0-asneeded-2.patch t@@ -1,28 +0,0 @@ -Fixing as-needed issue - -http://bugs.gentoo.org/show_bug.cgi?id=271509 - ---- m4/acx_pthread.m4 -+++ m4/acx_pthread.m4 -@@ -278,7 +278,8 @@ - fi - fi - -- if test x"$done" = xno; then -+ if test x"$done" = xyes; then -+ done="no" - AC_MSG_CHECKING([whether -pthread is sufficient with -shared]) - AC_TRY_LINK([#include <pthread.h>], - [pthread_t th; pthread_join(th, 0); ---- gtest/m4/acx_pthread.m4 -+++ gtest/m4/acx_pthread.m4 -@@ -278,7 +278,8 @@ - fi - fi - -- if test x"$done" = xno; then -+ if test x"$done" = xyes; then -+ done="no" - AC_MSG_CHECKING([whether -pthread is sufficient with -shared]) - AC_TRY_LINK([#include <pthread.h>], - [pthread_t th; pthread_join(th, 0); (DIR) diff --git a/dev-libs/protobuf/files/protobuf-2.5.0-emacs-24.4.patch b/dev-libs/protobuf/files/protobuf-2.5.0-emacs-24.4.patch t@@ -1,14 +0,0 @@ -Fix build with emacs-24.4. - -http://debbugs.gnu.org/cgi/bugreport.cgi?bug=18845 - ---- protobuf-2.5.0/editors/protobuf-mode.el -+++ protobuf-2.5.0/editors/protobuf-mode.el -@@ -66,6 +66,7 @@ - (require 'cc-mode) - - (eval-when-compile -+ (require 'cl) - (require 'cc-langs) - (require 'cc-fonts)) - (DIR) diff --git a/dev-libs/protobuf/files/protobuf-2.5.0-x32.patch b/dev-libs/protobuf/files/protobuf-2.5.0-x32.patch t@@ -1,15 +0,0 @@ -fix from upstream for building w/x32 - -https://code.google.com/p/protobuf/issues/detail?id=474 - ---- src/google/protobuf/stubs/atomicops.h (revision 491) -+++ src/google/protobuf/stubs/atomicops.h (revision 492) -@@ -66,7 +66,7 @@ typedef int32 Atomic32; - #ifdef GOOGLE_PROTOBUF_ARCH_64_BIT - // We need to be able to go between Atomic64 and AtomicWord implicitly. This - // means Atomic64 and AtomicWord should be the same type on 64-bit. --#if defined(GOOGLE_PROTOBUF_OS_NACL) -+#if defined(__ILP32__) || defined(GOOGLE_PROTOBUF_OS_NACL) - // NaCl's intptr_t is not actually 64-bits on 64-bit! - // http://code.google.com/p/nativeclient/issues/detail?id=1162 - typedef int64 Atomic64; (DIR) diff --git a/dev-libs/protobuf/files/protobuf-2.6.1-protoc-cmdline.patch b/dev-libs/protobuf/files/protobuf-2.6.1-protoc-cmdline.patch t@@ -1,256 +0,0 @@ -https://github.com/google/protobuf/pull/235 - -From 18f71a50a9000e7558ae48a971fa301d76220ff0 Mon Sep 17 00:00:00 2001 -From: Prathmesh Prabhu <pprabhu@chromium.org> -Date: Tue, 10 Mar 2015 17:04:40 -0400 -Subject: [PATCH] protoc: Add options to redirect input/output to files. - -When using protoc to encode/decode protobufs, the input/output was from -stdin/stdout only. This patch adds command line flags to specify files to read -the protobuf from and and write the encoded/decoded protobuf to. ---- - .../protobuf/compiler/command_line_interface.cc | 99 +++++++++++++++++----- - .../protobuf/compiler/command_line_interface.h | 11 ++- - .../compiler/command_line_interface_unittest.cc | 25 +++++- - 3 files changed, 110 insertions(+), 25 deletions(-) - -diff --git a/src/google/protobuf/compiler/command_line_interface.cc b/src/google/protobuf/compiler/command_line_interface.cc -index 567238a..1db85c9 100644 ---- a/src/google/protobuf/compiler/command_line_interface.cc -+++ b/src/google/protobuf/compiler/command_line_interface.cc -@@ -745,6 +745,28 @@ int CommandLineInterface::Run(int argc, const char* const argv[]) { - } - - if (mode_ == MODE_ENCODE || mode_ == MODE_DECODE) { -+ bool success = false; -+ int in_fd = STDIN_FILENO; -+ int out_fd = STDOUT_FILENO; -+ -+ if (!protobuf_in_path_.empty()) { -+ in_fd = open(protobuf_in_path_.c_str(), O_RDONLY); -+ if (in_fd == -1) { -+ cerr << protobuf_in_path_ << ": error: failed to open file." << endl; -+ return 1; -+ } -+ } -+ if (!protobuf_out_path_.empty()) { -+ out_fd = open(protobuf_out_path_.c_str(), -+ O_WRONLY | O_CREAT | O_TRUNC, -+ 0644); -+ if (out_fd == -1) { -+ cerr << protobuf_out_path_ << ": error: failed to open file." << endl; -+ close(in_fd); -+ return 1; -+ } -+ } -+ - if (codec_type_.empty()) { - // HACK: Define an EmptyMessage type to use for decoding. - DescriptorPool pool; -@@ -753,13 +775,20 @@ int CommandLineInterface::Run(int argc, const char* const argv[]) { - file.add_message_type()->set_name("EmptyMessage"); - GOOGLE_CHECK(pool.BuildFile(file) != NULL); - codec_type_ = "EmptyMessage"; -- if (!EncodeOrDecode(&pool)) { -- return 1; -- } -+ success = EncodeOrDecode(&pool, in_fd, out_fd); - } else { -- if (!EncodeOrDecode(importer.pool())) { -- return 1; -- } -+ success = EncodeOrDecode(importer.pool(), in_fd, out_fd); -+ } -+ -+ if (in_fd != STDIN_FILENO) { -+ close(in_fd); -+ } -+ if (out_fd != STDOUT_FILENO) { -+ close(out_fd); -+ } -+ -+ if (!success) { -+ return 1; - } - } - -@@ -873,6 +902,11 @@ CommandLineInterface::ParseArguments(int argc, const char* const argv[]) { - if (status != PARSE_ARGUMENT_DONE_AND_CONTINUE) - return status; - } -+ if (mode_ == MODE_COMPILE && -+ (!protobuf_in_path_.empty() || !protobuf_out_path_.empty())) { -+ cerr << "--protobuf_in and --protobuf_out are only valid with " -+ << "decode operations. Ignoring."; -+ } - - // If no --proto_path was given, use the current working directory. - if (proto_path_.empty()) { -@@ -1123,6 +1157,12 @@ CommandLineInterface::InterpretArgument(const string& name, - - codec_type_ = value; - -+ } else if (name == "--protobuf_in") { -+ protobuf_in_path_ = value; -+ -+ } else if (name == "--protobuf_out") { -+ protobuf_out_path_ = value; -+ - } else if (name == "--error_format") { - if (value == "gcc") { - error_format_ = ERROR_FORMAT_GCC; -@@ -1238,18 +1278,29 @@ void CommandLineInterface::PrintHelpText() { - " --version Show version info and exit.\n" - " -h, --help Show this text and exit.\n" - " --encode=MESSAGE_TYPE Read a text-format message of the given type\n" --" from standard input and write it in binary\n" --" to standard output. The message type must\n" --" be defined in PROTO_FILES or their imports.\n" --" --decode=MESSAGE_TYPE Read a binary message of the given type from\n" --" standard input and write it in text format\n" --" to standard output. The message type must\n" -+" an write it in binary. The message type must\n" - " be defined in PROTO_FILES or their imports.\n" --" --decode_raw Read an arbitrary protocol message from\n" --" standard input and write the raw tag/value\n" --" pairs in text format to standard output. No\n" -+" The input/output protobuf files are specified\n" -+" using the --protobuf_in and --protobuf_out\n" -+" command line flags.\n" -+" --decode=MESSAGE_TYPE Read a binary message of the given type and\n" -+" write it in text format. The message type\n" -+" must be defined in PROTO_FILES or their\n" -+" imports. The input/output protobuf files are\n" -+" specified using the --protobuf_in and \n" -+" --protobuf_out command line flags.\n" -+" --decode_raw Read an arbitrary protocol message and write\n" -+" the raw tag/value pairs in text format. No\n" - " PROTO_FILES should be given when using this\n" --" flag.\n" -+" flag. The input/output protobuf files are\n" -+" specified using the --protobuf_in and \n" -+" --protobuf_out command line flags.\n" -+" --protobuf_in Absolute path to the protobuf file to read to\n" -+" encode/decode. If omitted, file will be read\n" -+" from STDIN.\n" -+" --protobuf_out Absolute path to the protobuf file to write to\n" -+" after encode/decode operation. If omitted,\n" -+" output is written to STDOUT.\n" - " -oFILE, Writes a FileDescriptorSet (a protocol buffer,\n" - " --descriptor_set_out=FILE defined in descriptor.proto) containing all of\n" - " the input files to FILE.\n" -@@ -1490,7 +1541,9 @@ bool CommandLineInterface::GeneratePluginOutput( - return true; - } - --bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool) { -+bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool, -+ int in_fd, -+ int out_fd) { - // Look up the type. - const Descriptor* type = pool->FindMessageTypeByName(codec_type_); - if (type == NULL) { -@@ -1502,15 +1555,15 @@ bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool) { - google::protobuf::scoped_ptr<Message> message(dynamic_factory.GetPrototype(type)->New()); - - if (mode_ == MODE_ENCODE) { -- SetFdToTextMode(STDIN_FILENO); -- SetFdToBinaryMode(STDOUT_FILENO); -+ SetFdToTextMode(in_fd); -+ SetFdToBinaryMode(out_fd); - } else { -- SetFdToBinaryMode(STDIN_FILENO); -- SetFdToTextMode(STDOUT_FILENO); -+ SetFdToBinaryMode(in_fd); -+ SetFdToTextMode(out_fd); - } - -- io::FileInputStream in(STDIN_FILENO); -- io::FileOutputStream out(STDOUT_FILENO); -+ io::FileInputStream in(in_fd); -+ io::FileOutputStream out(out_fd); - - if (mode_ == MODE_ENCODE) { - // Input is text. -diff --git a/src/google/protobuf/compiler/command_line_interface.h b/src/google/protobuf/compiler/command_line_interface.h -index 7e611c4..b6fc38a 100644 ---- a/src/google/protobuf/compiler/command_line_interface.h -+++ b/src/google/protobuf/compiler/command_line_interface.h -@@ -244,7 +244,9 @@ class LIBPROTOC_EXPORT CommandLineInterface { - string* error); - - // Implements --encode and --decode. -- bool EncodeOrDecode(const DescriptorPool* pool); -+ bool EncodeOrDecode(const DescriptorPool* pool, -+ int in_fd, -+ int out_fd); - - // Implements the --descriptor_set_out option. - bool WriteDescriptorSet(const vector<const FileDescriptor*> parsed_files); -@@ -357,6 +359,13 @@ class LIBPROTOC_EXPORT CommandLineInterface { - // decoding. (Empty string indicates --decode_raw.) - string codec_type_; - -+ // When using --encode / --decode / --decode_raw absolute path to the output -+ // file. (Empty string indicates write to STDOUT). -+ string protobuf_out_path_; -+ // When using --encode / --decode / --decode_raw, absolute path to the input -+ // file. (Empty string indicates read from STDIN). -+ string protobuf_in_path_; -+ - // If --descriptor_set_out was given, this is the filename to which the - // FileDescriptorSet should be written. Otherwise, empty. - string descriptor_set_name_; -diff --git a/src/google/protobuf/compiler/command_line_interface_unittest.cc b/src/google/protobuf/compiler/command_line_interface_unittest.cc -index 2b26f3b..78ff2cf 100644 ---- a/src/google/protobuf/compiler/command_line_interface_unittest.cc -+++ b/src/google/protobuf/compiler/command_line_interface_unittest.cc -@@ -94,7 +94,7 @@ class CommandLineInterfaceTest : public testing::Test { - virtual void SetUp(); - virtual void TearDown(); - -- // Runs the CommandLineInterface with the given command line. The -+ // Run the CommandLineInterface with the given command line. The - // command is automatically split on spaces, and the string "$tmpdir" - // is replaced with TestTempDir(). - void Run(const string& command); -@@ -1680,6 +1680,17 @@ class EncodeDecodeTest : public testing::Test { - EXPECT_EQ(StripCR(expected_text), StripCR(captured_stderr_)); - } - -+ void ExpectBinaryFilesMatch(const string &expected_file, -+ const string &actual_file) { -+ string expected_output, actual_output; -+ ASSERT_TRUE(File::ReadFileToString(expected_file, &expected_output)); -+ ASSERT_TRUE(File::ReadFileToString(actual_file, &actual_output)); -+ -+ // Don't use EXPECT_EQ because we don't want to print raw binary data to -+ // stdout on failure. -+ EXPECT_TRUE(expected_output == actual_output); -+ } -+ - private: - int duped_stdin_; - string captured_stdout_; -@@ -1745,6 +1756,18 @@ TEST_F(EncodeDecodeTest, ProtoParseError) { - "google/protobuf/no_such_file.proto: File not found.\n"); - } - -+TEST_F(EncodeDecodeTest, RedirectInputOutput) { -+ string out_file = TestTempDir() + "/golden_message_out.pbf"; -+ string cmd = ""; -+ cmd += "google/protobuf/unittest.proto "; -+ cmd += "--encode=protobuf_unittest.TestAllTypes "; -+ cmd += "--protobuf_in=" + TestSourceDir() + -+ "/google/protobuf/testdata/text_format_unittest_data.txt "; -+ cmd += "--protobuf_out=" + out_file; -+ EXPECT_TRUE(Run(cmd)); -+ ExpectBinaryFilesMatch(out_file, "google/protobuf/testdata/golden_message"); -+} -+ - } // anonymous namespace - - } // namespace compiler --- -2.3.1 - (DIR) diff --git a/dev-libs/protobuf/files/protobuf-3.0.0_beta2-disable-local-gmock.patch b/dev-libs/protobuf/files/protobuf-3.0.0_beta2-disable-local-gmock.patch t@@ -1,89 +0,0 @@ -diff -Naur a/configure.ac b/configure.ac ---- a/configure.ac 2015-12-30 22:21:46.000000000 +0100 -+++ b/configure.ac 2016-04-16 17:46:54.858904639 +0200 -@@ -176,9 +176,9 @@ - # HACK: Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS, - # since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock - # too. --export CFLAGS --export CXXFLAGS --AC_CONFIG_SUBDIRS([gmock]) -+#export CFLAGS -+#export CXXFLAGS -+#AC_CONFIG_SUBDIRS([gmock]) - - AC_CONFIG_FILES([Makefile src/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc]) - AC_OUTPUT -diff -Naur a/Makefile.am b/Makefile.am ---- a/Makefile.am 2015-12-30 22:21:46.000000000 +0100 -+++ b/Makefile.am 2016-04-16 17:46:25.355751203 +0200 -@@ -17,9 +17,10 @@ - # want "make install" to recurse into gmock since we don't want to overwrite - # the installed version of gmock if there is one. - check-local: -- @echo "Making lib/libgmock.a lib/libgmock_main.a in gmock" -- @cd gmock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la -- @cd gmock/gtest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la -+ @echo "Making of gmock disabled" -+# @echo "Making lib/libgmock.a lib/libgmock_main.a in gmock" -+# @cd gmock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la -+# @cd gmock/gtest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la - - # We would like to clean gmock when "make clean" is invoked. But we have to - # be careful because clean-local is also invoked during "make distclean", but -diff -Naur a/src/Makefile.am b/src/Makefile.am ---- a/src/Makefile.am 2015-12-30 22:21:46.000000000 +0100 -+++ b/src/Makefile.am 2016-04-16 17:47:07.026967535 +0200 -@@ -669,11 +669,8 @@ - protobuf-lite-test test_plugin protobuf-lite-arena-test \ - $(GZCHECKPROGRAMS) - protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ -- ../gmock/gtest/lib/libgtest.la \ -- ../gmock/lib/libgmock.la \ -- ../gmock/lib/libgmock_main.la --protobuf_test_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include \ -- -I$(srcdir)/../gmock/include -+ -L/usr/lib -lgmock -lgmock_main -lgtest -+protobuf_test_CPPFLAGS = -I/usr/include - # Disable optimization for tests unless the user explicitly asked for it, - # since test_util.cc takes forever to compile with optimization (with GCC). - # See configure.ac for more info. -@@ -753,11 +750,8 @@ - # Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined. - protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \ - libprotoc.la \ -- ../gmock/gtest/lib/libgtest.la \ -- ../gmock/lib/libgmock.la \ -- ../gmock/lib/libgmock_main.la --protobuf_lazy_descriptor_test_CPPFLAGS = -I$(srcdir)/../gmock/include \ -- -I$(srcdir)/../gmock/gtest/include \ -+ -L/usr/lib -lgmock -lgmock_main -lgtest -+protobuf_lazy_descriptor_test_CPPFLAGS = -I/usr/include \ - -DPROTOBUF_TEST_NO_DESCRIPTORS - protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) - protobuf_lazy_descriptor_test_SOURCES = \ -@@ -788,11 +782,8 @@ - # gtest when building the test internally our memory sanitizer doesn't detect - # memory leaks (don't know why). - protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \ -- ../gmock/gtest/lib/libgtest.la \ -- ../gmock/lib/libgmock.la \ -- ../gmock/lib/libgmock_main.la --protobuf_lite_arena_test_CPPFLAGS = -I$(srcdir)/../gmock/include \ -- -I$(srcdir)/../gmock/gtest/include -+ -L/usr/lib -lgmock -lgmock_main -lgtest -+protobuf_lite_arena_test_CPPFLAGS = -I/usr/include - protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS) - protobuf_lite_arena_test_SOURCES = \ - google/protobuf/lite_arena_unittest.cc \ -@@ -801,8 +792,8 @@ - - # Test plugin binary. - test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \ -- ../gmock/gtest/lib/libgtest.la --test_plugin_CPPFLAGS = -I$(srcdir)/../gmock/gtest/include -+ -L/usr/lib -lgtest -+test_plugin_CPPFLAGS = -I/usr/include - test_plugin_SOURCES = \ - google/protobuf/compiler/mock_code_generator.cc \ - google/protobuf/testing/file.cc \ (DIR) diff --git a/dev-libs/protobuf/files/protobuf-3.0.0_musl-fix.patch b/dev-libs/protobuf/files/protobuf-3.0.0_musl-fix.patch t@@ -1,24 +0,0 @@ -seems like both musl libc and android has byteswap.h - -diff --git a/src/google/protobuf/stubs/port.h b/src/google/protobuf/stubs/port.h -index 376be5f..21223f4 100644 ---- a/src/google/protobuf/stubs/port.h -+++ b/src/google/protobuf/stubs/port.h -@@ -87,7 +87,7 @@ - #include <stdlib.h> // NOLINT(build/include) - #elif defined(__APPLE__) - #include <libkern/OSByteOrder.h> --#elif defined(__GLIBC__) || defined(__CYGWIN__) -+#elif defined(__linux__) || defined(__CYGWIN__) - #include <byteswap.h> // IWYU pragma: export - #endif - -@@ -299,7 +299,7 @@ inline void GOOGLE_UNALIGNED_STORE64(void *p, uint64 v) { - #define bswap_32(x) OSSwapInt32(x) - #define bswap_64(x) OSSwapInt64(x) - --#elif !defined(__GLIBC__) && !defined(__CYGWIN__) -+#elif !defined(__linux__) && !defined(__CYGWIN__) - - static inline uint16 bswap_16(uint16 x) { - return static_cast<uint16>(((x & 0xFF) << 8) | ((x & 0xFF00) >> 8)); (DIR) diff --git a/dev-libs/protobuf/protobuf-3.0.0_beta3_p1-r99.ebuild b/dev-libs/protobuf/protobuf-3.0.0_beta3_p1-r99.ebuild t@@ -1,102 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_4 python3_5 ) -inherit python-r1 autotools flag-o-matic toolchain-funcs elisp-common multilib-minimal - -# If you bump this package, also consider bumping the official language bindings! -# At the current time these are java and python. -MY_PV=${PV/_beta/-beta-} -MY_PV=${MY_PV/_p/.} - -DESCRIPTION="Google's Protocol Buffers -- an efficient method of encoding structured data" -HOMEPAGE="https://github.com/google/protobuf/ https://developers.google.com/protocol-buffers/" -SRC_URI="https://github.com/google/protobuf/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/10b3" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos" -IUSE="emacs examples java python static-libs test vim-syntax zlib" - -DEPEND="emacs? ( virtual/emacs ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) - test? ( dev-cpp/gmock[${MULTILIB_USEDEP}] )" -# This is provided for backwards compatibility due to (likely incorrect) use in consumers. -PDEPEND="java? ( dev-java/protobuf-java ) - python? ( dev-python/protobuf-python[${PYTHON_USEDEP}] )" -S="${WORKDIR}/${PN}-${MY_PV}" -PATCHES=( "${FILESDIR}/${PN}-2.5.0-emacs-24.4.patch" - "${FILESDIR}/${PN}-2.6.1-protoc-cmdline.patch" - "${FILESDIR}/${PN}-3.0.0_beta2-disable-local-gmock.patch" - "${FILESDIR}/${PN}-3.0.0_musl-fix.patch" ) - -src_prepare() { - append-cppflags -DGOOGLE_PROTOBUF_NO_RTTI - default - eautoreconf -} - -multilib_src_configure() { - local myeconfargs=( - $(use_enable static-libs static) - $(use_with zlib) - ) - if tc-is-cross-compiler; then - # The build system wants `protoc` when building, so we need a copy that - # runs on the host. This is more hermetic than relying on the version - # installed in the host being the exact same version. - mkdir -p "${WORKDIR}"/build || die - pushd "${WORKDIR}"/build >/dev/null || die - ECONF_SOURCE=${S} econf_build "${myeconfargs[@]}" - myeconfargs+=( --with-protoc="${PWD}"/src/protoc ) - popd >/dev/null || die - fi - ECONF_SOURCE=${S} econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - if tc-is-cross-compiler; then - emake -C "${WORKDIR}"/build/src protoc - fi - - default - - if use emacs; then - elisp-compile "${S}"/editors/protobuf-mode.el - fi -} - -multilib_src_test() { - emake check -} - -src_install() { - multilib-minimal_src_install - - if use vim-syntax; then - insinto /usr/share/vim/vimfiles/syntax - doins editors/proto.vim - insinto /usr/share/vim/vimfiles/ftdetect/ - doins "${FILESDIR}/proto.vim" - fi - - if use emacs; then - elisp-install "${PN}" editors/protobuf-mode.el* - elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el" - fi - - if use examples; then - DOCS+=( examples ) - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -}