diff options
21 files changed, 256 insertions, 262 deletions
diff --git a/dev-libs/gir-repository/Manifest b/dev-libs/gir-repository/Manifest index d9e0fee..84b7971 100644 --- a/dev-libs/gir-repository/Manifest +++ b/dev-libs/gir-repository/Manifest @@ -1,4 +1,4 @@ -AUX gir-repository-0.6.5-fix-worlds-worst-automagic-configure.patch 17226 RMD160 199059c0f42b9ab4c23542fe68e99945c0f29c05 SHA1 19d1bc8e5749eb5b629eddd55c87a53fecd44df5 SHA256 642217fff6420da5b54feba0891a5928322fb5ccfd4ba23e2634b44cbbb7e92f +AUX gir-repository-0.6.5-fix-worlds-worst-automagic-configure.patch 18388 RMD160 6a1443d892a9138d494f3bb11ab3471147398b9d SHA1 69015a5ee2c452be1881385bf444deb782a7a26a SHA256 21a5ec40b83d4a409aebce513c3b405579a22eac98263406590af2c021edf418 DIST gir-repository-0.6.5.tar.bz2 264148 RMD160 fd4bd2f4fd2dbd7e471694cb9add900e754b5c10 SHA1 0a036f32227a41096d394ff822a6a631688ee47f SHA256 cbeadc6c701f376134c9fe288fe0d95a725d9fa398daaeeb6621c35e8bafcae1 -EBUILD gir-repository-0.6.5.ebuild 2338 RMD160 bcd984fde02f801e0897f022e1f72f663910189d SHA1 b249208a91514c11229220fb855a87352ad9384d SHA256 4cb532c1f49ffd67d64dd55ebd2a1d9d525f5e2dec94f85c1c747919beed6b6d -EBUILD gir-repository-9999.ebuild 2416 RMD160 cf17d1363feb2bf73ea130940be236292bf4e953 SHA1 7c2e3edb171e1dad4ea898ca732a0d7edc139afe SHA256 562fc08e76a5b666681ad9c278a5397ed83684f50660516f6ccb4eec8f08157e +EBUILD gir-repository-0.6.5.ebuild 2351 RMD160 3b0caf1375a9f2e4137591948bac51f4aa8ad668 SHA1 e8befc7017f87c815264f1cfca6a0c2a3f37bd7c SHA256 8926a4d898b602cc20d9563ab85fc577997ffde8252a53906d42a93fd5ee6ba8 +EBUILD gir-repository-9999.ebuild 2430 RMD160 96ff87790248a22c11013ff2917e782a6b882acd SHA1 764c19207fe806460ce8a4aa5444ea441a0f84a2 SHA256 15f59d0f2fedaf69ac76812bf725bc88397fa8b319b53ca1e41dfa752669d838 diff --git a/dev-libs/gir-repository/files/gir-repository-0.6.5-fix-worlds-worst-automagic-configure.patch b/dev-libs/gir-repository/files/gir-repository-0.6.5-fix-worlds-worst-automagic-configure.patch index b09b286..c3755c0 100644 --- a/dev-libs/gir-repository/files/gir-repository-0.6.5-fix-worlds-worst-automagic-configure.patch +++ b/dev-libs/gir-repository/files/gir-repository-0.6.5-fix-worlds-worst-automagic-configure.patch @@ -1,11 +1,11 @@ So... who's going to open an upstream bug for this? =) --- +--- --- configure.ac +++ configure.ac @@ -20,33 +20,89 @@ # GObject Introspection - GOBJECT_INTROSPECTION_REQUIRE(0.6.3) + GOBJECT_INTROSPECTION_REQUIRE(0.6.5) +dnl ---------- dnl dbus @@ -273,7 +273,7 @@ So... who's going to open an upstream bug for this? =) AM_CONDITIONAL(BUILD_CLUTTER, $have_clutter) CLUTTER_BACKEND= CLUTTER_BACKEND_GIRS= -@@ -126,19 +126,57 @@ +@@ -126,73 +281,160 @@ AC_SUBST(CLUTTER_BACKEND) AC_SUBST(CLUTTER_BACKEND_GIRS) @@ -317,11 +317,28 @@ So... who's going to open an upstream bug for this? =) dnl gstreamer -PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10 >= 0.10.0, - have_gstreamer=true, have_gstreamer=false) +-AM_CONDITIONAL(BUILD_GSTREAMER, $have_gstreamer) +- +-dnl gstbufferlist.h, gsttaskpool.h were added in 0.10.24 (and in +-dnl prereleases of that) +dnl ---------- +AC_ARG_ENABLE(gstreamer, + AS_HELP_STRING([--enable-gstreamer], [Build Gstreamer gir data])) +have_gstreamer=false +have_gstreamer_plugins_base=false + have_gstbufferlist_h=false +-if $have_gstreamer ; then +- save_CPPFLAGS="$CPPFLAGS"; CPPFLAGS="$CPPFLAGS $GSTREAMER_CFLAGS" +- AC_CHECK_HEADER(gst/gstbufferlist.h, [have_gstbufferlist_h=true]) +- CPPFLAGS="$save_CPPFLAGS" +-fi +-AM_CONDITIONAL(HAVE_GSTBUFFERLIST_H, $have_gstbufferlist_h) +- + have_gsttaskpool_h=false +-if $have_gstreamer ; then +- save_CPPFLAGS="$CPPFLAGS"; CPPFLAGS="$CPPFLAGS $GSTREAMER_CFLAGS" +- AC_CHECK_HEADER(gst/gsttaskpool.h, [have_gsttaskpool_h=true]) +- CPPFLAGS="$save_CPPFLAGS" +if test "$enable_gstreamer" != "no"; then + PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10 >= 0.10.0, + have_gstreamer=true, have_gstreamer=false) @@ -330,21 +347,32 @@ So... who's going to open an upstream bug for this? =) + AC_MSG_ERROR([Gstreamer gir data requested but gstreamer-0.10 not found]) + fi + ++ dnl gstbufferlist.h, gsttaskpool.h were added in 0.10.24 (and in ++ dnl prereleases of that) ++ if $have_gstreamer ; then ++ save_CPPFLAGS="$CPPFLAGS"; CPPFLAGS="$CPPFLAGS $GSTREAMER_CFLAGS" ++ AC_CHECK_HEADER(gst/gstbufferlist.h, [have_gstbufferlist_h=true]) ++ CPPFLAGS="$save_CPPFLAGS" ++ fi ++ ++ if $have_gstreamer ; then ++ save_CPPFLAGS="$CPPFLAGS"; CPPFLAGS="$CPPFLAGS $GSTREAMER_CFLAGS" ++ AC_CHECK_HEADER(gst/gsttaskpool.h, [have_gsttaskpool_h=true]) ++ CPPFLAGS="$save_CPPFLAGS" ++ fi ++ + PKG_CHECK_MODULES(GSTREAMER_PLUGINS_BASE, gstreamer-plugins-base-0.10 >= 0.10.0, + have_gstreamer_plugins_base=true, + have_gstreamer_plugins_base=false) -+fi - AM_CONDITIONAL(BUILD_GSTREAMER, $have_gstreamer) - - dnl gstbufferlist.h, gsttaskpool.h were added in 0.10.24 (and in -@@ -159,39 +197,89 @@ fi ++AM_CONDITIONAL(HAVE_GSTBUFFERLIST_H, $have_gstbufferlist_h) AM_CONDITIONAL(HAVE_GSTTASKPOOL_H, $have_gsttaskpool_h) - +- -dnl gstreamer -PKG_CHECK_MODULES(GSTREAMER_PLUGINS_BASE, gstreamer-plugins-base-0.10 >= 0.10.0, - have_gstreamer_plugins_base=true, - have_gstreamer_plugins_base=false) ++AM_CONDITIONAL(BUILD_GSTREAMER, $have_gstreamer) AM_CONDITIONAL(BUILD_GSTREAMER_PLUGINS_BASE, $have_gstreamer_plugins_base) +dnl ---------- @@ -440,10 +468,12 @@ So... who's going to open an upstream bug for this? =) AM_CONDITIONAL(BUILD_GSSDP, $have_gssdp) -dnl gupnp - if test $have_gssdp; then +-if test $have_gssdp; then ++if test "$have_gssdp" = "true"; then PKG_CHECK_MODULES(GUPNP, gupnp-1.0, have_gupnp=true, have_gupnp=false) -@@ -182,24 +424,68 @@ + else +@@ -200,24 +442,68 @@ fi AM_CONDITIONAL(BUILD_GUPNP, $have_gupnp) diff --git a/dev-libs/gir-repository/gir-repository-0.6.5.ebuild b/dev-libs/gir-repository/gir-repository-0.6.5.ebuild index 7c88715..8a8c7d6 100644 --- a/dev-libs/gir-repository/gir-repository-0.6.5.ebuild +++ b/dev-libs/gir-repository/gir-repository-0.6.5.ebuild @@ -14,10 +14,10 @@ HOMEPAGE="http://live.gnome.org/GObjectIntrospection/" LICENSE="LGPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="atk avahi babl dbus gconf gnome-keyring gstreamer +gtk gtksourceview gupnp -libnotify libsoup libunique libwnck pango poppler vte webkit" +IUSE="atk avahi babl dbus gconf gnome-keyring goocanvas +gtk gtksourceview gupnp +libnotify libsoup libwnck nautilus pango poppler vte webkit" -RDEPEND=">=dev-libs/gobject-introspection-0.6.4" +RDEPEND=">=dev-libs/gobject-introspection-0.6.5" DEPEND="${RDEPEND} atk? ( >=dev-libs/atk-1.12.0 ) avahi? ( >=net-dns/avahi-0.6 ) @@ -26,9 +26,6 @@ DEPEND="${RDEPEND} gconf? ( gnome-base/gconf ) gnome-keyring? ( gnome-base/gnome-keyring ) goocanvas? ( x11-libs/goocanvas ) - gstreamer? ( - media-libs/gstreamer:0.10 - media-libs/gst-plugins-base:0.10 ) gtk? ( >=dev-libs/atk-1.12.0 x11-libs/gtk+:2 ) @@ -38,7 +35,6 @@ DEPEND="${RDEPEND} net-libs/gupnp ) libnotify? ( x11-libs/libnotify ) libsoup? ( net-libs/libsoup:2.4 ) - libunique? ( >=dev-libs/libunique-1.0.0 ) libwnck? ( x11-libs/libwnck ) nautilus? ( gnome-base/nautilus ) pango? ( x11-libs/pango ) @@ -47,15 +43,22 @@ DEPEND="${RDEPEND} webkit? ( >=net-libs/webkit-gtk-1.0 ) " +_auto_dep() { + if use ${1} && ! use ${2}; then + ewarn "${2} is disabled, but ${1} needs ${2}. Auto-enabling..." + G2CONF="${G2CONF} --enable-${3:-$2}" + fi +} + pkg_setup() { # FIXME: installs even disabled stuff if it's a dependency of something enabled - # XXX: Seemingly unrelated enabling is for Makefile-level dependencies - # FIXME: Above mentioned dependencies are incomplete G2CONF="${G2CONF} --disable-clutter --disable-clutter-gtk --disable-clutter-cairo --disable-gnio + --disable-gstreamer + --disable-unique $(use_enable atk) $(use_enable avahi) $(use_enable babl) @@ -63,22 +66,24 @@ pkg_setup() { $(use_enable gconf) $(use_enable gnome-keyring gnomekeyring) $(use_enable goocanvas) - $(use_enable gstreamer) $(use_enable gtk) - $(use_enable gtk atk) $(use_enable gtksourceview) $(use_enable gupnp gssdp) $(use_enable libnotify notify) $(use_enable libsoup soup) - $(use_enable libunique unique) $(use_enable libwnck wnck) $(use_enable nautilus) $(use_enable pango) $(use_enable poppler) $(use_enable vte) $(use_enable webkit) - $(use_enable webkit soup) " + + # XXX: Auto-enabling is for Makefile-level dependencies + # FIXME: these dependencies are incomplete + _auto_dep gtk atk + _auto_dep gtk pango + _auto_dep webkit libsoup soup } src_prepare() { diff --git a/dev-libs/gir-repository/gir-repository-9999.ebuild b/dev-libs/gir-repository/gir-repository-9999.ebuild index 1d90e73..3758559 100644 --- a/dev-libs/gir-repository/gir-repository-9999.ebuild +++ b/dev-libs/gir-repository/gir-repository-9999.ebuild @@ -17,10 +17,10 @@ SRC_URI="" LICENSE="LGPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="atk avahi babl dbus gconf gnome-keyring gstreamer +gtk gtksourceview gupnp -libnotify libsoup libunique libwnck pango poppler vte webkit" +IUSE="atk avahi babl dbus gconf gnome-keyring goocanvas +gtk gtksourceview gupnp +libnotify libsoup libwnck nautilus pango poppler vte webkit" -RDEPEND=">=dev-libs/gobject-introspection-0.6.3" +RDEPEND=">=dev-libs/gobject-introspection-0.6.5" DEPEND="${RDEPEND} atk? ( >=dev-libs/atk-1.12.0 ) avahi? ( >=net-dns/avahi-0.6 ) @@ -29,9 +29,6 @@ DEPEND="${RDEPEND} gconf? ( gnome-base/gconf ) gnome-keyring? ( gnome-base/gnome-keyring ) goocanvas? ( x11-libs/goocanvas ) - gstreamer? ( - media-libs/gstreamer:0.10 - media-libs/gst-plugins-base:0.10 ) gtk? ( >=dev-libs/atk-1.12.0 x11-libs/gtk+:2 ) @@ -41,7 +38,6 @@ DEPEND="${RDEPEND} net-libs/gupnp ) libnotify? ( x11-libs/libnotify ) libsoup? ( net-libs/libsoup:2.4 ) - libunique? ( >=dev-libs/libunique-1.0.0 ) libwnck? ( x11-libs/libwnck ) nautilus? ( gnome-base/nautilus ) pango? ( x11-libs/pango ) @@ -50,15 +46,22 @@ DEPEND="${RDEPEND} webkit? ( >=net-libs/webkit-gtk-1.0 ) " +_auto_dep() { + if use ${1} && ! use ${2}; then + ewarn "${2} is disabled, but ${1} needs ${2}. Auto-enabling..." + G2CONF="${G2CONF} --enable-${3:-$2}" + fi +} + pkg_setup() { # FIXME: installs even disabled stuff if it's a dependency of something enabled - # XXX: Seemingly unrelated enabling is for Makefile-level dependencies - # FIXME: Above mentioned dependencies are incomplete G2CONF="${G2CONF} --disable-clutter --disable-clutter-gtk --disable-clutter-cairo --disable-gnio + --disable-gstreamer + --disable-unique $(use_enable atk) $(use_enable avahi) $(use_enable babl) @@ -66,27 +69,30 @@ pkg_setup() { $(use_enable gconf) $(use_enable gnome-keyring gnomekeyring) $(use_enable goocanvas) - $(use_enable gstreamer) $(use_enable gtk) - $(use_enable gtk atk) $(use_enable gtksourceview) $(use_enable gupnp gssdp) $(use_enable libnotify notify) $(use_enable libsoup soup) - $(use_enable libunique unique) $(use_enable libwnck wnck) $(use_enable nautilus) $(use_enable pango) $(use_enable poppler) $(use_enable vte) $(use_enable webkit) - $(use_enable webkit soup) " + + # XXX: Auto-enabling is for Makefile-level dependencies + # FIXME: these dependencies are incomplete + _auto_dep gtk atk + _auto_dep gtk pango + _auto_dep webkit libsoup soup } src_unpack() { git_src_unpack cd ${S} epatch "${FILESDIR}/${PN}-0.6.5-fix-worlds-worst-automagic-configure.patch" + eautoreconf } diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest index eb4bd06..cc17545 100644 --- a/dev-libs/gjs/Manifest +++ b/dev-libs/gjs/Manifest @@ -1,3 +1,3 @@ DIST gjs-0.4.tar.bz2 401868 RMD160 23673430a97f93fc846eab2568bc8a888ae50b7e SHA1 5b90233e9da4b660c3d128800bb7ada8ddfd9d8f SHA256 78c3116cfb0feba08c79b4beea4b6ef16bfca3be9b59efcfa7e6eca79911aca6 -EBUILD gjs-0.4.ebuild 382 RMD160 50bf45817b2bac1fc5577e678d8a881685ef99a3 SHA1 234447ed472519d63512bcda8346e4696a9e5b86 SHA256 92eee4d90efe4f247375756221f61f7e314808fd5dfe19c72416744460d05161 -EBUILD gjs-9999.ebuild 447 RMD160 298fe5a63a48d110dd2fe7ab89dd9817b20bd706 SHA1 021739697f69c3a8290d73fd8c59f6a179b0f683 SHA256 90ec7cfb775f7fdbf4b2fc5d3929cd63f0b35c31145fe7a48a1ad41e8d53b6ff +EBUILD gjs-0.4.ebuild 593 RMD160 46af7d046c26ee4899d1e0e74015b96f582b74a7 SHA1 7986537f87386a3b3d170b8b5273977d133e15ff SHA256 65969dc3271357101d5ac38aa8c7dec43118f89b6d676fac8ab27603c634c1d8 +EBUILD gjs-9999.ebuild 735 RMD160 564f39cc24cb2f78898b0e3baef15180765ed72b SHA1 bcecc687da7f76f25ed58998807ecaf59cba0244 SHA256 487943865dfd565ecd5052228724dbc1929f0b5c528e54d7f8456927aae703f6 diff --git a/dev-libs/gjs/gjs-0.4.ebuild b/dev-libs/gjs/gjs-0.4.ebuild index f4986b6..e1e5403 100644 --- a/dev-libs/gjs/gjs-0.4.ebuild +++ b/dev-libs/gjs/gjs-0.4.ebuild @@ -2,19 +2,28 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -inherit autotools gnome2 +EAPI="2" -DESCRIPTION="Gnome GJS" -HOMEPAGE="http://live.gnome.org/gjs" +inherit gnome2 -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~amd64" -IUSE="" +DESCRIPTION="Javascript bindings for GNOME" +HOMEPAGE="http://live.gnome.org/Gjs" -RDEPEND=">=dev-libs/glib-2 - >=net-libs/xulrunner-1.8 - >=dev-libs/gobject-introspection-0.6.3" -DEPEND="${RDEPEND}" +LICENSE="MIT MPL-1.1 LGPL-2 GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="coverage" +RDEPEND=">=dev-libs/glib-2.16.0 + >=dev-libs/gobject-introspection-0.6.3 + dev-libs/dbus-glib + net-libs/xulrunner:1.9" +DEPEND="${RDEPEND} + sys-devel/gettext + >=dev-util/pkgconfig-0.9 + coverage? ( + sys-devel/gcc + dev-util/lcov )" +# AUTHORS, ChangeLog are empty +DOCS="NEWS README" diff --git a/dev-libs/gjs/gjs-9999.ebuild b/dev-libs/gjs/gjs-9999.ebuild index a224e2d..cef27fb 100644 --- a/dev-libs/gjs/gjs-9999.ebuild +++ b/dev-libs/gjs/gjs-9999.ebuild @@ -2,21 +2,34 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ +EAPI="2" + inherit autotools gnome2 git EGIT_REPO_URI="git://git.gnome.org/gjs" -DESCRIPTION="Gnome GJS" -HOMEPAGE="http://live.gnome.org/gjs" +DESCRIPTION="Javascript bindings for GNOME" +HOMEPAGE="http://live.gnome.org/Gjs" SRC_URI="" -LICENSE="GPL-2" +LICENSE="MIT MPL-1.1 LGPL-2 GPL-2" SLOT="0" -KEYWORDS="~x86 ~amd64" -IUSE="" +KEYWORDS="~amd64 ~x86" +IUSE="coverage" + +RDEPEND=">=dev-libs/glib-2.16.0 + >=dev-libs/gobject-introspection-0.6.3 -RDEPEND="net-libs/xulrunner" -DEPEND="${RDEPEND}" + dev-libs/dbus-glib + net-libs/xulrunner:1.9" +DEPEND="${RDEPEND} + sys-devel/gettext + >=dev-util/pkgconfig-0.9 + coverage? ( + sys-devel/gcc + dev-util/lcov )" +# AUTHORS, ChangeLog are empty +DOCS="NEWS README" S=${WORKDIR}/trunk diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest index 334dbd3..6b434ee 100644 --- a/dev-libs/gobject-introspection/Manifest +++ b/dev-libs/gobject-introspection/Manifest @@ -1,5 +1,4 @@ AUX gobject-introspection-0.6.2-gir.patch 432 RMD160 f159e05133c1ba71061c9e111cf0fcd0e23e7d62 SHA1 bd62f296172403d0bb56d11564be4f00b3ae47e4 SHA256 23f22a27b97f51b622efee870cf3925458ca744869ce2db3d4effb48fe7d075e -AUX gobject-introspection-0.6.4-gir-export.patch 1585 RMD160 d2dde4b4dfcbb917263a79672ead2186525a9db6 SHA1 e344ea1f41d85e4df291821c3d9b1546a9df70a3 SHA256 7e5be6f42333594fe9a2b2a1307c2fa418f68052f59cd257921def311e211f52 DIST gobject-introspection-0.6.5.tar.bz2 608305 RMD160 28e6080e629ff04b81744297460cdf0d61db789f SHA1 ffa66729630018637e5b91f88316d3c536672840 SHA256 fe1702200d45958cdfe3707952d64c3a541628b1203a9b2644db0ee2c6d5df79 -EBUILD gobject-introspection-0.6.5.ebuild 965 RMD160 5ee9dd6f60b33ee63bdebc5cf05397cc62d4486a SHA1 b7653d495df4dd58bec61adc41ac2167ffafa72c SHA256 c0c7ea3847f431a965104bcebfc22e7b1f3bfacd822bf3b07362900baf8dd66a -EBUILD gobject-introspection-9999.ebuild 714 RMD160 8925d74967f2bc25305cb2622122860740d31a8a SHA1 f23a2aae752945fd950b71087f8bbe073e2a22f1 SHA256 7a637f15d94281b0acbc9570134c495a2f4575223cd9bcf6e5d2d0fd7e576f9f +EBUILD gobject-introspection-0.6.5.ebuild 842 RMD160 44dc8132fadeb813fe7f068d41e5bad7a1f3fd42 SHA1 95305f4a98cf322d949cdc649d27753a34a77e78 SHA256 45700673eb341002ac85cb39845a9529513c574a26752bbc0261d89cb2bcb6ae +EBUILD gobject-introspection-9999.ebuild 706 RMD160 1018219bf897eb07917382899f699a3d3a87dfeb SHA1 3815cc23428e74eba625994dc2aac3122ac5c579 SHA256 629f377062d503a437955e77a301c326f5d210b9c635874a36826431c9c1ae74 diff --git a/dev-libs/gobject-introspection/files/gobject-introspection-0.6.4-gir-export.patch b/dev-libs/gobject-introspection/files/gobject-introspection-0.6.4-gir-export.patch deleted file mode 100644 index e233504..0000000 --- a/dev-libs/gobject-introspection/files/gobject-introspection-0.6.4-gir-export.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- gir/Makefile.am -+++ gir/Makefile.am -@@ -161,8 +161,8 @@ GIRepository-2.0.gir: GObject-2.0.gir $(SCANNER_BIN) $(SCANNER_LIBS) $(GIREPOSIT - --include=GObject-2.0 \ - --library=girepository-1.0 \ - -I$(srcdir)/girepository \ -+ --pkg glib-2.0 \ - --pkg gobject-2.0 \ -- --pkg-export gobject-introspection-1.0 \ - $(GIREPOSITORY_FILES) - BUILT_GIRSOURCES += GIRepository-2.0.gir - ---- giscanner/scannermain.py -+++ giscanner/scannermain.py -@@ -81,9 +81,6 @@ def _get_option_parser(): - parser.add_option("", "--pkg", - action="append", dest="packages", default=[], - help="pkg-config packages to get cflags from") -- parser.add_option("", "--pkg-export", -- action="append", dest="packages_export", default=[], -- help="Associated pkg-config packages for this library") - parser.add_option("-v", "--verbose", - action="store_true", dest="verbose", - help="be verbose") -@@ -319,12 +322,8 @@ def scanner_main(args): - raise SystemExit("ERROR in annotation: %s" % (str(e), )) - - # Write out AST -- if options.packages_export: -- exported_packages = options.packages_export -- else: -- exported_packages = options.packages - writer = Writer(namespace, shlibs, transformer.get_includes(), -+ options.packages, options.c_includes, -- exported_packages, options.c_includes, - transformer.get_strip_prefix()) - data = writer.get_xml() - if options.output: - diff --git a/dev-libs/gobject-introspection/gobject-introspection-0.6.5.ebuild b/dev-libs/gobject-introspection/gobject-introspection-0.6.5.ebuild index c5e3862..9983757 100644 --- a/dev-libs/gobject-introspection/gobject-introspection-0.6.5.ebuild +++ b/dev-libs/gobject-introspection/gobject-introspection-0.6.5.ebuild @@ -6,13 +6,13 @@ EAPI="2" inherit autotools gnome2 eutils -DESCRIPTION="GObject Introspection tools and library" +DESCRIPTION="The GObject introspection" HOMEPAGE="http://live.gnome.org/GObjectIntrospection/" LICENSE="LGPL-2 GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" +IUSE="" # doc RDEPEND=">=dev-libs/glib-2.19.0 || ( @@ -22,6 +22,8 @@ RDEPEND=">=dev-libs/glib-2.19.0 DEPEND="${RDEPEND} >=dev-util/pkgconfig-0.18 sys-devel/flex" +# No 1.12 release yet +# doc? ( dev-util/gtk-doc-1.12 )" G2CONF="${G2CONF} --disable-gtk-doc @@ -32,17 +34,9 @@ src_prepare() { # Fix build failure epatch "${FILESDIR}/${PN}-0.6.2-gir.patch" - epatch "${FILESDIR}/${PN}-0.6.4-gir-export.patch" # Make it libtool-1 compatible, bug #270909 rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed" eautoreconf } - -pkg_postinst() { - - elog " If you have problems upgrading this package, try to unmerge and " - elog " re-emerge it. " - -} diff --git a/dev-libs/gobject-introspection/gobject-introspection-9999.ebuild b/dev-libs/gobject-introspection/gobject-introspection-9999.ebuild index a351f5e..5b5c694 100644 --- a/dev-libs/gobject-introspection/gobject-introspection-9999.ebuild +++ b/dev-libs/gobject-introspection/gobject-introspection-9999.ebuild @@ -8,14 +8,14 @@ inherit autotools gnome2 git EGIT_REPO_URI="git://git.gnome.org/gobject-introspection" -DESCRIPTION="GObject Introspection tools and library" +DESCRIPTION="The GObject introspection" HOMEPAGE="http://live.gnome.org/GObjectIntrospection/" SRC_URI="" LICENSE="LGPL-2 GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" +IUSE="" # doc RDEPEND=">=dev-libs/glib-2.19.0 || ( diff --git a/eclass/clutter.eclass b/eclass/clutter.eclass index 79de44e..cab5503 100644 --- a/eclass/clutter.eclass +++ b/eclass/clutter.eclass @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -# +# # clutter.eclass # # Sets SRC_URI, SLOT, and a few deps @@ -25,6 +25,7 @@ DOCS="AUTHORS ChangeLog NEWS README TODO" clutter_src_install() { emake DESTDIR="${D}" install || die "emake install failed" + dodoc ${DOCS} || die "dodoc failed" # examples if hasq examples ${IUSE} && use examples; then @@ -40,3 +41,5 @@ clutter_src_install() { done fi } + +EXPORT_FUNCTIONS src_install diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest index db9c542..8a072a4 100644 --- a/gnome-base/gnome-shell/Manifest +++ b/gnome-base/gnome-shell/Manifest @@ -1,3 +1,3 @@ DIST gnome-shell-2.27.3.tar.bz2 481213 RMD160 2e6b3ee8547f47d8ad3ef55a159f444ccd36d439 SHA1 794efcbb8e5cf18d80887c6a89c52158da7fd5a9 SHA256 22a5b0124abaf32b6833fb453c5836150eebb33da115c700a89dcc6298d41a3a -EBUILD gnome-shell-2.27.3.ebuild 1171 RMD160 79d0b30924716fe91971e84320178c7176490778 SHA1 8763e2dcc1a0ee3b8ce71df404dba0fdc039537e SHA256 6f9b441f23cc55f0cdce9afcb4943684634bf74af7f7057e24b1311f5f9850f1 -EBUILD gnome-shell-9999.ebuild 1355 RMD160 9207e2abecb0bf51a0e7e6fbef8754f18a908a9b SHA1 57411c5930f3801451f955239dbac3b3fdb2a072 SHA256 cc2f570a7bc94a3ec6c6fda2a0d01358daba34f85b76264dc04136eee4f27aed +EBUILD gnome-shell-2.27.3.ebuild 916 RMD160 cffb17f4398c5a5587e0d4c050a5fd24fa264eaa SHA1 8080c1982241015577b60e8b009036601b3b5035 SHA256 39c117506b8d6d19fb5537f21b3064a98a2aba82674b36171ad4f6bf30efa028 +EBUILD gnome-shell-9999.ebuild 1243 RMD160 4f94818b825c0a15e3ed37204791a716432e68e3 SHA1 8543c3a0fe7e6afc0d18d952bbdc0e3354ff1304 SHA256 e0374ad5822e0297f3f936c8d6912310dc18ad9118b562df6ecadb7c78e41b55 diff --git a/gnome-base/gnome-shell/gnome-shell-2.27.3.ebuild b/gnome-base/gnome-shell/gnome-shell-2.27.3.ebuild index 1ed570d..68f2c74 100644 --- a/gnome-base/gnome-shell/gnome-shell-2.27.3.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-2.27.3.ebuild @@ -6,45 +6,38 @@ EAPI="2" inherit gnome2 -DESCRIPTION="The GNOME Shell for GNOME 3.0" +DESCRIPTION="Provides core UI functions for the GNOME 3 desktop" HOMEPAGE="http://live.gnome.org/GnomeShell" -LICENSE="GPL-2 FDL-1.1 LGPL-2" +LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND=">=gnome-base/gnome-desktop-2.26.0 - >=dev-libs/glib-2.18.0 - >=x11-libs/gtk+-2.15.1 - >=x11-wm/mutter-2.27.3 - >=dev-libs/gjs-0.4 +RDEPEND=">=dev-libs/glib-2.20 + >=x11-libs/gtk+-2.16 + >=media-libs/gstreamer-0.10.16 + >=media-libs/gst-plugins-base-0.10.16 + >=gnome-base/gnome-desktop-2.26 >=dev-libs/gobject-introspection-0.6.5 - >=dev-libs/gir-repository-0.6.4[pango] - >=gnome-base/gconf-2.6.1 - >=gnome-base/gnome-menus-2.11.1 + + dev-libs/dbus-glib + dev-libs/gjs + media-libs/clutter:1.0[opengl,introspection] + + gnome-base/gconf + gnome-base/gnome-menus gnome-base/librsvg - >=dev-libs/dbus-glib-0.71 - >=sys-apps/dbus-1.1.2 - x11-libs/libXau - x11-apps/mesa-progs - >=x11-libs/startup-notification-0.10" + + x11-libs/startup-notification + x11-libs/libXfixes + x11-wm/mutter[introspection] +" DEPEND="${RDEPEND} >=dev-lang/python-2.5 - gnome-base/gnome-common - >=app-text/gnome-doc-utils-0.3.2 + sys-devel/gettext >=dev-util/pkgconfig-0.9 - >=dev-util/intltool-0.40 - ~app-text/docbook-xml-dtd-4.1.2 - >=dev-util/gtk-doc-am-1" - -DOCS="AUTHORS README" - -pkg_postinst() { - - elog " Start with 'gnome-shell --replace' " - elog " or add gnome-shell.desktop to ~/.config/autostart/ " - - gnome2_pkg_postinst - -} + >=dev-util/intltool-0.26 + gnome-base/gnome-common +" +DOCS="AUTHORS ChangeLog NEWS README" diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild index 018a75c..93fd5aa 100644 --- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild @@ -4,44 +4,46 @@ EAPI="2" -inherit autotools eutils gnome2 git +inherit autotools gnome2 git EGIT_REPO_URI="git://git.gnome.org/gnome-shell" -DESCRIPTION="The GNOME Shell for GNOME 3.0" +DESCRIPTION="Provides core UI functions for the GNOME 3 desktop" HOMEPAGE="http://live.gnome.org/GnomeShell" SRC_URI="" -LICENSE="GPL-2 FDL-1.1 LGPL-2" +LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~amd64 ~x86" IUSE="" -RDEPEND=">=gnome-base/gnome-desktop-2.26.0 - >=dev-libs/glib-2.18.0 - >=x11-libs/gtk+-2.15.1 - >=x11-wm/mutter-2.27.3 - >=dev-libs/gjs-0.4 +RDEPEND=">=dev-libs/glib-2.20 + >=x11-libs/gtk+-2.16 + >=media-libs/gstreamer-0.10.16 + >=media-libs/gst-plugins-base-0.10.16 + >=gnome-base/gnome-desktop-2.26 >=dev-libs/gobject-introspection-0.6.5 - >=dev-libs/gir-repository-0.6.4[pango] - >=gnome-base/gconf-2.6.1 - >=gnome-base/gnome-menus-2.11.1 + + dev-libs/dbus-glib + dev-libs/gjs + media-libs/clutter:1.0[opengl,introspection] + + gnome-base/gconf + gnome-base/gnome-menus gnome-base/librsvg - >=dev-libs/dbus-glib-0.71 - >=sys-apps/dbus-1.1.2 - x11-libs/libXau - x11-apps/mesa-progs - >=x11-libs/startup-notification-0.10" + + x11-libs/startup-notification + x11-libs/libXfixes + x11-wm/mutter[introspection] +" DEPEND="${RDEPEND} >=dev-lang/python-2.5 - gnome-base/gnome-common - >=app-text/gnome-doc-utils-0.3.2 + sys-devel/gettext >=dev-util/pkgconfig-0.9 - >=dev-util/intltool-0.40 - ~app-text/docbook-xml-dtd-4.1.2 - >=dev-util/gtk-doc-am-1" - -DOCS="AUTHORS README" + >=dev-util/intltool-0.26 + gnome-base/gnome-common +" +DOCS="AUTHORS ChangeLog NEWS README" src_unpack() { git_src_unpack diff --git a/media-libs/clutter/Manifest b/media-libs/clutter/Manifest index 3ff7021..192c470 100644 --- a/media-libs/clutter/Manifest +++ b/media-libs/clutter/Manifest @@ -1,4 +1,4 @@ AUX clutter-1.0.4-disable-tests.patch 1445 RMD160 95018f8fce1d4c2d47ebd16402a02f2c86e0fdbc SHA1 f355cb8f13cb8fd4e192c925ea23efb8ac64f40b SHA256 5e168f0854c0883fc96ae489947b5b4e3b3f5ca36b6b0b461b5acfcd36e0c815 -DIST clutter-1.0.4.tar.bz2 2040023 RMD160 4fd2d032df0e45aab574f4388275a9d1ff234148 SHA1 91476f5c3089bab35dfb1c3a0bc18c44f161b6f0 SHA256 56d9751f5623dbd8554a120deb9e47f4426cedd992daa0f41516b25f05d78cf7 -EBUILD clutter-1.0.4.ebuild 2124 RMD160 b3a052b4246020734369f346f42d2dcc3ad3d908 SHA1 6f5b2fb0831330f031eb67e0d1408f7b5edb86d3 SHA256 3f7d845c53f5d0cb2b91d4af1d929993b3764cbb2829a05282ac75147051abe8 +DIST clutter-1.0.6.tar.bz2 2013007 RMD160 75bc9ff62f95a0d8652028cdaaab89909c900c23 SHA1 abad9f13ce5bbede19170ebe8e36bd1a5ffa8154 SHA256 e06fb296e191d0ec6ed813d9c6013cbe1cd2f7ca569c11f04079e3a04f08bed8 +EBUILD clutter-1.0.6.ebuild 2031 RMD160 b6d1a76dbce1210e330cbf663963cd8f6cb9854d SHA1 9e744890ce9c58363a475e2a7d990072e6ddc7f5 SHA256 62e6d8d73a630ed831069437bbf48d5fa48b2b2730a79b8b3ded26b0d12e7b5e MISC metadata.xml 602 RMD160 fa6d7f9c710892075862023297970fc261c1394c SHA1 28e1b953378601a1b93231f64a82e47a384852ce SHA256 8c76b22622c2c0793629693cfa507367f65221a1bce7b5d65c13605353718efb diff --git a/media-libs/clutter/clutter-1.0.4.ebuild b/media-libs/clutter/clutter-1.0.6.ebuild index ab473cc..7a4c91e 100644 --- a/media-libs/clutter/clutter-1.0.4.ebuild +++ b/media-libs/clutter/clutter-1.0.6.ebuild @@ -3,22 +3,19 @@ # $Header: $ EAPI="2" -GCONF_DEBUG="no" -WANT_AUTOMAKE="1.9" -inherit gnome2 clutter autotools +inherit autotools clutter DESCRIPTION="Clutter is a library for creating graphical user interfaces" -KEYWORDS="~amd64 ~x86" -IUSE="debug doc +gtk introspection +opengl sdl" SLOT="1.0" +KEYWORDS="~amd64 ~x86" +IUSE="debug doc +gtk introspection +opengl" -RDEPEND="${RDEPEND} - >=dev-libs/glib-2.16 +RDEPEND=">=dev-libs/glib-2.16 >=x11-libs/cairo-1.4 >=x11-libs/pango-1.20 - + gtk? ( >=x11-libs/gtk+-2.0 ) opengl? ( virtual/opengl @@ -30,64 +27,62 @@ RDEPEND="${RDEPEND} >=x11-libs/libXfixes-3 >=x11-libs/libXcomposite-0.4 ) - !opengl? ( sdl? ( media-libs/libsdl ) ) + !opengl? ( media-libs/libsdl ) " DEPEND="${RDEPEND} - ${DEPEND} + sys-devel/gettext + dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1.11 >=app-text/docbook-sgml-utils-0.6.14[jadetex] app-text/xmlto ) introspection? ( - >=dev-libs/gobject-introspection-0.6.3 + >=dev-libs/gobject-introspection-0.6.4 >=dev-libs/gir-repository-0.6.3[pango] )" -pkg_setup() { - local errmsg="Select either opengl or sdl as your renderer" +src_configure() { + local myconf="" if use opengl; then - if use sdl; then - ewarn "Both 'opengl' and 'sdl' USE flags selected" - ewarn "Selecting opengl/glx (default)..." - fi elog "Using GLX for OpenGL backend" - G2CONF="${G2CONF} --with-flavour=glx" - elif use sdl; then - elog "Using SDL for OpenGL backend" - G2CONF="${G2CONF} --with-flavour=sdl" + myconf="${myconf} --with-flavour=glx" else - eerror "${errmsg}" - die "${errmsg}" + elog "Using SDL for OpenGL backend" + myconf="${myconf} --with-flavour=sdl" fi if use gtk; then - G2CONF="${G2CONF} --with-imagebackend=gdk-pixbuf" + myconf="${myconf} --with-imagebackend=gdk-pixbuf" else - G2CONF="${G2CONF} --with-imagebackend=internal" + myconf="${myconf} --with-imagebackend=internal" # Internal image backend is experimental ewarn "You have selected the experimental internal image backend" fi - if use debug; then - G2CONF="${G2CONF} - --enable-debug=yes - --enable-cogl-debug=yes" + if ! use debug; then + myconf="${myconf} + --enable-debug=minimum + --enable-cogl-debug=minimum" fi - # XXX: Tests are interactive, not of use for us + # FIXME: Tests are interactive, not of use for us # FIXME: Using external json-glib breaks introspection - G2CONF="${G2CONF} + myconf="${myconf} --disable-tests --enable-maintainer-flags=no --enable-xinput --with-json=internal $(use_enable introspection) $(use_enable doc manual)" + econf ${myconf} } src_prepare() { - # Tests are interactive, not of use for us - epatch "${FILESDIR}/${P}-disable-tests.patch" + # Make it libtool-1 compatible + rm -v build/autotools/lt* build/autotools/libtool.m4 || die "removing libtool macros failed" + + # FIXME: Tests are interactive, not of use for us + epatch "${FILESDIR}/${PN}-1.0.0-disable-tests.patch" eautoreconf } diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest index ee0c24e..dea9e27 100644 --- a/x11-wm/mutter/Manifest +++ b/x11-wm/mutter/Manifest @@ -1,4 +1,3 @@ DIST mutter-2.27.5.tar.bz2 1993935 RMD160 638cbe72fdcbccef1e43ad07707ca62b6bab1943 SHA1 6b54f677e523a18ea492b45096d9b14841bbdf1d SHA256 975360ba63a68554d97f6f6491617e029a862728fad0ab6f70f2724a6fa5f1b7 -EBUILD mutter-2.27.5.ebuild 1528 RMD160 fcf61e816600a0af8a0d09878f60325639708cd6 SHA1 8c48d93cdad8ab03f918eb27197662df681bbbac SHA256 40102848ed34acb6e0531c7a12fee05ab45c2c59866825ae443a737cf97a1336 -EBUILD mutter-9999.ebuild 1486 RMD160 9055a86fef628d4bb214cef0b23458b70a9f5fae SHA1 122d9e5a7c2a7b4ccb1db0b10004934a5708b36e SHA256 1a0d578bb155aca30dbb3ea442877ee98401e470b46eb7a75c9672e814140fda -MISC metadata.xml 595 RMD160 e354511f8cf82c440781b7d2f2f48af495ac0ae2 SHA1 82abd21f65ca6e7275bc32aee890fe124ade7092 SHA256 977b829df1bda476da07f5be78d64cf40f86c5e3232e2f72554c3112d1621acb +EBUILD mutter-2.27.5.ebuild 1368 RMD160 c3a0734034af6bbf282f6f1eb33809517962c76a SHA1 3088aeb488fdc75384bcb2e73e226a0985c16e04 SHA256 988f8af832cc0cc9e0ba9e028997a162331cbd36bbcc7a818436b92e819c647a +EBUILD mutter-9999.ebuild 1540 RMD160 efaed58b1ea5fff96ab22db55cf0ba8903cf4ff7 SHA1 0437ef8e4fda229168612c55e5183ad1ace3833f SHA256 215db8000d9d36174526bec685799262224d3cdc1d7d5dd3a6e66babed777943 diff --git a/x11-wm/mutter/metadata.xml b/x11-wm/mutter/metadata.xml deleted file mode 100644 index 34e9b06..0000000 --- a/x11-wm/mutter/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<use> - <flag name="fuse">Enables support for the filesystem in userspace plugin through <pkg>sys-fs/fuse</pkg>.</flag> - <flag name="kde4">Compile the kde4 window decorator and add support for <pkg>kde-base/kdebase-startkde:4.1</pkg>.</flag> - <flag name="annotate">Build the annotate plugin</flag> -</use> -<herd>desktop-effects</herd> -<longdescription> -compiz is a compositing window manager that uses 3D graphics acceleration via OpenGL. -</longdescription> -</pkgmetadata> diff --git a/x11-wm/mutter/mutter-2.27.5.ebuild b/x11-wm/mutter/mutter-2.27.5.ebuild index 784b89f..23fbd5c 100644 --- a/x11-wm/mutter/mutter-2.27.5.ebuild +++ b/x11-wm/mutter/mutter-2.27.5.ebuild @@ -4,15 +4,15 @@ EAPI="2" -inherit eutils gnome2 +inherit gnome2 -DESCRIPTION="New GNOME window manager" +DESCRIPTION="Upcoming GNOME 3 window manager (derived from metacity)" HOMEPAGE="http://blogs.gnome.org/metacity/" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="test xinerama" +KEYWORDS="~amd64 ~x86" +IUSE="debug introspection test xinerama" RDEPEND=">=x11-libs/gtk+-2.10 >=x11-libs/pango-1.2[X] @@ -20,19 +20,21 @@ RDEPEND=">=x11-libs/gtk+-2.10 >=dev-libs/glib-2.6 >=x11-libs/startup-notification-0.7 >=x11-libs/libXcomposite-0.2 - x11-libs/libXfixes - x11-libs/libXrender - x11-libs/libXdamage - x11-libs/libXcursor + + media-libs/clutter:1.0 + x11-libs/libICE + x11-libs/libSM x11-libs/libX11 - xinerama? ( x11-libs/libXinerama ) + x11-libs/libXcursor + x11-libs/libXdamage x11-libs/libXext + x11-libs/libXfixes x11-libs/libXrandr - x11-libs/libSM - x11-libs/libICE + x11-libs/libXrender + + introspection? ( dev-libs/gobject-introspection ) + xinerama? ( x11-libs/libXinerama ) gnome-extra/zenity - >=media-libs/clutter-1.0[introspection] - >=dev-libs/gir-repository-0.6.4 !x11-misc/expocity" DEPEND="${RDEPEND} >=app-text/gnome-doc-utils-0.8 @@ -44,7 +46,7 @@ DEPEND="${RDEPEND} x11-proto/xextproto x11-proto/xproto" -DOCS="AUTHORS ChangeLog HACKING NEWS README *.txt doc/*.txt" +DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README *.txt doc/*.txt" pkg_setup() { G2CONF="${G2CONF} @@ -53,15 +55,7 @@ pkg_setup() { --enable-sm --enable-startup-notification --enable-xsync + --enable-verbose-mode + $(use_with introspection) $(use_enable xinerama)" } - -src_prepare() { - gnome2_src_prepare - - # Remove stupid CFLAGS, bug #259179 - sed "s:-Werror::g" -i configure.in configure || die "sed failed" - - export XDG_DATA_DIRS="${XDG_DATA_DIRS} ${WORKDIR}/${P}/src/include" - -} diff --git a/x11-wm/mutter/mutter-9999.ebuild b/x11-wm/mutter/mutter-9999.ebuild index 0889ed0..039fb0a 100644 --- a/x11-wm/mutter/mutter-9999.ebuild +++ b/x11-wm/mutter/mutter-9999.ebuild @@ -4,18 +4,18 @@ EAPI="2" -inherit autotools eutils gnome2 git +inherit autotools gnome2 git EGIT_REPO_URI="git://git.gnome.org/mutter" -DESCRIPTION="New GNOME window manager" +DESCRIPTION="Upcoming GNOME 3 window manager (derived from metacity)" HOMEPAGE="http://blogs.gnome.org/metacity/" SRC_URI="" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="test xinerama" +KEYWORDS="~amd64 ~x86" +IUSE="debug introspection test xinerama" RDEPEND=">=x11-libs/gtk+-2.10 >=x11-libs/pango-1.2[X] @@ -23,19 +23,21 @@ RDEPEND=">=x11-libs/gtk+-2.10 >=dev-libs/glib-2.6 >=x11-libs/startup-notification-0.7 >=x11-libs/libXcomposite-0.2 - x11-libs/libXfixes - x11-libs/libXrender - x11-libs/libXdamage - x11-libs/libXcursor + + media-libs/clutter:1.0 + x11-libs/libICE + x11-libs/libSM x11-libs/libX11 - xinerama? ( x11-libs/libXinerama ) + x11-libs/libXcursor + x11-libs/libXdamage x11-libs/libXext + x11-libs/libXfixes x11-libs/libXrandr - x11-libs/libSM - x11-libs/libICE + x11-libs/libXrender + + introspection? ( dev-libs/gobject-introspection ) + xinerama? ( x11-libs/libXinerama ) gnome-extra/zenity - >=media-libs/clutter-1.0[introspection] - >=dev-libs/gir-repository-0.6.4 !x11-misc/expocity" DEPEND="${RDEPEND} >=app-text/gnome-doc-utils-0.8 @@ -47,7 +49,7 @@ DEPEND="${RDEPEND} x11-proto/xextproto x11-proto/xproto" -DOCS="AUTHORS ChangeLog HACKING NEWS README *.txt doc/*.txt" +DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README *.txt doc/*.txt" pkg_setup() { G2CONF="${G2CONF} @@ -56,6 +58,8 @@ pkg_setup() { --enable-sm --enable-startup-notification --enable-xsync + --enable-verbose-mode + $(use_with introspection) $(use_enable xinerama)" } |