| 1 |
commit: 55c8f65d0d35ae312492f54989629faf4f2dc00a |
| 2 |
Author: Priit Laes <plaes <AT> plaes <DOT> org> |
| 3 |
AuthorDate: Fri Mar 29 18:07:35 2013 +0000 |
| 4 |
Commit: Priit Laes <plaes <AT> plaes <DOT> org> |
| 5 |
CommitDate: Fri Mar 29 18:07:35 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=55c8f65d |
| 7 |
|
| 8 |
net-libs/libsoup-gnome: Package has been removed (#463702) |
| 9 |
|
| 10 |
--- |
| 11 |
.../files/libsoup-gnome-system-lib.patch | 224 -------------------- |
| 12 |
.../libsoup-gnome/libsoup-gnome-2.41.91.ebuild | 61 ------ |
| 13 |
net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild | 61 ------ |
| 14 |
net-libs/libsoup-gnome/metadata.xml | 5 - |
| 15 |
4 files changed, 0 insertions(+), 351 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-libs/libsoup-gnome/files/libsoup-gnome-system-lib.patch b/net-libs/libsoup-gnome/files/libsoup-gnome-system-lib.patch |
| 18 |
deleted file mode 100644 |
| 19 |
index 5ca3a94..0000000 |
| 20 |
--- a/net-libs/libsoup-gnome/files/libsoup-gnome-system-lib.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,224 +0,0 @@ |
| 23 |
-From 1345959e285c8d2343d87121f5f3a17563f0cc1a Mon Sep 17 00:00:00 2001 |
| 24 |
-From: Priit Laes <plaes@×××××.org> |
| 25 |
-Date: Tue, 20 Dec 2011 15:42:44 +0200 |
| 26 |
-Subject: [PATCH] Split support for libsoup-gnome |
| 27 |
- |
| 28 |
-https://bugzilla.gnome.org/show_bug.cgi?id=595065 |
| 29 |
- |
| 30 |
-Original patch by Romain Perier. |
| 31 |
---- |
| 32 |
- Makefile.am | 12 +++++++++-- |
| 33 |
- configure.ac | 9 ++++++++ |
| 34 |
- libsoup/Makefile.am | 60 +++++++++++++++++++++++++++++++++++++++-------------- |
| 35 |
- 3 files changed, 63 insertions(+), 18 deletions(-) |
| 36 |
- |
| 37 |
-diff --git a/Makefile.am b/Makefile.am |
| 38 |
-index 66992d9..787b3d6 100644 |
| 39 |
---- a/Makefile.am |
| 40 |
-+++ b/Makefile.am |
| 41 |
-@@ -1,7 +1,11 @@ |
| 42 |
- ## Process this file with automake to produce Makefile.in |
| 43 |
- ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} |
| 44 |
- |
| 45 |
--SUBDIRS = libsoup po tests examples docs |
| 46 |
-+SUBDIRS = libsoup |
| 47 |
-+ |
| 48 |
-+if BUILD_LIBSOUP |
| 49 |
-+SUBDIRS += po tests examples docs |
| 50 |
-+endif |
| 51 |
- |
| 52 |
- EXTRA_DIST = \ |
| 53 |
- data/effective_tld_names.dat \ |
| 54 |
-@@ -16,7 +20,11 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection |
| 55 |
- |
| 56 |
- pkgconfigdir = $(libdir)/pkgconfig |
| 57 |
- |
| 58 |
--pkgconfig_DATA = libsoup-2.4.pc |
| 59 |
-+pkgconfig_DATA = |
| 60 |
-+ |
| 61 |
-+if BUILD_LIBSOUP |
| 62 |
-+pkgconfig_DATA += libsoup-2.4.pc |
| 63 |
-+endif |
| 64 |
- |
| 65 |
- if BUILD_LIBSOUP_GNOME |
| 66 |
- pkgconfig_DATA += libsoup-gnome-2.4.pc |
| 67 |
-diff --git a/configure.ac b/configure.ac |
| 68 |
-index 34db367..c5a7075 100644 |
| 69 |
---- a/configure.ac |
| 70 |
-+++ b/configure.ac |
| 71 |
-@@ -76,6 +76,11 @@ LT_INIT([win32-dll]) |
| 72 |
- dnl *********************** |
| 73 |
- dnl *** Checks for glib *** |
| 74 |
- dnl *********************** |
| 75 |
-+PKG_PROG_PKG_CONFIG |
| 76 |
-+AC_ARG_WITH(libsoup-system, |
| 77 |
-+ AS_HELP_STRING([--with-libsoup-system], [Use libsoup system library to build(default=no)]), |
| 78 |
-+ [with_libsoup_system=$withval], [with_libsoup_system=no]) |
| 79 |
-+AM_CONDITIONAL(BUILD_LIBSOUP, test $with_libsoup_system = no) |
| 80 |
- |
| 81 |
- GLIB_REQUIRED=2.35.0 |
| 82 |
- AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio) |
| 83 |
-@@ -138,6 +143,10 @@ AM_CONDITIONAL(BUILD_LIBSOUP_GNOME, test $with_gnome != no) |
| 84 |
- |
| 85 |
- if test $with_gnome != no; then |
| 86 |
- AC_DEFINE(HAVE_GNOME, 1, [Defined if GNOME support is enabled]) |
| 87 |
-+ |
| 88 |
-+ if test $with_libsoup_system != no; then |
| 89 |
-+ PKG_CHECK_MODULES(LIBSOUP, libsoup-$SOUP_API_VERSION = $VERSION) |
| 90 |
-+ fi |
| 91 |
- fi |
| 92 |
- AC_SUBST(HAVE_GNOME) |
| 93 |
- |
| 94 |
-diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am |
| 95 |
-index e99c8e6..6bebec8 100644 |
| 96 |
---- a/libsoup/Makefile.am |
| 97 |
-+++ b/libsoup/Makefile.am |
| 98 |
-@@ -1,18 +1,22 @@ |
| 99 |
- ## Process this file with automake to produce Makefile.in |
| 100 |
- |
| 101 |
- EXTRA_DIST = |
| 102 |
-- |
| 103 |
-+BUILT_SOURCES = |
| 104 |
- include $(GLIB_MAKEFILE) |
| 105 |
- |
| 106 |
--INCLUDES = \ |
| 107 |
-+INCLUDES = |
| 108 |
-+lib_LTLIBRARIES = |
| 109 |
-+CLEANFILES = |
| 110 |
-+ |
| 111 |
-+if BUILD_LIBSOUP |
| 112 |
-+INCLUDES += \ |
| 113 |
- -DG_LOG_DOMAIN=\"libsoup\" \ |
| 114 |
- -DLOCALEDIR=\"$(localedir)\" \ |
| 115 |
- -I$(top_srcdir) \ |
| 116 |
- -I$(top_builddir) \ |
| 117 |
- $(SOUP_DEBUG_FLAGS) \ |
| 118 |
- $(GLIB_CFLAGS) \ |
| 119 |
-- $(XML_CFLAGS) \ |
| 120 |
-- $(SQLITE_CFLAGS) |
| 121 |
-+ $(XML_CFLAGS) |
| 122 |
- |
| 123 |
- libsoupincludedir = $(includedir)/libsoup-2.4/libsoup |
| 124 |
- |
| 125 |
-@@ -72,7 +76,7 @@ libsoupinclude_HEADERS = \ |
| 126 |
- nodist_libsoupinclude_HEADERS = \ |
| 127 |
- soup-version.h |
| 128 |
- |
| 129 |
--lib_LTLIBRARIES = libsoup-2.4.la |
| 130 |
-+lib_LTLIBRARIES += libsoup-2.4.la |
| 131 |
- |
| 132 |
- libsoup_2_4_la_LDFLAGS = \ |
| 133 |
- -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) \ |
| 134 |
-@@ -181,18 +185,24 @@ libsoup_2_4_la_SOURCES = \ |
| 135 |
- soup-version.c \ |
| 136 |
- soup-xmlrpc.c |
| 137 |
- |
| 138 |
--# TLD rules |
| 139 |
--EXTRA_DIST += tld-parser.py |
| 140 |
-- |
| 141 |
-+BUILT_SOURCES = tld_data.inc |
| 142 |
- TLD_DATA_FILE=$(top_srcdir)/data/effective_tld_names.dat |
| 143 |
- |
| 144 |
- tld_data.inc: tld-parser.py $(TLD_DATA_FILE) |
| 145 |
- $(srcdir)/tld-parser.py $(TLD_DATA_FILE) tld_data.inc |
| 146 |
- |
| 147 |
-+# TLD rules |
| 148 |
-+EXTRA_DIST += tld-parser.py |
| 149 |
-+ |
| 150 |
-+endif |
| 151 |
-+ |
| 152 |
- if BUILD_LIBSOUP_GNOME |
| 153 |
- |
| 154 |
- libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup |
| 155 |
- |
| 156 |
-+INCLUDES += $(LIBSOUP_CFLAGS) \ |
| 157 |
-+ $(SQLITE_CFLAGS) |
| 158 |
-+ |
| 159 |
- libsoupgnomeinclude_HEADERS = \ |
| 160 |
- soup-cookie-jar-sqlite.h\ |
| 161 |
- soup-gnome.h \ |
| 162 |
-@@ -200,17 +210,26 @@ libsoupgnomeinclude_HEADERS = \ |
| 163 |
- |
| 164 |
- lib_LTLIBRARIES += libsoup-gnome-2.4.la |
| 165 |
- |
| 166 |
-+if BUILD_LIBSOUP |
| 167 |
-+libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS) |
| 168 |
-+else |
| 169 |
- libsoup_gnome_2_4_la_LDFLAGS = \ |
| 170 |
- -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) \ |
| 171 |
- -no-undefined \ |
| 172 |
- -export-symbols $(srcdir)/libsoup-gnome-2.4.sym |
| 173 |
- |
| 174 |
- EXTRA_DIST += libsoup-gnome-2.4.sym |
| 175 |
-+endif |
| 176 |
- |
| 177 |
- libsoup_gnome_2_4_la_LIBADD = \ |
| 178 |
-- libsoup-2.4.la \ |
| 179 |
- $(GLIB_LIBS) |
| 180 |
- |
| 181 |
-+if BUILD_LIBSOUP |
| 182 |
-+libsoup_gnome_2_4_la_LIBADD += libsoup-2.4.la |
| 183 |
-+else |
| 184 |
-+libsoup_gnome_2_4_la_LIBADD += $(LIBSOUP_LIBS) |
| 185 |
-+endif |
| 186 |
-+ |
| 187 |
- libsoup_gnome_2_4_la_SOURCES = \ |
| 188 |
- soup-cookie-jar-sqlite.c \ |
| 189 |
- soup-gnome-features.c \ |
| 190 |
-@@ -223,9 +242,8 @@ endif |
| 191 |
- |
| 192 |
- GLIB_GENERATED = soup-marshal.c soup-marshal.h |
| 193 |
- GLIB_GENERATED += soup-enum-types.c soup-enum-types.h |
| 194 |
--BUILT_SOURCES = \ |
| 195 |
-- $(GLIB_GENERATED) \ |
| 196 |
-- tld_data.inc |
| 197 |
-+BUILT_SOURCES += \ |
| 198 |
-+ $(GLIB_GENERATED) |
| 199 |
- |
| 200 |
- soup_marshal_sources = $(libsoup_2_4_la_SOURCES) $(libsoup_gnome_2_4_la_SOURCES) |
| 201 |
- soup_enum_types_sources = $(libsoupinclude_HEADERS) $(libsoupgnomeinclude_HEADERS) |
| 202 |
-@@ -241,6 +259,8 @@ INTROSPECTION_COMPILER_ARGS = --includedir=. |
| 203 |
- |
| 204 |
- if HAVE_INTROSPECTION |
| 205 |
- |
| 206 |
-+if BUILD_LIBSOUP |
| 207 |
-+ |
| 208 |
- # Core library |
| 209 |
- gi_soup_files = \ |
| 210 |
- $(filter-out soup.h soup-enum-types.% soup-marshal.% soup-proxy-resolver.h,\ |
| 211 |
-@@ -262,20 +282,28 @@ Soup_2_4_gir_FILES = \ |
| 212 |
- |
| 213 |
- INTROSPECTION_GIRS += Soup-2.4.gir |
| 214 |
- |
| 215 |
-+endif |
| 216 |
-+ |
| 217 |
- if BUILD_LIBSOUP_GNOME |
| 218 |
- |
| 219 |
-+if BUILD_LIBSOUP |
| 220 |
-+SOUP_GIR = Soup-2.4.gir |
| 221 |
-+else |
| 222 |
-+SOUP_GIR = |
| 223 |
-+endif |
| 224 |
-+ |
| 225 |
- # GNOME extensions |
| 226 |
- gi_soup_gnome_files = $(filter-out soup-gnome.h,\ |
| 227 |
- $(libsoupgnomeinclude_HEADERS) \ |
| 228 |
- $(filter-out %.h, $(libsoup_gnome_2_4_la_SOURCES))) |
| 229 |
--SoupGNOME-2.4.gir: libsoup-gnome-2.4.la Soup-2.4.gir |
| 230 |
-+SoupGNOME-2.4.gir: libsoup-gnome-2.4.la $(SOUP_GIR) |
| 231 |
-+SoupGNOME_2_4_gir_INCLUDES = Soup-2.4 |
| 232 |
- SoupGNOME_2_4_gir_SCANNERFLAGS = \ |
| 233 |
- --identifier-prefix=Soup \ |
| 234 |
- --symbol-prefix=soup \ |
| 235 |
-- --c-include "libsoup/soup-gnome.h" \ |
| 236 |
-- --include-uninstalled=$(builddir)/Soup-2.4.gir |
| 237 |
-+ --c-include "libsoup/soup-gnome.h" |
| 238 |
- SoupGNOME_2_4_gir_CFLAGS = $(INCLUDES) |
| 239 |
--SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la libsoup-2.4.la |
| 240 |
-+SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la |
| 241 |
- SoupGNOME_2_4_gir_FILES = $(addprefix $(srcdir)/,$(gi_soup_gnome_files)) |
| 242 |
- SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4 |
| 243 |
- |
| 244 |
--- |
| 245 |
-1.8.1.5 |
| 246 |
- |
| 247 |
|
| 248 |
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.41.91.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.41.91.ebuild |
| 249 |
deleted file mode 100644 |
| 250 |
index 0f30687..0000000 |
| 251 |
--- a/net-libs/libsoup-gnome/libsoup-gnome-2.41.91.ebuild |
| 252 |
+++ /dev/null |
| 253 |
@@ -1,61 +0,0 @@ |
| 254 |
-# Copyright 1999-2012 Gentoo Foundation |
| 255 |
-# Distributed under the terms of the GNU General Public License v2 |
| 256 |
-# $Header: $ |
| 257 |
- |
| 258 |
-EAPI="5" |
| 259 |
-GCONF_DEBUG="yes" |
| 260 |
-GNOME2_LA_PUNT="yes" |
| 261 |
- |
| 262 |
-MY_PN=${PN/-gnome} |
| 263 |
-MY_P=${MY_PN}-${PV} |
| 264 |
- |
| 265 |
-inherit autotools eutils gnome2 |
| 266 |
-if [[ ${PV} = 9999 ]]; then |
| 267 |
- GNOME_LIVE_MODULE=${MY_PN} |
| 268 |
- inherit gnome2-live |
| 269 |
-fi |
| 270 |
- |
| 271 |
-DESCRIPTION="GNOME plugin for libsoup" |
| 272 |
-HOMEPAGE="http://live.gnome.org/LibSoup" |
| 273 |
-SRC_URI="${SRC_URI//-gnome}" |
| 274 |
- |
| 275 |
-LICENSE="LGPL-2+" |
| 276 |
-SLOT="2.4" |
| 277 |
-IUSE="debug +introspection" |
| 278 |
-if [[ ${PV} = 9999 ]]; then |
| 279 |
- KEYWORDS="" |
| 280 |
-else |
| 281 |
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-solaris" |
| 282 |
-fi |
| 283 |
- |
| 284 |
-RDEPEND="~net-libs/libsoup-${PV}[introspection?] |
| 285 |
- dev-db/sqlite:3= |
| 286 |
- introspection? ( >=dev-libs/gobject-introspection-0.9.5 )" |
| 287 |
-DEPEND="${RDEPEND} |
| 288 |
- >=dev-util/gtk-doc-am-1.10 |
| 289 |
- >=dev-util/intltool-0.35 |
| 290 |
- sys-devel/gettext |
| 291 |
- virtual/pkgconfig" |
| 292 |
- |
| 293 |
-S=${WORKDIR}/${MY_P} |
| 294 |
- |
| 295 |
-src_prepare() { |
| 296 |
- # Use lib present on the system |
| 297 |
- epatch "${FILESDIR}"/${PN}-system-lib.patch |
| 298 |
- [[ ${PV} != 9999 ]] && eautoreconf |
| 299 |
- gnome2_src_prepare |
| 300 |
-} |
| 301 |
- |
| 302 |
-src_configure() { |
| 303 |
- # Disable apache tests until they are usable on Gentoo, bug #326957 |
| 304 |
- # FIXME: we need addpredict to workaround bug #324779 until |
| 305 |
- # root cause (bug #249496) is solved |
| 306 |
- addpredict /usr/share/snmp/mibs/.index |
| 307 |
- gnome2_src_configure \ |
| 308 |
- --disable-static \ |
| 309 |
- --disable-tls-check \ |
| 310 |
- $(use_enable introspection) \ |
| 311 |
- --with-libsoup-system \ |
| 312 |
- --with-gnome \ |
| 313 |
- --without-apache-httpd |
| 314 |
-} |
| 315 |
|
| 316 |
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild |
| 317 |
deleted file mode 100644 |
| 318 |
index 0f30687..0000000 |
| 319 |
--- a/net-libs/libsoup-gnome/libsoup-gnome-9999.ebuild |
| 320 |
+++ /dev/null |
| 321 |
@@ -1,61 +0,0 @@ |
| 322 |
-# Copyright 1999-2012 Gentoo Foundation |
| 323 |
-# Distributed under the terms of the GNU General Public License v2 |
| 324 |
-# $Header: $ |
| 325 |
- |
| 326 |
-EAPI="5" |
| 327 |
-GCONF_DEBUG="yes" |
| 328 |
-GNOME2_LA_PUNT="yes" |
| 329 |
- |
| 330 |
-MY_PN=${PN/-gnome} |
| 331 |
-MY_P=${MY_PN}-${PV} |
| 332 |
- |
| 333 |
-inherit autotools eutils gnome2 |
| 334 |
-if [[ ${PV} = 9999 ]]; then |
| 335 |
- GNOME_LIVE_MODULE=${MY_PN} |
| 336 |
- inherit gnome2-live |
| 337 |
-fi |
| 338 |
- |
| 339 |
-DESCRIPTION="GNOME plugin for libsoup" |
| 340 |
-HOMEPAGE="http://live.gnome.org/LibSoup" |
| 341 |
-SRC_URI="${SRC_URI//-gnome}" |
| 342 |
- |
| 343 |
-LICENSE="LGPL-2+" |
| 344 |
-SLOT="2.4" |
| 345 |
-IUSE="debug +introspection" |
| 346 |
-if [[ ${PV} = 9999 ]]; then |
| 347 |
- KEYWORDS="" |
| 348 |
-else |
| 349 |
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-solaris" |
| 350 |
-fi |
| 351 |
- |
| 352 |
-RDEPEND="~net-libs/libsoup-${PV}[introspection?] |
| 353 |
- dev-db/sqlite:3= |
| 354 |
- introspection? ( >=dev-libs/gobject-introspection-0.9.5 )" |
| 355 |
-DEPEND="${RDEPEND} |
| 356 |
- >=dev-util/gtk-doc-am-1.10 |
| 357 |
- >=dev-util/intltool-0.35 |
| 358 |
- sys-devel/gettext |
| 359 |
- virtual/pkgconfig" |
| 360 |
- |
| 361 |
-S=${WORKDIR}/${MY_P} |
| 362 |
- |
| 363 |
-src_prepare() { |
| 364 |
- # Use lib present on the system |
| 365 |
- epatch "${FILESDIR}"/${PN}-system-lib.patch |
| 366 |
- [[ ${PV} != 9999 ]] && eautoreconf |
| 367 |
- gnome2_src_prepare |
| 368 |
-} |
| 369 |
- |
| 370 |
-src_configure() { |
| 371 |
- # Disable apache tests until they are usable on Gentoo, bug #326957 |
| 372 |
- # FIXME: we need addpredict to workaround bug #324779 until |
| 373 |
- # root cause (bug #249496) is solved |
| 374 |
- addpredict /usr/share/snmp/mibs/.index |
| 375 |
- gnome2_src_configure \ |
| 376 |
- --disable-static \ |
| 377 |
- --disable-tls-check \ |
| 378 |
- $(use_enable introspection) \ |
| 379 |
- --with-libsoup-system \ |
| 380 |
- --with-gnome \ |
| 381 |
- --without-apache-httpd |
| 382 |
-} |
| 383 |
|
| 384 |
diff --git a/net-libs/libsoup-gnome/metadata.xml b/net-libs/libsoup-gnome/metadata.xml |
| 385 |
deleted file mode 100644 |
| 386 |
index 6e0e2ec..0000000 |
| 387 |
--- a/net-libs/libsoup-gnome/metadata.xml |
| 388 |
+++ /dev/null |
| 389 |
@@ -1,5 +0,0 @@ |
| 390 |
-<?xml version="1.0" encoding="UTF-8"?> |
| 391 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 392 |
-<pkgmetadata> |
| 393 |
- <herd>gnome</herd> |
| 394 |
-</pkgmetadata> |
Archives