diff options
author | Nirbheek Chauhan <nirbheek@gentoo.org> | 2011-08-14 15:19:36 +0000 |
---|---|---|
committer | Nirbheek Chauhan <nirbheek@gentoo.org> | 2011-08-14 15:19:36 +0000 |
commit | 07da87598e7f99854348378f0be8914e7288166a (patch) | |
tree | d79f64b08cccc8d339f30bfb7a7e0ab484ed31ec /dev-libs/seed | |
parent | Move from gnome overlay for GNOME 3 (diff) | |
download | historical-07da87598e7f99854348378f0be8914e7288166a.tar.gz historical-07da87598e7f99854348378f0be8914e7288166a.tar.bz2 historical-07da87598e7f99854348378f0be8914e7288166a.zip |
Bump to 3.0.0, from gnome overlay for GNOME 3
Package-Manager: portage-2.2.0_alpha39_p14/cvs/Linux x86_64
Diffstat (limited to 'dev-libs/seed')
-rw-r--r-- | dev-libs/seed/ChangeLog | 8 | ||||
-rw-r--r-- | dev-libs/seed/Manifest | 25 | ||||
-rw-r--r-- | dev-libs/seed/files/seed-2.31.5-cleanup-autotools.patch | 585 | ||||
-rw-r--r-- | dev-libs/seed/seed-3.0.0.ebuild | 82 |
4 files changed, 698 insertions, 2 deletions
diff --git a/dev-libs/seed/ChangeLog b/dev-libs/seed/ChangeLog index 6759ca7276e3..5bdcfcc42242 100644 --- a/dev-libs/seed/ChangeLog +++ b/dev-libs/seed/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/seed # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/seed/ChangeLog,v 1.2 2011/03/21 23:03:02 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/seed/ChangeLog,v 1.3 2011/08/14 15:19:36 nirbheek Exp $ + +*seed-3.0.0 (14 Aug 2011) + + 14 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org> + +files/seed-2.31.5-cleanup-autotools.patch, +seed-3.0.0.ebuild: + Bump to 3.0.0, from gnome overlay for GNOME 3 21 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> seed-2.30.0.ebuild: Fix slot-deps on libs, remove old diff --git a/dev-libs/seed/Manifest b/dev-libs/seed/Manifest index ae898726283e..55b53dcfe168 100644 --- a/dev-libs/seed/Manifest +++ b/dev-libs/seed/Manifest @@ -1,5 +1,28 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX seed-2.31.5-cleanup-autotools.patch 15993 RMD160 e0ff91fd77a81c5fe75468254db3070d32cab4b7 SHA1 be7911e48cf7e8827c98576c87742b6fabdb78ed SHA256 a986cb387379533efa8031c2afc92d051af8b0cf14e1a92a7212a53e1c718b9f AUX seed-fix-gnome-js-common-circular-dep.patch 987 RMD160 e4c3b20548c1d8615b30a8c85723312a43239497 SHA1 6ede54d29570e487c8c8a9ad9dc1ff77548bf44d SHA256 2c0afc96cb483b2628576a7136ab455b6e110873187c348d756fefda8b847bdf DIST seed-2.30.0.tar.bz2 770032 RMD160 b61883b7aaec557cac5efcc7ef9fd7874a9bb607 SHA1 7f3fe1fcea29c43d65c9ab6a90c56ecdcdd807c2 SHA256 3b5e7babd1e14793829c9d521319cbf2af9a66bea604c5dc80a9885558f00361 +DIST seed-3.0.0.tar.bz2 772779 RMD160 ccd621bdcb4f55fadb23e5c13cacc82a58d75878 SHA1 03e77d8f816aafa1aca7c507ec6bea3b89653c08 SHA256 c7ef8e0c7cfe633c6bf9bfc13ab56458f053dfb12b784c75cc50dfa7cf828be6 EBUILD seed-2.30.0.ebuild 2577 RMD160 29ff690972c556003925aaa33cd5bb6387136d62 SHA1 24c10f0ee7463765af5e4cf8f8f7562c5606a979 SHA256 c305d522f4ab3970d2d17bf9bb8876a6c82f04f909d857137ff5483ca8368183 -MISC ChangeLog 611 RMD160 71fac187a9b0b0beeb30b25147c9874bd5c93d23 SHA1 9487b9de95afc710b8c4958d459ee807415f92cd SHA256 9418a02ff9c9f803c6cb4cebcb50b22bf0e6ffc6445e3842c7dfe0ecff6a7c8d +EBUILD seed-3.0.0.ebuild 2039 RMD160 6648eb2439555ac64f226f8110a2d55246efb234 SHA1 ccda9013bfee08a2ab54a7a2a46a7d1a72269eb1 SHA256 815377bc92c53b2850b0bc622a0738ff50994d0eabfa52bc3c47ca09fec31caf +MISC ChangeLog 807 RMD160 39874c021cb1d04fd6967281fa04d44b33ea8b1f SHA1 badf39c2db4df4fb50b94c8d78c51ac56786a636 SHA256 bcc51c59e25c179a1d8ce9633783a3ab22d2d390b12f300da574a07dcebfc462 MISC metadata.xml 540 RMD160 488f7601d2839beb604cc05735d93820736e9b26 SHA1 5588218f835ef863d633226e435e8c24aeeda772 SHA256 689b9c23c6a0cf441c85ded93b52fef9206b2aaa04e1c90f93693f9818f8630e +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iQIcBAEBAgAGBQJOR+eOAAoJEO/kOhxWD91ktvoP/RTTOZ5k+FUX1W466knOpFbD +0QAKPG/C0YP6ZAT+9WXk0ubSvG1bQDAK/H4NpA9bAFE6Tr0Ma4YtzgM1pBVC7/M4 +7i7qNjdT37zEzOI5NtrHcpqcrqkXmiDpRh98V07ebgGx3z/JqCwrC815K1CaZ/T7 +ayAKyc1w/xenZuHxVcAWgJQHrd7iQkORrF9qSWPkKK0tljDeIE6tyxYlIdA6vl6k +hleGsyPxWYIOwNKBYPbBLJORdZwkNp/KS3rBgO2GG/bnmj3QGbdYTt6F14y++AvP +rcSSDW4kXFdJKDq/cqjXRnQUp3d49SDTJ8GTPGTAVb3V8NMOwQL3b4OQFWoefeD9 +pIaxCRuWTkGAtiHuN3rk6YN3egtnTT662Mj2yR1pLJDv41e0FHUq/rNgXaaNMGVA +4qgTS9aiX/TloAgqoTrNgUx98hgqcCKHTUTGVrdx6jfpB2At6i6krmKpceh+GwLn +WmnlCYPxuUhUehJvDjzGeuFDdQiSey9P1z4grZb8AMwkRt5icG0ddpUb+fl6SP7Q +YIUrAdaJPhs8UGGFlU5TIto+QoW8+xFx2q+CR2XPoedypc6wQAQmdhTIjEzeE6I1 +wSwfJYmQVAaQdB/Hi/XIiiCKXRKpdxXkrSifq9Ea0m9/2gh0a+8MRXSfDUAztixX +d3FNTC1+7bpcEmQcvnhf +=bhPK +-----END PGP SIGNATURE----- diff --git a/dev-libs/seed/files/seed-2.31.5-cleanup-autotools.patch b/dev-libs/seed/files/seed-2.31.5-cleanup-autotools.patch new file mode 100644 index 000000000000..41e9d837c79d --- /dev/null +++ b/dev-libs/seed/files/seed-2.31.5-cleanup-autotools.patch @@ -0,0 +1,585 @@ +From 4f52b1ef263df971f677f4ad88f9766c26a15a89 Mon Sep 17 00:00:00 2001 +From: Jonathan Callen <abcd@gentoo.org> +Date: Fri, 16 Jul 2010 04:41:52 -0400 +Subject: [PATCH] Cleanup autotools + +--- + Makefile.am | 2 -- + configure.ac | 30 +++++++++++++++--------------- + extensions/Makefile.am | 7 ++++--- + libseed/Makefile.am | 6 ++++-- + modules/cairo/Makefile.am | 27 ++++++++++++++------------- + modules/canvas/Makefile.am | 8 +++++--- + modules/dbus/Makefile.am | 24 +++++++++++------------- + modules/example/Makefile.am | 6 ++++-- + modules/ffi/Makefile.am | 8 +++++--- + modules/gettext/Makefile.am | 6 ++++-- + modules/gtkbuilder/Makefile.am | 8 +++++--- + modules/libxml/Makefile.am | 12 ++++++------ + modules/mpfr/Makefile.am | 11 +++++------ + modules/multiprocessing/Makefile.am | 6 ++++-- + modules/os/Makefile.am | 7 ++++--- + modules/readline/Makefile.am | 8 +++++--- + modules/sandbox/Makefile.am | 6 ++++-- + modules/sqlite/Makefile.am | 9 +++++---- + src/Makefile.am | 8 ++++---- + tests/c/Makefile.am | 6 ++---- + 20 files changed, 110 insertions(+), 95 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 5bfb716..2183798 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,7 +1,5 @@ + ## Process this file with automake to produce Makefile.in + +-ACLOCAL_AMFLAGS = -I m4 +- + SUBDIRS = po \ + libseed \ + src \ +diff --git a/configure.ac b/configure.ac +index 3bbcccd..fa751a2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -54,9 +54,9 @@ if test x"$have_ffi_pkgconfig" = xno ; then + + AC_SEARCH_LIBS(ffi_call,ffi,,AC_MSG_ERROR([libffi not found]),$other_LIBS) + if test x"$ac_cv_search_ffi_call" = x"none required" ; then +- FFI_LDFLAGS=$other_LIBS ++ FFI_LIBS=$other_LIBS + else +- FFI_LDFLAGS="$ac_cv_search_ffi_call $other_LIBS" ++ FFI_LIBS="$ac_cv_search_ffi_call $other_LIBS" + fi + LIBS=$save_LIBS + fi +@@ -69,18 +69,18 @@ if test x"$have_ffi_pkgconfig" = xno ; then + AC_MSG_RESULT([$have_ffi_h]) + fi + +-AC_SUBST(FFI_LDFLAGS) ++AC_SUBST(FFI_LIBS) + AC_SUBST(FFI_CFLAGS) + + dnl ==============================WebKit======================================= + PKG_CHECK_MODULES(WEBKIT, webkitgtk-3.0) + AC_SUBST(WEBKIT_CFLAGS) +-AC_SUBST(WEBKIT_LDFLAGS) ++AC_SUBST(WEBKIT_LIBS) + + dnl =========================Introspection===================================== + PKG_CHECK_MODULES(GOBJECT_INTROSPECTION, gobject-introspection-1.0 >= 0.6.14) + AC_SUBST(GOBJECT_INTROSPECTION_CFLAGS) +-AC_SUBST(GOBJECT_INTROSPECTION_LDFLAGS) ++AC_SUBST(GOBJECT_INTROSPECTION_LIBS) + + dnl ========================GNOME-js common==================================== + PKG_CHECK_MODULES(GNOME_JS, gnome-js-common) +@@ -97,10 +97,10 @@ AC_ARG_ENABLE(canvas-module, + if test x"$want_canvas_module" == x"yes" ; then + PKG_CHECK_MODULES(CAIRO, cairo) + AC_SUBST(CAIRO_CFLAGS) +- AC_SUBST(CAIRO_LDFLAGS) ++ AC_SUBST(CAIRO_LIBS) + PKG_CHECK_MODULES(GDK, gdk-2.0) + AC_SUBST(GDK_CFLAGS) +- AC_SUBST(GDK_LDFLAGS) ++ AC_SUBST(GDK_LIBS) + fi + + AM_CONDITIONAL(BUILD_CANVAS_MODULE, test "x$want_canvas_module" = "xyes") +@@ -137,7 +137,7 @@ AC_ARG_ENABLE(sqlite-module, + if test x"$want_sqlite_module" == x"yes" ; then + PKG_CHECK_MODULES(SQLITE, sqlite3) + AC_SUBST(SQLITE_CFLAGS) +- AC_SUBST(SQLITE_LDFLAGS) ++ AC_SUBST(SQLITE_LIBS) + fi + + AM_CONDITIONAL(BUILD_SQLITE_MODULE, test "x$want_sqlite_module" = "xyes") +@@ -165,10 +165,10 @@ AC_SUBST(BUILD_DBUS_MODULE) + if test x"$want_dbus_module" == x"yes" ; then + PKG_CHECK_MODULES(DBUS, dbus-1) + AC_SUBST(DBUS_CFLAGS) +- AC_SUBST(DBUS_LDFLAGS) ++ AC_SUBST(DBUS_LIBS) + PKG_CHECK_MODULES(DBUSGLIB, dbus-glib-1) + AC_SUBST(DBUSGLIB_CFLAGS) +- AC_SUBST(DBUSGLIB_LDFLAGS) ++ AC_SUBST(DBUSGLIB_LIBS) + fi + + +@@ -202,7 +202,7 @@ AC_ARG_ENABLE(libxml-module, + if test x"$want_libxml_module" == x"yes" ; then + PKG_CHECK_MODULES(LIBXML, libxml-2.0) + AC_SUBST(LIBXML_CFLAGS) +- AC_SUBST(LIBXML_LDFLAGS) ++ AC_SUBST(LIBXML_LIBS) + fi + + AM_CONDITIONAL(BUILD_LIBXML_MODULE, test "x$want_libxml_module" = "xyes") +@@ -227,7 +227,7 @@ AC_ARG_ENABLE(gtkbuilder-module, + if test x"$want_gtkbuilder_module" == x"yes" ; then + PKG_CHECK_MODULES(GTK, gtk+-2.0) + AC_SUBST(GTK_CFLAGS) +- AC_SUBST(GTK_LDFLAGS) ++ AC_SUBST(GTK_LIBS) + fi + + AM_CONDITIONAL(BUILD_GTKBUILDER_MODULE, test "x$want_gtkbuilder_module" = "xyes") +@@ -243,7 +243,7 @@ AC_ARG_ENABLE(cairo-module, + if test x"$want_cairo_module" == x"yes" ; then + PKG_CHECK_MODULES(CAIRO, cairo) + AC_SUBST(CAIRO_CFLAGS) +- AC_SUBST(CAIRO_LDFLAGS) ++ AC_SUBST(CAIRO_LIBS) + fi + + AM_CONDITIONAL(BUILD_CAIRO_MODULE, test "x$want_cairo_module" = "xyes") +@@ -277,9 +277,9 @@ if test x"$want_mpfr_module" == x"yes" ; then + + AC_SEARCH_LIBS(mpfr_init2,mpfr,,AC_MSG_ERROR([mpfr not found]),$other_LIBS) + if test x"$ac_cv_search_mpfr_call" = x"none required" ; then +- MPFR_LDFLAGS=$other_LIBS ++ MPFR_LIBS=$other_LIBS + else +- MPFR_LDFLAGS="$other_LIBS" ++ MPFR_LIBS="$other_LIBS" + fi + LIBS=$save_LIBS + fi +diff --git a/extensions/Makefile.am b/extensions/Makefile.am +index 6f30f2e..fd5dff0 100644 +--- a/extensions/Makefile.am ++++ b/extensions/Makefile.am +@@ -1,10 +1,11 @@ +-EXTRA_DIST= Gio.js Seed.js.in Gtk.js GObject.js Clutter.js Gst.js repl.js ++EXTRA_DIST= Seed.js.in + + extensiondir=$(datadir)/seed/extensions +-extension_DATA = Gio.js Seed.js Gtk.js GObject.js Clutter.js Gst.js ++extension_DATA = Seed.js ++dist_extension_DATA = Gio.js Gtk.js GObject.js Clutter.js Gst.js + + repldir=$(datadir)/seed +-repl_DATA = repl.js ++dist_repl_DATA = repl.js + + Seed.js: Seed.js.in + $(AM_V_GEN) $(SED) -e "s|%pkglibdir%|$(pkglibdir)|" -e "s|%pkgdatadir%|$(pkgdatadir)|" -e "s|%gnomejsdir%|$(GNOME_JS_DIR)|" $< > $@ +diff --git a/libseed/Makefile.am b/libseed/Makefile.am +index 909aa2a..04e263d 100644 +--- a/libseed/Makefile.am ++++ b/libseed/Makefile.am +@@ -35,12 +35,14 @@ libseed_la_CFLAGS = \ + $(FFI_CFLAGS) + + libseed_la_LDFLAGS = \ +- -no-undefined \ ++ -no-undefined ++ ++libseed_la_LIBADD = \ + $(GOBJECT_INTROSPECTION_LIBS) \ + $(WEBKIT_LIBS) \ + $(SEED_PROFILE_LIBS) \ + $(SEED_OSX_LIBS) \ +- $(FFI_LDFLAGS) ++ $(FFI_LIBS) + + seedheaders_HEADERS = seed.h seed-debug.h seed-module.h + +diff --git a/modules/cairo/Makefile.am b/modules/cairo/Makefile.am +index 139601a..3ea87d5 100644 +--- a/modules/cairo/Makefile.am ++++ b/modules/cairo/Makefile.am +@@ -1,13 +1,5 @@ + if BUILD_CAIRO_MODULE + +-EXTRA_DIST = seed-cairo-enums.h \ +- seed-cairo.h \ +- seed-cairo-image-surface.h \ +- seed-cairo-matrix.h \ +- seed-cairo-pattern.h \ +- seed-cairo-pdf-surface.h \ +- seed-cairo-surface.h +- + seedlibdir = ${libdir}/seed + + seedlib_LTLIBRARIES = \ +@@ -15,12 +7,19 @@ seedlib_LTLIBRARIES = \ + + libseed_cairo_la_SOURCES = \ + seed-cairo.c \ ++ seed-cairo.h \ + seed-cairo-surface.c \ ++ seed-cairo-surface.h \ + seed-cairo-image-surface.c \ ++ seed-cairo-image-surface.h \ + seed-cairo-pdf-surface.c \ ++ seed-cairo-pdf-surface.h \ + seed-cairo-matrix.c \ ++ seed-cairo-matrix.h \ + seed-cairo-pattern.c \ +- seed-cairo-enums.c ++ seed-cairo-pattern.h ++ seed-cairo-enums.c \ ++ seed-cairo-enums.h + + libseed_cairo_la_CFLAGS = \ + -Wall \ +@@ -32,10 +31,12 @@ libseed_cairo_la_CFLAGS = \ + $(SEED_PROFILE_CFLAGS) + + libseed_cairo_la_LDFLAGS = \ +- -module -avoid-version \ +- $(GOBJECT_INTROSPECTION_LDFLAGS) \ +- $(GDK_LDFLAGS) \ +- $(CAIRO_LDFLAGS) \ ++ -shared -module -avoid-version ++ ++libseed_cairo_la_LIBADD = \ ++ $(GOBJECT_INTROSPECTION_LIBS) \ ++ $(GDK_LIBS) \ ++ $(CAIRO_LIBS) \ + $(SEED_PROFILE_LIBS) + + endif +diff --git a/modules/canvas/Makefile.am b/modules/canvas/Makefile.am +index 11a3929..4b28259 100644 +--- a/modules/canvas/Makefile.am ++++ b/modules/canvas/Makefile.am +@@ -17,9 +17,11 @@ libseed_canvas_la_CFLAGS = \ + $(SEED_PROFILE_CFLAGS) + + libseed_canvas_la_LDFLAGS = \ +- -module -avoid-version \ +- $(GOBJECT_INTROSPECTION_LDFLAGS) \ +- $(CAIRO_LDFLAGS) \ ++ -shared -module -avoid-version ++ ++libseed_canvas_la_LIBADD = \ ++ $(GOBJECT_INTROSPECTION_LIBS) \ ++ $(CAIRO_LIBS) \ + $(SEED_PROFILE_LIBS) + + endif +diff --git a/modules/dbus/Makefile.am b/modules/dbus/Makefile.am +index 9f7fdb3..625e99b 100644 +--- a/modules/dbus/Makefile.am ++++ b/modules/dbus/Makefile.am +@@ -2,14 +2,10 @@ if BUILD_DBUS_MODULE + + SUBDIRS = util + +-EXTRA_DIST = dbus2js.py \ +- dbus.js \ +- dbus-values.h \ +- lang.js \ +- dbus-exports.h ++EXTRA_DIST = dbus2js.py + + moduledir = $(datadir)/seed +-module_DATA = dbus.js lang.js ++dist_module_DATA = dbus.js lang.js + + seedlibdir = ${libdir}/seed + +@@ -22,7 +18,9 @@ libseed_dbusnative_la_SOURCES = \ + util/dbus-proxy.c \ + util/dbus-signals.c \ + dbus-values.c \ +- dbus-exports.c ++ dbus-values.h \ ++ dbus-exports.c \ ++ dbus-exports.h + + + libseed_dbusnative_la_CFLAGS = \ +@@ -35,12 +33,12 @@ libseed_dbusnative_la_CFLAGS = \ + + + libseed_dbusnative_la_LDFLAGS = \ +- -module -avoid-version \ +- $(GOBJECT_INTROSPECTION_LDFLAGS) \ +- -L/lib \ +- -ldbus-1 \ +- $(DBUS_LDFLAGS) \ +- -ldbus-glib-1 \ ++ -shared -module -avoid-version ++ ++libseed_dbusnative_la_LIBADD = \ ++ $(GOBJECT_INTROSPECTION_LIBS) \ ++ $(DBUS_LIBS) \ ++ $(DBUS_GLIB_LIBS) \ + $(SEED_PROFILE_LIBS) + + +diff --git a/modules/example/Makefile.am b/modules/example/Makefile.am +index d58f8ec..2524e32 100644 +--- a/modules/example/Makefile.am ++++ b/modules/example/Makefile.am +@@ -15,8 +15,10 @@ AM_CPPFLAGS = \ + $(SEED_PROFILE_CFLAGS) + + libseed_example_la_LDFLAGS = \ +- -module -avoid-version \ +- $(GOBJECT_INTROSPECTION_LDFLAGS) \ ++ -shared -module -avoid-version ++ ++libseed_example_la_LIBADD = \ ++ $(GOBJECT_INTROSPECTION_LIBS) \ + $(SEED_PROFILE_LIBS) + + endif +diff --git a/modules/ffi/Makefile.am b/modules/ffi/Makefile.am +index d7e879d..270fb12 100644 +--- a/modules/ffi/Makefile.am ++++ b/modules/ffi/Makefile.am +@@ -23,10 +23,12 @@ libseed_ffi_la_CFLAGS = \ + $(FFI_CFLAGS) + + libseed_ffi_la_LDFLAGS = \ +- -module -avoid-version \ +- $(GOBJECT_INTROSPECTION_LDFLAGS) \ ++ -shared -module -avoid-version ++ ++libseed_ffi_la_LIBADD = \ ++ $(GOBJECT_INTROSPECTION_LIBS) \ + $(SEED_PROFILE_LIBS) \ +- $(FFI_LDFLAGS) ++ $(FFI_LIBS) + + endif + +diff --git a/modules/gettext/Makefile.am b/modules/gettext/Makefile.am +index a182f4f..4c246d8 100644 +--- a/modules/gettext/Makefile.am ++++ b/modules/gettext/Makefile.am +@@ -15,8 +15,10 @@ AM_CPPFLAGS = \ + $(SEED_PROFILE_CFLAGS) + + libseed_gettext_la_LDFLAGS = \ +- -module -avoid-version \ +- $(GOBJECT_INTROSPECTION_LDFLAGS) \ ++ -shared -module -avoid-version ++ ++libseed_gettext_la_LIBADD = \ ++ $(GOBJECT_INTROSPECTION_LIBS) \ + $(SEED_PROFILE_LIBS) + + endif +diff --git a/modules/gtkbuilder/Makefile.am b/modules/gtkbuilder/Makefile.am +index 972efdc..3998be4 100644 +--- a/modules/gtkbuilder/Makefile.am ++++ b/modules/gtkbuilder/Makefile.am +@@ -17,9 +17,11 @@ AM_CPPFLAGS = \ + $(SEED_PROFILE_CFLAGS) + + libseed_gtkbuilder_la_LDFLAGS = \ +- -module -avoid-version \ +- $(GTK_LDFLAGS) \ +- $(GOBJECT_INTROSPECTION_LDFLAGS) \ ++ -shared -module -avoid-version ++ ++libseed_gtkbuilder_la_LIBADD = \ ++ $(GTK_LIBS) \ ++ $(GOBJECT_INTROSPECTION_LIBS) \ + $(SEED_PROFILE_LIBS) + + endif +diff --git a/modules/libxml/Makefile.am b/modules/libxml/Makefile.am +index a1dba7b..cb0e96d 100644 +--- a/modules/libxml/Makefile.am ++++ b/modules/libxml/Makefile.am +@@ -1,7 +1,5 @@ + if BUILD_LIBXML_MODULE + +-EXTRA_DIST = xml.js +- + seedlibdir = ${libdir}/seed + + seedlib_LTLIBRARIES = \ +@@ -18,13 +16,15 @@ AM_CPPFLAGS = \ + $(SEED_PROFILE_CFLAGS) + + libseed_libxml_la_LDFLAGS = \ +- -module -avoid-version \ +- $(LIBXML_LDFLAGS) \ +- $(GOBJECT_INTROSPECTION_LDFLAGS) \ ++ -shared -module -avoid-version ++ ++libseed_libxml_la_LIBADD = \ ++ $(LIBXML_LIBS) \ ++ $(GOBJECT_INTROSPECTION_LIBS) \ + $(SEED_PROFILE_LIBS) + + extensionsdir=$(datadir)/seed/extensions +-extensions_DATA=xml.js ++dist_extensions_DATA=xml.js + + endif + +diff --git a/modules/mpfr/Makefile.am b/modules/mpfr/Makefile.am +index d0497ec..06a6c00 100644 +--- a/modules/mpfr/Makefile.am ++++ b/modules/mpfr/Makefile.am +@@ -7,6 +7,7 @@ seedlib_LTLIBRARIES = \ + + libseed_mpfr_la_SOURCES = \ + seed-mpfr.c \ ++ seed-mpfr.h \ + seed-mpfr-trig.c \ + seed-mpfr-arithmetic.c \ + seed-mpfr-cmp.c +@@ -18,13 +19,11 @@ AM_CPPFLAGS = \ + $(SEED_PROFILE_CFLAGS) + + libseed_mpfr_la_LDFLAGS = \ +- -module -avoid-version \ +- $(GOBJECT_INTROSPECTION_LDFLAGS) \ +- $(SEED_PROFILE_LIBS) +- +-libseed_mpfr_la_LIBADD = -lmpfr -lgmp ++ -shared -module -avoid-version + +-EXTRA_DIST = seed-mpfr.h ++libseed_mpfr_la_LIBADD = -lmpfr -lgmp \ ++ $(GOBJECT_INTROSPECTION_LIBS) \ ++ $(SEED_PROFILE_LIBS) + + endif + +diff --git a/modules/multiprocessing/Makefile.am b/modules/multiprocessing/Makefile.am +index 1e39007..cb151f9 100644 +--- a/modules/multiprocessing/Makefile.am ++++ b/modules/multiprocessing/Makefile.am +@@ -17,8 +17,10 @@ libseed_multiprocessing_la_CFLAGS = \ + $(SEED_PROFILE_CFLAGS) + + libseed_multiprocessing_la_LDFLAGS = \ +- -module -avoid-version \ +- $(GOBJECT_INTROSPECTION_LDFLAGS) \ ++ -shared -module -avoid-version ++ ++libseed_multiprocessing_la_LIBADD = \ ++ $(GOBJECT_INTROSPECTION_LIBS) \ + $(SEED_PROFILE_LIBS) + + endif +diff --git a/modules/os/Makefile.am b/modules/os/Makefile.am +index 0781937..b4bdaf4 100644 +--- a/modules/os/Makefile.am ++++ b/modules/os/Makefile.am +@@ -15,10 +15,11 @@ libseed_os_la_CFLAGS = \ + $(SEED_PROFILE_CFLAGS) + + libseed_os_la_LDFLAGS = \ +- -module -avoid-version \ +- $(GOBJECT_INTROSPECTION_LDFLAGS) \ ++ -shared -module -avoid-version ++ ++libseed_os_la_LIBADD = \ ++ $(GOBJECT_INTROSPECTION_LIBS) \ + -lutil \ +- $(SEED_DEBUG_LDFLAGS) \ + $(SEED_PROFILE_LIBS) + + endif +diff --git a/modules/readline/Makefile.am b/modules/readline/Makefile.am +index 8eff4e8..94965ca 100644 +--- a/modules/readline/Makefile.am ++++ b/modules/readline/Makefile.am +@@ -16,10 +16,12 @@ libseed_readline_la_CFLAGS = \ + $(SEED_PROFILE_CFLAGS) + + libseed_readline_la_LDFLAGS = \ +- -module -avoid-version \ ++ -shared -module -avoid-version ++ ++libseed_readline_la_LIBADD = \ + -lreadline \ +- $(GOBJECT_INTROSPECTION_LDFLAGS) \ +- $(FFI_LDFLAGS) \ ++ $(GOBJECT_INTROSPECTION_LIBS) \ ++ $(FFI_LIBS) \ + $(SEED_PROFILE_LIBS) + + endif +diff --git a/modules/sandbox/Makefile.am b/modules/sandbox/Makefile.am +index 8a53221..f79149c 100644 +--- a/modules/sandbox/Makefile.am ++++ b/modules/sandbox/Makefile.am +@@ -14,8 +14,10 @@ AM_CPPFLAGS = \ + $(SEED_PROFILE_CFLAGS) + + libseed_sandbox_la_LDFLAGS = \ +- -module -avoid-version \ +- $(GOBJECT_INTROSPECTION_LDFLAGS) \ ++ -shared -module -avoid-version ++ ++libseed_sandbox_la_LIBADD = \ ++ $(GOBJECT_INTROSPECTION_LIBS) \ + $(SEED_PROFILE_LIBS) + + +diff --git a/modules/sqlite/Makefile.am b/modules/sqlite/Makefile.am +index deedaba..15fedf4 100644 +--- a/modules/sqlite/Makefile.am ++++ b/modules/sqlite/Makefile.am +@@ -17,10 +17,11 @@ libseed_sqlite_la_CFLAGS = \ + $(SEED_PROFILE_CFLAGS) + + libseed_sqlite_la_LDFLAGS = \ +- -module -avoid-version \ +- $(GOBJECT_INTROSPECTION_LDFLAGS) \ +- $(SQLITE_LDFLAGS) \ +- $(SEED_DEBUG_LDFLAGS) \ ++ -shared -module -avoid-version ++ ++libseed_sqlite_la_LIBS = \ ++ $(GOBJECT_INTROSPECTION_LIBS) \ ++ $(SQLITE_LIBS) \ + $(SEED_PROFILE_LIBS) + + endif +diff --git a/src/Makefile.am b/src/Makefile.am +index 04ee4c8..82c2efc 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -16,11 +16,11 @@ seed_CFLAGS = \ + $(GOBJECT_INTROSPECTION_CFLAGS) \ + $(WEBKIT_CFLAGS) + +-seed_LDFLAGS = \ ++seed_LDADD = \ + $(SEED_PROFILE_LIBS) \ +- $(LIBFFI_LDFLAGS) \ +- $(GOBJECT_INTROSPECTION_LDFLAGS) \ +- $(WEBKIT_LDFLAGS) ++ $(LIBFFI_LIBS) \ ++ $(GOBJECT_INTROSPECTION_LIBS) \ ++ $(WEBKIT_LIBS) + + seed_LDADD = \ + ../libseed/libseed.la +diff --git a/tests/c/Makefile.am b/tests/c/Makefile.am +index cb72d00..48b1bc2 100644 +--- a/tests/c/Makefile.am ++++ b/tests/c/Makefile.am +@@ -16,9 +16,7 @@ test_CFLAGS = \ + -Wall \ + $(GOBJECT_INTROSPECTION_CFLAGS) + +-test_LDFLAGS = \ +- $(GOBJECT_INTROSPECTION_LIBS) +- + test_LDADD = \ +- ../../libseed/libseed.la ++ ../../libseed/libseed.la \ ++ $(GOBJECT_INTROSPECTION_LIBS) + +-- +1.7.1.1 + diff --git a/dev-libs/seed/seed-3.0.0.ebuild b/dev-libs/seed/seed-3.0.0.ebuild new file mode 100644 index 000000000000..4a52e6d9da8c --- /dev/null +++ b/dev-libs/seed/seed-3.0.0.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/seed/seed-3.0.0.ebuild,v 1.1 2011/08/14 15:19:36 nirbheek Exp $ + +EAPI="3" +WANT_AUTOMAKE="1.11" +GNOME2_LA_PUNT="yes" + +inherit gnome2 + +DESCRIPTION="Javascript bindings for Webkit-GTK and GNOME libraries" +HOMEPAGE="http://live.gnome.org/Seed" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug doc profile test" + +RDEPEND=" + >=dev-libs/gobject-introspection-0.9 + + dev-libs/glib:2 + virtual/libffi + x11-libs/cairo + x11-libs/gtk+:3[introspection] + net-libs/webkit-gtk:3 + gnome-base/gnome-js-common + dev-db/sqlite:3 + dev-libs/dbus-glib + dev-libs/mpfr + dev-libs/libxml2:2 + sys-apps/dbus + sys-libs/readline" +DEPEND="${RDEPEND} + sys-devel/gettext + >=dev-util/pkgconfig-0.9 + >=dev-util/intltool-0.35 + doc? ( >=dev-util/gtk-doc-0.9 ) + profile? ( sys-devel/gcc )" + +DOCS="AUTHORS ChangeLog NEWS README" + +pkg_setup() { + G2CONF="${G2CONF} + --disable-static + --with-webkit=3.0 + --enable-readline-module + --enable-os-module + --enable-ffi-module + --enable-gtkbuilder-module + --enable-cairo-module + --enable-gettext-module + --enable-dbus-module + --enable-mpfr-module + --enable-sqlite-module + --enable-libxml-module" + + # configure behaves very strangely and enables profiling if we pass either + # --disable-profile or --enable-profile + if use profile; then + G2CONF="${G2CONF} + --enable-profile + --enable-profile-modules" + if ! use debug; then + elog "USE=profile needs debug, auto-enabling..." + G2CONF="${G2CONF} --enable-debug" + fi + fi + + if use profile && has ccache ${FEATURES}; then + ewarn "USE=profile behaves very badly with ccache; it tries to create" + ewarn "profiling data in CCACHE_DIR. Please disable one of them!" + fi +} + +#src_prepare() { + # I've no idea what abcd did here; the patch doesn't apply anymore (nirbheek) +# epatch "${FILESDIR}/${PN}-2.31.5-cleanup-autotools.patch" +# +# intltoolize --automake --copy --force || die "intltoolize failed" +# eautoreconf +#} |