diff options
Diffstat (limited to 'net-libs')
-rw-r--r-- | net-libs/libsoup-gnome/Manifest | 2 | ||||
-rw-r--r-- | net-libs/libsoup-gnome/files/libsoup-gnome-9999-system-lib.patch | 240 | ||||
-rw-r--r-- | net-libs/libsoup-gnome/libsoup-gnome-9999-r1.ebuild | 58 | ||||
-rw-r--r-- | net-libs/telepathy-glib/Manifest | 1 | ||||
-rw-r--r-- | net-libs/telepathy-glib/telepathy-glib-9999.ebuild | 69 |
5 files changed, 0 insertions, 370 deletions
diff --git a/net-libs/libsoup-gnome/Manifest b/net-libs/libsoup-gnome/Manifest deleted file mode 100644 index a8f622dd..00000000 --- a/net-libs/libsoup-gnome/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -AUX libsoup-gnome-9999-system-lib.patch 6601 RMD160 5d99f85c066bf6b6c7bfa4fef7efc557d7cf9d75 SHA1 89e4ba001ab0053eb34070701128d023ab475bb3 SHA256 cb59e871a63a04cde58e138d06b2ba402508a36b8f641d9a08bf1b1f220952ee -EBUILD libsoup-gnome-9999-r1.ebuild 1260 RMD160 b3992fd34fb1afebbda70d53de3ad014218ee821 SHA1 cd637dd029b5c538049708b1fdde381d1e5f8fe1 SHA256 7c174c9a6fdf1326464f7c6c1a277b298a240e7dec8e9ba4b2e3a7d0dab0f155 diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-9999-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-9999-system-lib.patch deleted file mode 100644 index 5f0e13ea..00000000 --- a/net-libs/libsoup-gnome/files/libsoup-gnome-9999-system-lib.patch +++ /dev/null @@ -1,240 +0,0 @@ -From 7065d221ea10ba6b98768236f8d077c79515cc09 Mon Sep 17 00:00:00 2001 -From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com> -Date: Thu, 13 Oct 2011 12:03:04 +0200 -Subject: [PATCH] gentoo shit - -Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com> ---- - Makefile.am | 12 ++++++++++-- - configure.ac | 45 +++++++++++++++++++++++++++------------------ - libsoup/Makefile.am | 48 ++++++++++++++++++++++++++++++++++++++---------- - 3 files changed, 75 insertions(+), 30 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 8b86fb7..7f628f4 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,7 +1,11 @@ - ## Process this file with automake to produce Makefile.in - ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - --SUBDIRS = libsoup tests docs -+SUBDIRS = libsoup -+ -+if BUILD_LIBSOUP -+SUBDIRS += tests docs -+endif - - EXTRA_DIST = \ - libsoup-2.4.pc.in \ -@@ -15,7 +19,11 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection - - pkgconfigdir = $(libdir)/pkgconfig - --pkgconfig_DATA = libsoup-2.4.pc -+pkgconfig_DATA = -+ -+if BUILD_LIBSOUP -+pkgconfig_DATA += libsoup-2.4.pc -+endif - - if BUILD_LIBSOUP_GNOME - pkgconfig_DATA += libsoup-gnome-2.4.pc -diff --git a/configure.ac b/configure.ac -index d2132c9..58c1dae 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -72,19 +72,31 @@ dnl *********************** - dnl *** Checks for glib *** - dnl *********************** - -+PKG_PROG_PKG_CONFIG - GLIB_REQUIRED=2.31.7 --AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio) --if test "$GLIB_LIBS" = ""; then -- AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup) -+enable_ssl=no -+AC_ARG_WITH(libsoup-system, -+ AS_HELP_STRING([--with-libsoup-system], [Use libsoup system library to build(default=no)]), -+ [with_libsoup_system=$withval], [with_libsoup_system=no]) -+if test "$with_libsoup_system" = "no"; then -+ AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio) -+ if test "$GLIB_LIBS" = ""; then -+ AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup) -+ fi -+ GLIB_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES" -+ -+ PKG_CHECK_MODULES(XML, libxml-2.0) -+ AC_SUBST(XML_CFLAGS) -+ AC_SUBST(XML_LIBS) -+ -+ dnl ******************* -+ dnl *** Misc checks *** -+ dnl ******************* -+ AC_CHECK_FUNCS(gmtime_r) -+ AC_CHECK_FUNCS(mmap) -+ AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket)) - fi --GLIB_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES" -- --GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib' --AC_SUBST(GLIB_MAKEFILE) -- --PKG_CHECK_MODULES(XML, libxml-2.0) --AC_SUBST(XML_CFLAGS) --AC_SUBST(XML_LIBS) -+AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no) - - dnl *********************** - dnl *** Check for Win32 *** -@@ -103,13 +115,6 @@ esac - AC_MSG_RESULT([$os_win32]) - AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes]) - --dnl ******************* --dnl *** Misc checks *** --dnl ******************* --AC_CHECK_FUNCS(gmtime_r) --AC_CHECK_FUNCS(mmap) --AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket)) -- - dnl ********************* - dnl *** GNOME support *** - dnl ********************* -@@ -134,6 +139,10 @@ AM_CONDITIONAL(BUILD_LIBSOUP_GNOME, test $with_gnome != no) - if test $with_gnome != no; then - AC_DEFINE(HAVE_GNOME, 1, [Defined if GNOME support is enabled]) - -+ if test $with_libsoup_system != no; then -+ PKG_CHECK_MODULES(LIBSOUP, libsoup-$SOUP_API_VERSION = $VERSION) -+ fi -+ - PKG_CHECK_MODULES(SQLITE, sqlite3, :, [AC_MSG_ERROR(dnl - [Could not find sqlite3 devel files: - -diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am -index aa13eec..ef0c870 100644 ---- a/libsoup/Makefile.am -+++ b/libsoup/Makefile.am -@@ -6,15 +6,18 @@ if OS_WIN32 - LIBWS2_32 = -lws2_32 - endif - --INCLUDES = \ -+INCLUDES = -+lib_LTLIBRARIES = -+CLEANFILES = -+ -+if BUILD_LIBSOUP -+INCLUDES += \ - -DG_LOG_DOMAIN=\"libsoup\" \ - -I$(top_srcdir) \ - $(SOUP_DEBUG_FLAGS) \ - $(SOUP_MAINTAINER_FLAGS) \ - $(GLIB_CFLAGS) \ -- $(XML_CFLAGS) \ -- $(SQLITE_CFLAGS) \ -- $(GNOME_KEYRING_CFLAGS) -+ $(XML_CFLAGS) - - libsoupincludedir = $(includedir)/libsoup-2.4/libsoup - -@@ -67,7 +70,7 @@ libsoupinclude_HEADERS = \ - $(soup_headers) \ - soup-enum-types.h - --lib_LTLIBRARIES = libsoup-2.4.la -+lib_LTLIBRARIES += libsoup-2.4.la - - libsoup_2_4_la_LDFLAGS = \ - -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined -@@ -152,6 +155,7 @@ libsoup_2_4_la_SOURCES = \ - soup-uri.c \ - soup-value-utils.c \ - soup-xmlrpc.c -+endif - - if BUILD_LIBSOUP_GNOME - -@@ -165,6 +169,10 @@ endif - - libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup - -+INCLUDES += $(LIBSOUP_CFLAGS) \ -+ $(SQLITE_CFLAGS) \ -+ $(GNOME_KEYRING_CFLAGS) -+ - libsoupgnomeinclude_HEADERS = \ - soup-cookie-jar-sqlite.h\ - soup-gnome.h \ -@@ -172,14 +180,24 @@ libsoupgnomeinclude_HEADERS = \ - - lib_LTLIBRARIES += libsoup-gnome-2.4.la - -+if BUILD_LIBSOUP - libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS) -+else -+libsoup_gnome_2_4_la_LDFLAGS = \ -+ -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) -no-undefined -+endif - - libsoup_gnome_2_4_la_LIBADD = \ -- libsoup-2.4.la \ - $(GLIB_LIBS) \ - $(SQLITE_LIBS) \ - $(GNOME_KEYRING_LIBS) - -+if BUILD_LIBSOUP -+libsoup_gnome_2_4_la_LIBADD += libsoup-2.4.la -+else -+libsoup_gnome_2_4_la_LIBADD += $(LIBSOUP_LIBS) -+endif -+ - libsoup_gnome_2_4_la_SOURCES = \ - soup-cookie-jar-sqlite.c \ - soup-gnome-features.c \ -@@ -207,6 +225,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=. - - if HAVE_INTROSPECTION - -+if BUILD_LIBSOUP -+ - # Core library - gi_soup_files = \ - $(filter-out soup.h soup-enum-types.% soup-marshal.% soup-proxy-resolver.h,\ -@@ -228,20 +248,28 @@ Soup_2_4_gir_FILES = \ - - INTROSPECTION_GIRS += Soup-2.4.gir - -+endif -+ - if BUILD_LIBSOUP_GNOME - -+if BUILD_LIBSOUP -+SOUP_GIR = Soup-2.4.gir -+else -+SOUP_GIR = -+endif -+ - # GNOME extensions - gi_soup_gnome_files = $(filter-out soup-gnome.h,\ - $(libsoupgnomeinclude_HEADERS) \ - $(filter-out %.h, $(libsoup_gnome_2_4_la_SOURCES))) --SoupGNOME-2.4.gir: libsoup-gnome-2.4.la Soup-2.4.gir -+SoupGNOME-2.4.gir: libsoup-gnome-2.4.la $(SOUP_GIR) -+SoupGNOME_2_4_gir_INCLUDES = Soup-2.4 - SoupGNOME_2_4_gir_SCANNERFLAGS = \ - --identifier-prefix=Soup \ - --symbol-prefix=soup \ -- --c-include "libsoup/soup-gnome.h" \ -- --include-uninstalled=$(builddir)/Soup-2.4.gir -+ --c-include "libsoup/soup-gnome.h" - SoupGNOME_2_4_gir_CFLAGS = $(INCLUDES) --SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la libsoup-2.4.la -+SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la - SoupGNOME_2_4_gir_FILES = $(addprefix $(srcdir)/,$(gi_soup_gnome_files)) - SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4 - --- -1.7.9.1.244.gb0d66b.dirty - diff --git a/net-libs/libsoup-gnome/libsoup-gnome-9999-r1.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-9999-r1.ebuild deleted file mode 100644 index 01904f0a..00000000 --- a/net-libs/libsoup-gnome/libsoup-gnome-9999-r1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" -GCONF_DEBUG="yes" -GNOME2_LA_PUNT="yes" - -MY_PN=${PN/-gnome} -MY_P=${MY_PN}-${PV} - -GNOME_LIVE_MODULE=${MY_PN} -inherit autotools eutils gnome2-live - -DESCRIPTION="GNOME plugin for libsoup" -HOMEPAGE="http://live.gnome.org/LibSoup" -SRC_URI="${SRC_URI//-gnome}" - -LICENSE="LGPL-2" -SLOT="2.4" -KEYWORDS="" -IUSE="debug doc +introspection" - -RDEPEND="~net-libs/libsoup-${PV} - || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) - dev-db/sqlite:3 - introspection? ( >=dev-libs/gobject-introspection-0.9.5 )" -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.9 - >=dev-util/gtk-doc-am-1.10 - doc? ( >=dev-util/gtk-doc-1.10 )" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - G2CONF="${G2CONF} - --disable-static - --disable-tls-check - $(use_enable introspection) - --with-libsoup-system - --with-gnome" - DOCS="AUTHORS NEWS README" -} - -src_configure() { - # FIXME: we need addpredict to workaround bug #324779 until - # root cause (bug #249496) is solved - addpredict /usr/share/snmp/mibs/.index - gnome2_src_configure -} - -src_prepare() { - gnome2_src_prepare - - # Use lib present on the system - epatch "${FILESDIR}"/${PN}-9999-system-lib.patch - eautoreconf -} diff --git a/net-libs/telepathy-glib/Manifest b/net-libs/telepathy-glib/Manifest deleted file mode 100644 index e86c337a..00000000 --- a/net-libs/telepathy-glib/Manifest +++ /dev/null @@ -1 +0,0 @@ -EBUILD telepathy-glib-9999.ebuild 1535 RMD160 ebab7ba29d2ea69e266fa601739d711e096e454f SHA1 1d1d7ec32b7e162f7d110a2c59d7a7ed63a37376 SHA256 8b6ed595a8171502068e19e2c2a7776310fab0c4a5cf62d7a8442bbfd2c54830 diff --git a/net-libs/telepathy-glib/telepathy-glib-9999.ebuild b/net-libs/telepathy-glib/telepathy-glib-9999.ebuild deleted file mode 100644 index ad46e349..00000000 --- a/net-libs/telepathy-glib/telepathy-glib-9999.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" -PYTHON_DEPEND="2:2.5" - -inherit git-2 autotools python virtualx - -DESCRIPTION="GLib bindings for the Telepathy D-Bus protocol." -HOMEPAGE="http://telepathy.freedesktop.org" -SRC_URI="" -EGIT_REPO_URI="git://anongit.freedesktop.org/telepathy/telepathy-glib" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="" -IUSE="debug +introspection +vala" - -RDEPEND=">=dev-libs/glib-2.28.0:2 - >=dev-libs/dbus-glib-0.82 - introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) - vala? ( - dev-lang/vala:0.14[vapigen] - >=dev-libs/gobject-introspection-0.9.6 )" -DEPEND="${RDEPEND} - dev-util/gtk-doc - dev-libs/libxslt - >=dev-util/pkgconfig-0.21" - -src_prepare() { - python_convert_shebangs -r 2 examples tests tools - gtkdocize - eautoreconf - MAKEOPTS+=" -j1" - default_src_prepare -} - -src_configure() { - local myconf - - if use vala; then - myconf="--enable-introspection - VALAC=$(type -p valac-0.14) - VAPIGEN=$(type -p vapigen-0.14)" - fi - - econf --disable-static \ - PYTHON=$(PYTHON -2 -a) \ - $(use_enable debug backtrace) \ - $(use_enable debug handle-leak-debug) \ - $(use_enable debug debug-cache) \ - $(use_enable introspection) \ - $(use_enable vala vala-bindings) \ - ${myconf} -} - -src_test() { - unset DBUS_SESSION_BUS_ADDRESS - # Needs dbus for tests (auto-launched) - Xemake -j1 check || die -} - -src_install() { - emake install DESTDIR="${D}" - dodoc AUTHORS ChangeLog NEWS README - - find "${D}" -name '*.la' -exec rm -f '{}' + || die -} |