summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-libs/gjs/Manifest3
-rw-r--r--dev-libs/gjs/gjs-0.7.7.ebuild57
-rw-r--r--dev-libs/gjs/gjs-9999.ebuild60
-rw-r--r--dev-libs/glib/Manifest9
-rw-r--r--dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch39
-rw-r--r--dev-libs/glib/files/glib-2.12.12-fbsd.patch21
-rw-r--r--dev-libs/glib/files/glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch20
-rw-r--r--dev-libs/glib/files/glib-2.24-assert-test-failure.patch19
-rw-r--r--dev-libs/glib/files/glib-2.25-punt-python-check.patch20
-rw-r--r--dev-libs/glib/files/glib-2.25-skip-tests-with-dbus-keyring.patch22
-rw-r--r--dev-libs/glib/files/glib-2.6.3-testglib-ssp.patch11
-rw-r--r--dev-libs/glib/glib-2.27.4.ebuild135
-rw-r--r--eclass/gnome2.eclass15
-rw-r--r--gnome-base/gnome-desktop/Manifest4
-rw-r--r--gnome-base/gnome-desktop/gnome-desktop-2.91.0.ebuild53
-rw-r--r--gnome-base/gnome-desktop/gnome-desktop-2.91.3.ebuild53
-rw-r--r--gnome-base/gnome-settings-daemon/Manifest3
-rw-r--r--gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.30.0-gst-vol-control-support.patch856
-rw-r--r--gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.91.5.ebuild87
-rw-r--r--gnome-base/gnome-shell/Manifest5
-rw-r--r--gnome-base/gnome-shell/gnome-shell-2.91.1.ebuild58
-rw-r--r--gnome-base/gnome-shell/gnome-shell-2.91.2.ebuild58
-rw-r--r--gnome-base/gnome-shell/gnome-shell-9999.ebuild68
-rw-r--r--gnome-base/gsettings-desktop-schemas/Manifest3
-rw-r--r--gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-0.1.2.ebuild21
-rw-r--r--gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-9999.ebuild29
-rw-r--r--gnome-base/gvfs/Manifest6
-rw-r--r--gnome-base/gvfs/files/gvfs-1.2.2-expose-archive-backend.patch56
-rw-r--r--gnome-base/gvfs/files/gvfs-1.2.2-gphoto2-stricter-checks.patch28
-rw-r--r--gnome-base/gvfs/files/gvfs-1.6.4-sftp-timeout.patch30
-rw-r--r--gnome-base/gvfs/files/gvfs-glib-2.27-port.patch388
-rw-r--r--gnome-base/gvfs/gvfs-1.7.0.ebuild107
-rw-r--r--gnome-base/libgnomekbd/Manifest2
-rw-r--r--gnome-base/libgnomekbd/libgnomekbd-2.91.3.1.ebuild38
-rw-r--r--media-libs/clutter/Manifest8
-rw-r--r--media-libs/clutter/clutter-1.5.8.ebuild83
-rw-r--r--media-libs/clutter/files/clutter-9999-perfneu1.patch248
-rw-r--r--media-libs/clutter/files/clutter-9999-perfneu2.patch123
-rw-r--r--media-libs/clutter/files/clutter-9999-perfneu3.patch30
-rw-r--r--media-libs/clutter/files/clutter-9999-perfneu4.patch128
-rw-r--r--media-libs/clutter/files/clutter-9999-perfneu5.patch566
-rw-r--r--media-libs/clutter/files/clutter-9999-perfneu6.patch96
-rw-r--r--media-libs/libcanberra/Manifest2
-rw-r--r--media-libs/libcanberra/libcanberra-0.26-r1.ebuild62
-rw-r--r--profiles/package.mask19
-rw-r--r--x11-libs/gtk+/Manifest2
-rw-r--r--x11-libs/gtk+/gtk+-2.91.5.ebuild156
-rw-r--r--x11-libs/libnotify/Manifest2
-rw-r--r--x11-libs/libnotify/libnotify-0.7.0.ebuild27
-rw-r--r--x11-themes/gnome-themes-standard/Manifest3
-rw-r--r--x11-themes/gnome-themes-standard/gnome-themes-standard-2.91.2.1.ebuild28
-rw-r--r--x11-themes/gnome-themes-standard/gnome-themes-standard-9999.ebuild38
-rw-r--r--x11-themes/gtk-theme-engine-clearlooks/Manifest3
-rw-r--r--x11-themes/gtk-theme-engine-clearlooks/gtk-theme-engine-clearlooks-2.91.3.ebuild33
-rw-r--r--x11-themes/gtk-theme-engine-clearlooks/gtk-theme-engine-clearlooks-9999.ebuild43
-rw-r--r--x11-wm/mutter/Manifest3
-rw-r--r--x11-wm/mutter/mutter-2.91.2.ebuild66
-rw-r--r--x11-wm/mutter/mutter-9999.ebuild71
58 files changed, 15 insertions, 4209 deletions
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
deleted file mode 100644
index f1ddc95..0000000
--- a/dev-libs/gjs/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gjs-0.7.7.tar.bz2 485317 RMD160 4b16c290e060833cee86b2637196c719109b0599 SHA1 fd602d7dc4ce8ea5f04f4ba802afd3e28e15a989 SHA256 30fd38a589dc5520604718b416564f4db4f23c5821c46beaced35e4af0bf4318
-EBUILD gjs-0.7.7.ebuild 1163 RMD160 d63b13f27db079440b6680c9d39acdaa6cbdab12 SHA1 27665ef438ff5b732d7f69b9b9ffe7ba1cb87b7b SHA256 69258c86896f9ccb076fd45e97e90ab5a34a1f2931ad707f30ee34bc95450fde
-EBUILD gjs-9999.ebuild 1219 RMD160 1b355b2231b503ae95a07874b47d8d8b0da9da0c SHA1 a5b1f186a9d5aa2abecb18a7dcfcd22169c34f78 SHA256 9174ae5850dca23acff8a56134bb99d32aa2a0c5474498371182fb255ad8bf25
diff --git a/dev-libs/gjs/gjs-0.7.7.ebuild b/dev-libs/gjs/gjs-0.7.7.ebuild
deleted file mode 100644
index 91b19cf..0000000
--- a/dev-libs/gjs/gjs-0.7.7.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-GCONF_DEBUG="no"
-PYTHON_DEPEND="2"
-
-inherit autotools gnome2 python
-
-DESCRIPTION="Javascript bindings for GNOME"
-HOMEPAGE="http://live.gnome.org/Gjs"
-
-LICENSE="MIT MPL-1.1 LGPL-2 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="coverage examples"
-
-RDEPEND=">=dev-libs/glib-2.18:2
- >=dev-libs/gobject-introspection-0.9.5
-
- dev-libs/dbus-glib
- x11-libs/cairo
- >=net-libs/xulrunner-1.9.2:1.9"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- >=dev-util/pkgconfig-0.9
- coverage? (
- sys-devel/gcc
- dev-util/lcov )"
-
-# tests fail and upstream does not support anything but git master
-RESTRICT="test"
-
-pkg_setup() {
- # AUTHORS, ChangeLog are empty
- DOCS="NEWS README"
- G2CONF="${G2CONF}
- $(use_enable coverage)"
-}
-
-src_prepare() {
- gnome2_src_prepare
- python_convert_shebangs 2 "${S}"/scripts/make-tests
- eautoreconf
-}
-
-src_install() {
- gnome2_src_install
-
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins ${S}/examples/* || die "doins examples failed!"
- fi
-
- find "${ED}" -name "*.la" -delete || die "la files removal failed"
-}
diff --git a/dev-libs/gjs/gjs-9999.ebuild b/dev-libs/gjs/gjs-9999.ebuild
deleted file mode 100644
index 4d2d27e..0000000
--- a/dev-libs/gjs/gjs-9999.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-GCONF_DEBUG="no"
-PYTHON_DEPEND="2"
-
-inherit autotools gnome2 python git
-
-EGIT_REPO_URI="git://git.gnome.org/gjs"
-
-DESCRIPTION="Javascript bindings for GNOME"
-HOMEPAGE="http://live.gnome.org/Gjs"
-SRC_URI=""
-
-LICENSE="MIT MPL-1.1 LGPL-2 GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="coverage examples"
-
-RDEPEND=">=dev-libs/glib-2.18:2
- >=dev-libs/gobject-introspection-0.9.5
-
- dev-libs/dbus-glib
- x11-libs/cairo
- >=net-libs/xulrunner-1.9.2:1.9"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- >=dev-util/pkgconfig-0.9
- coverage? (
- sys-devel/gcc
- dev-util/lcov )"
-
-# tests fail and upstream does not support anything but git master
-RESTRICT="test"
-
-pkg_setup() {
- # AUTHORS, ChangeLog are empty
- DOCS="NEWS README"
- G2CONF="${G2CONF}
- $(use_enable coverage)"
-}
-
-src_prepare() {
- gnome2_src_prepare
- python_convert_shebangs 2 "${S}"/scripts/make-tests
- eautoreconf
-}
-
-src_install() {
- gnome2_src_install
-
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins ${S}/examples/* || die "doins examples failed!"
- fi
-
- find "${ED}" -name "*.la" -delete || die "la files removal failed"
-}
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
deleted file mode 100644
index a6dbffe..0000000
--- a/dev-libs/glib/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX glib-2.10.3-ia64-atomic-ops.patch 1058 RMD160 066e63a99739dc412fbed7f773118323f53ea774 SHA1 13c22e2f75a77e9e0546e495fd28015ddcb8bade SHA256 ad9cad6793626b4e36a59aa6cb839607847aa57ebc37592fd1e273ccd23a53c8
-AUX glib-2.12.12-fbsd.patch 668 RMD160 d8bf399b7e0b417c4622b278282086418c1d3363 SHA1 b7a0f4d67083f2c9b4bbecd84a6d597dd0f0f9ed SHA256 23b0dc406d3d45fe125268b731af67147e83f6e38a63c7892828bdbfe1c31e8d
-AUX glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch 616 RMD160 dd06abe9298d6e3e4d3eda0d5d155f1545dfd1aa SHA1 92164aa1b29f49cf62fc366231f2046b8b3def52 SHA256 e64ad4fbd67f142f5a19b29eab323bf18856309ed064e7a9f838b6c1c38a8adb
-AUX glib-2.24-assert-test-failure.patch 724 RMD160 011da2b341281d14741e715eddd401968464608d SHA1 76149f52677a337569dbab1b5f664c8fc16d44ff SHA256 1e3d290455d6bbc3a4f69d7b8abdeb559a01c8cd30dc311641e1cb0b7f84c6af
-AUX glib-2.25-punt-python-check.patch 541 RMD160 93fe958f07c2e03abb3abf95eaa0273b0822d874 SHA1 a9b0b50847f00773254b55238785f65f516ff4ad SHA256 eea2b3a2692b93c98ff06b26b784a264391bc61f8434d101c30cb14802234a3e
-AUX glib-2.25-skip-tests-with-dbus-keyring.patch 933 RMD160 20eb4c83cffca42aca845dc74cc2a67803c5df6c SHA1 f845fa3cc991330aa3dcdfbec8426501261a8c70 SHA256 930cdfe8f3b46c20826057b5771f953172c97fed8b3e509f4fde13094ff1c251
-AUX glib-2.6.3-testglib-ssp.patch 344 RMD160 6709acf85c52e39553e2e5ee93637f7e9cc7eca6 SHA1 403b249a460a9700669e754a562fb6974f3d6898 SHA256 c2ece3d7b4533e3bfbe8100df5d0824176d9dfa0b18697a8919162956c8ebfa8
-DIST glib-2.27.4.tar.bz2 6876218 RMD160 f992d7a069ef8195696cc7c9778993cc0cfe0810 SHA1 4ffdd4dd8a9e4d6ffea5939edddbbc755aed6d0e SHA256 71367cbf45998f736d7998282bc62fdefe13544a2c8ca523d9e5e9cc212758e6
-EBUILD glib-2.27.4.ebuild 4396 RMD160 e7e17396129ee6bafe41b8b452e49cff05a3041a SHA1 0fd2a437624f50ce186d5b5a07bcd41b2d4f40ba SHA256 385d5adc658fc8ab2452d1437f3709d812c2316023b451824b6abfdaedb66e41
diff --git a/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch b/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch
deleted file mode 100644
index 0859e33..0000000
--- a/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From Debian, this one is needed for gcc < 4.1...
-
---- glib-2.10.0/glib/gatomic.c 2006-02-24 14:02:51.000000000 +0000
-+++ glib-2.10.0/glib/gatomic.c 2006-03-06 18:12:06.000000000 +0000
-@@ -414,14 +414,14 @@
- g_atomic_int_exchange_and_add (volatile gint *atomic,
- gint val)
- {
-- return __sync_fetch_and_add (atomic, val);
-+ return __sync_fetch_and_add_si (atomic, val);
- }
-
- void
- g_atomic_int_add (volatile gint *atomic,
- gint val)
- {
-- __sync_fetch_and_add (atomic, val);
-+ __sync_fetch_and_add_si (atomic, val);
- }
-
- gboolean
-@@ -429,7 +429,7 @@
- gint oldval,
- gint newval)
- {
-- return __sync_bool_compare_and_swap (atomic, oldval, newval);
-+ return __sync_bool_compare_and_swap_si (atomic, oldval, newval);
- }
-
- gboolean
-@@ -437,7 +437,7 @@
- gpointer oldval,
- gpointer newval)
- {
-- return __sync_bool_compare_and_swap ((long *)atomic,
-+ return __sync_bool_compare_and_swap_di ((long *)atomic,
- (long)oldval, (long)newval);
- }
-
diff --git a/dev-libs/glib/files/glib-2.12.12-fbsd.patch b/dev-libs/glib/files/glib-2.12.12-fbsd.patch
deleted file mode 100644
index bba6329..0000000
--- a/dev-libs/glib/files/glib-2.12.12-fbsd.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN glib-2.12.12.orig/gmodule/gmodule-dl.c glib-2.12.12/gmodule/gmodule-dl.c
---- glib-2.12.12.orig/gmodule/gmodule-dl.c 2007-05-01 19:12:40.000000000 -0400
-+++ glib-2.12.12/gmodule/gmodule-dl.c 2007-07-05 20:10:51.000000000 -0400
-@@ -106,6 +106,7 @@ _g_module_open (const gchar *file_name,
- static gpointer
- _g_module_self (void)
- {
-+#ifndef __FreeBSD__
- gpointer handle;
-
- /* to query symbols from the program itself, special link options
-@@ -117,6 +118,9 @@ _g_module_self (void)
- g_module_set_error (fetch_dlerror (TRUE));
-
- return handle;
-+#else
-+ return RTLD_DEFAULT;
-+#endif
- }
-
- static void
diff --git a/dev-libs/glib/files/glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch b/dev-libs/glib/files/glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch
deleted file mode 100644
index cabe56f..0000000
--- a/dev-libs/glib/files/glib-2.18.1-workaround-gio-test-failure-without-userpriv.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Temporary workaround for gio tests failure when ran without FEATURES=userpriv
-until upstream bug #552912 is fixed
-
---- gio/tests/live-g-file.c.orig 2008-09-25 05:44:12.848556034 +0300
-+++ gio/tests/live-g-file.c 2008-09-25 06:12:34.248726237 +0300
-@@ -769,11 +769,14 @@
- if (posix_compat)
- {
- /* target directory is not accessible (no execute flag) */
-+#if 0
-+/* Fails when ran as root */
- do_copy_move (root, item, TEST_DIR_NO_ACCESS,
- TEST_NO_ACCESS);
- /* target directory is readonly */
- do_copy_move (root, item, TEST_DIR_NO_WRITE,
- TEST_NO_ACCESS);
-+#endif
- }
- }
- }
diff --git a/dev-libs/glib/files/glib-2.24-assert-test-failure.patch b/dev-libs/glib/files/glib-2.24-assert-test-failure.patch
deleted file mode 100644
index 6d8e74f..0000000
--- a/dev-libs/glib/files/glib-2.24-assert-test-failure.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Tests fail when upgrading glib from 2.22 to 2.24 if sys-devel/gdb is installed
-because gdb is run on .libs/assert-msg-test before LD_LIBRARY_PATH is set. This
-causes gdb to use the system-wide glib instead, and fail on the test.
-
-This patch exports LD_LIBRARY_PATH before running gdb
-
-https://bugzilla.gnome.org/621368
-
----
---- tests/run-assert-msg-test.sh
-+++ tests/run-assert-msg-test.sh
-@@ -34,6 +34,7 @@ if [ -e ".libs/lt-$msg_test" ]; then
- msg_test="lt-$msg_test"
- fi
- echo_v "Running gdb on assert-msg-test"
-+export LD_LIBRARY_PATH="`dirname $PWD`/glib/.libs:$LD_LIBRARY_PATH"
- OUT=$(gdb --batch --ex run --ex "print (char*) __glib_assert_msg" .libs/$msg_test 2> $error_out) || \
- fail "failed to run gdb"
-
diff --git a/dev-libs/glib/files/glib-2.25-punt-python-check.patch b/dev-libs/glib/files/glib-2.25-punt-python-check.patch
deleted file mode 100644
index 077ebf4..0000000
--- a/dev-libs/glib/files/glib-2.25-punt-python-check.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Remove python detection from configure.in, we won't be installing the gdb python
-scripts anymore. They use a redhat-specific gdb module that has not been
-upstreamed yet.
-
-https://bugs.gentoo.org/291328
-https://bugzilla.gnome.org/623552
----
---- configure.ac
-+++ configure.ac
-@@ -379,10 +379,6 @@ if test "x$PERL_PATH" = x ; then
- fi
- AC_SUBST(PERL_PATH)
-
--# Need suitable python path for greport
--AM_PATH_PYTHON(2.4,,PYTHON="/usr/bin/env python2.4")
--
--
- dnl ***********************
- dnl *** Tests for iconv ***
- dnl ***********************
diff --git a/dev-libs/glib/files/glib-2.25-skip-tests-with-dbus-keyring.patch b/dev-libs/glib/files/glib-2.25-skip-tests-with-dbus-keyring.patch
deleted file mode 100644
index baca1ec..0000000
--- a/dev-libs/glib/files/glib-2.25-skip-tests-with-dbus-keyring.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- gio/tests/gdbus-peer.c.orig 2010-08-28 20:06:11.000000000 +0300
-+++ gio/tests/gdbus-peer.c 2010-08-28 20:06:21.000000000 +0300
-@@ -1448,7 +1448,7 @@
-
- g_test_add_func ("/gdbus/peer-to-peer", test_peer);
- g_test_add_func ("/gdbus/delayed-message-processing", delayed_message_processing);
-- g_test_add_func ("/gdbus/nonce-tcp", test_nonce_tcp);
-+ //g_test_add_func ("/gdbus/nonce-tcp", test_nonce_tcp);
- g_test_add_func ("/gdbus/credentials", test_credentials);
- g_test_add_func ("/gdbus/overflow", test_overflow);
-
---- gio/tests/gdbus-non-socket.c.orig 2010-08-28 20:36:52.000000000 +0300
-+++ gio/tests/gdbus-non-socket.c 2010-08-28 20:37:02.000000000 +0300
-@@ -336,7 +336,7 @@
- /* all the tests rely on a shared main loop */
- loop = g_main_loop_new (NULL, FALSE);
-
-- g_test_add_func ("/gdbus/non-socket", test_non_socket);
-+ //g_test_add_func ("/gdbus/non-socket", test_non_socket);
-
- ret = g_test_run();
-
diff --git a/dev-libs/glib/files/glib-2.6.3-testglib-ssp.patch b/dev-libs/glib/files/glib-2.6.3-testglib-ssp.patch
deleted file mode 100644
index 9b104dd..0000000
--- a/dev-libs/glib/files/glib-2.6.3-testglib-ssp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tests/Makefile.in.orig 2005-04-07 01:05:39.000000000 +0000
-+++ tests/Makefile.in 2005-04-07 01:09:02.000000000 +0000
-@@ -50,7 +50,7 @@
- CATOBJEXT = @CATOBJEXT@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -fno-stack-protector
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@
diff --git a/dev-libs/glib/glib-2.27.4.ebuild b/dev-libs/glib/glib-2.27.4.ebuild
deleted file mode 100644
index 65e497b..0000000
--- a/dev-libs/glib/glib-2.27.4.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit autotools gnome.org libtool eutils flag-o-matic
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="debug doc fam hardened +introspection selinux static-libs test xattr"
-
-# Due to removal of gio API, gnome bug 631398, tests will fail with:
-# symbol lookup error: /usr/lib64/gio/modules/libgiogconf.so: undefined symbol: g_desktop_app_info_lookup_get_type
-# That library is installed by gvfs, gvfs-1.6.4-r99* has a patch to remove it
-RDEPEND="virtual/libiconv
- sys-libs/zlib
- xattr? ( sys-apps/attr )
- fam? ( virtual/fam )"
-DEPEND="${RDEPEND}
- >=dev-util/pkgconfig-0.16
- >=sys-devel/gettext-0.11
- doc? (
- >=dev-libs/libxslt-1.0
- >=dev-util/gtk-doc-1.11
- ~app-text/docbook-xml-dtd-4.1.2 )
- test? ( >=sys-apps/dbus-1.2.14 )"
-PDEPEND="introspection? ( dev-libs/gobject-introspection )
- !<gnome-base/gvfs-1.6.4-r990" # Earlier versions do not work with glib
-# XXX: Consider adding test? ( sys-devel/gdb ); assert-msg-test tries to use it
-
-src_prepare() {
- if use ia64 ; then
- # Only apply for < 4.1
- local major=$(gcc-major-version)
- local minor=$(gcc-minor-version)
- if (( major < 4 || ( major == 4 && minor == 0 ) )); then
- epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
- fi
- fi
-
- # Don't fail gio tests when ran without userpriv, upstream bug 552912
- # This is only a temporary workaround, remove as soon as possible
- epatch "${FILESDIR}/${PN}-2.18.1-workaround-gio-test-failure-without-userpriv.patch"
-
- # Fix gmodule issues on fbsd; bug #184301
- epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
-
- # Don't check for python, hence removing the build-time python dep.
- # We remove the gdb python scripts in src_install due to bug 291328
- epatch "${FILESDIR}/${PN}-2.25-punt-python-check.patch"
-
- # Fix test failure when upgrading from 2.22 to 2.24, upstream bug 621368
- epatch "${FILESDIR}/${PN}-2.24-assert-test-failure.patch"
-
- # skip tests that require writing to /root/.dbus, upstream bug 631379
- #epatch "${FILESDIR}/${PN}-2.25-skip-tests-with-dbus-keyring.patch"
-
- # Do not try to remove files on live filesystem, upstream bug #619274
- sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
- -i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
-
- # Needed for the punt-python-check patch.
- eautoreconf
-
- [[ ${CHOST} == *-freebsd* ]] && elibtoolize
-
- epunt_cxx
-}
-
-src_configure() {
- local myconf
-
- # 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.
- # -- compnerd (3/27/06)
- use debug && myconf="--enable-debug"
-
- # Always use internal libpcre, bug #254659
- econf ${myconf} \
- $(use_enable xattr) \
- $(use_enable doc man) \
- $(use_enable doc gtk-doc) \
- $(use_enable fam) \
- $(use_enable selinux) \
- $(use_enable static-libs static) \
- --enable-regex \
- --with-pcre=internal \
- --with-threads=posix
-}
-
-src_install() {
- local f
- emake DESTDIR="${D}" install || die "Installation failed"
-
- # Do not install charset.alias even if generated, leave it to libiconv
- rm -f "${D}/usr/lib/charset.alias"
-
- # Don't install gdb python macros, bug 291328
- rm -rf "${D}/usr/share/gdb/" "${D}/usr/share/glib-2.0/gdb/"
-
- dodoc AUTHORS ChangeLog* NEWS* README || die "dodoc failed"
-
- insinto /usr/share/bash-completion
- for f in gdbus gsettings; do
- newins "${D}/etc/bash_completion.d/${f}-bash-completion.sh" ${f} || die
- done
- rm -rf "${D}/etc"
-}
-
-src_test() {
- unset DBUS_SESSION_BUS_ADDRESS
- export XDG_CONFIG_DIRS=/etc/xdg
- export XDG_DATA_DIRS=/usr/local/share:/usr/share
- export XDG_DATA_HOME="${T}"
- emake check || die "tests failed"
-}
-
-pkg_preinst() {
- # Only give the introspection message if:
- # * The user has it enabled
- # * Has glib already installed
- # * Previous version was different from new version
- if use introspection && has_version "${CATEGORY}/${PN}"; then
- if ! has_version "=${CATEGORY}/${PF}"; then
- ewarn "You must rebuild gobject-introspection so that the installed"
- ewarn "typelibs and girs are regenerated for the new APIs in glib"
- fi
- fi
-}
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index 56e43eb..f206fc1 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -27,6 +27,10 @@ esac
# Extra configure opts passed to econf
G2CONF=${G2CONF:-""}
+# Should we delete all the .la files?
+# Do NOT use without due consideration
+GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-"no"}
+
# Extra options passed to elibtoolize
ELTCONF=${ELTCONF:-""}
@@ -51,6 +55,10 @@ gnome2_src_unpack() {
}
gnome2_src_prepare() {
+ # Don't use the session bus address inherited via the environment
+ # causes test and introspection-building failures
+ unset DBUS_SESSION_BUS_ADDRESS
+
# Prevent scrollkeeper access violations
gnome2_omf_fix
@@ -128,6 +136,13 @@ gnome2_src_install() {
# Make sure this one doesn't get in the portage db
rm -fr "${ED}/usr/share/applications/mimeinfo.cache"
+
+ # Delete all .la files
+ if [[ "${GNOME2_LA_PUNT}" != "no" ]]; then
+ ebegin "Removing .la files"
+ find "${D}" -name '*.la' -exec rm -f '{}' + || die
+ eend
+ fi
}
gnome2_pkg_preinst() {
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
deleted file mode 100644
index fca28eb..0000000
--- a/gnome-base/gnome-desktop/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST gnome-desktop-2.91.0.tar.bz2 1375768 RMD160 061f68670c7611358a863f1c172c73a921a99a6b SHA1 67dfad07430bcc88994af7016c7598a326695cb0 SHA256 e98d9469f0dec12952b392852a461643036cda4c5a831f1c89c0d5a0aaac0070
-DIST gnome-desktop-2.91.3.tar.bz2 1349752 RMD160 c19336519431439ca54d24f6ee2edacb2f483b0e SHA1 ee7ce4afddf7de280f2f5e824abbf5235bfdb02c SHA256 9ef820b487c6a529dec418e5b41ff4309e0da9d947d09bb6bade4d193129d2cb
-EBUILD gnome-desktop-2.91.0.ebuild 1677 RMD160 ee3ecbc6d469317e63a38142b7d3731925fb1d1f SHA1 ef9cc7219dd6756705b3d302f183f4c3ac04755c SHA256 02317bd0a5eb77e407a9cecfd5795d7b0164a08012e65cdcfe7dc3345d88e6b3
-EBUILD gnome-desktop-2.91.3.ebuild 1677 RMD160 ee3ecbc6d469317e63a38142b7d3731925fb1d1f SHA1 ef9cc7219dd6756705b3d302f183f4c3ac04755c SHA256 02317bd0a5eb77e407a9cecfd5795d7b0164a08012e65cdcfe7dc3345d88e6b3
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.91.0.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.91.0.ebuild
deleted file mode 100644
index 6649847..0000000
--- a/gnome-base/gnome-desktop/gnome-desktop-2.91.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-inherit gnome2 autotools eutils
-
-DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc"
-
-# TODO: Add RDEPEND on pciutils (requires support for reading gzipped pnp.ids)
-RDEPEND=">=x11-libs/gtk+-2.91.0:3
- >=dev-libs/glib-2.19.1
- >=x11-libs/libXrandr-1.2
- >=gnome-base/gconf-2
- >=x11-libs/gdk-pixbuf-2.21.3
- >=x11-libs/startup-notification-0.5
- x11-libs/libX11"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- >=dev-util/intltool-0.40
- >=dev-util/pkgconfig-0.9
- >=app-text/gnome-doc-utils-0.3.2
- doc? ( >=dev-util/gtk-doc-1.4 )
- ~app-text/docbook-xml-dtd-4.1.2
- x11-proto/xproto
- >=x11-proto/randrproto-1.2"
-# Temporarily require the 2.31 version to ensure the proper pixmaps, gnome-about,
-# etc. are installed. Switch to doing things the other way around once
-# gnome-about no longer uses pygtk 2
-PDEPEND=">=gnome-base/gnome-desktop-2.31:2"
-
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto
-# Includes X11/extensions/Xrandr.h that includes randr.h from randrproto (and
-# eventually libXrandr shouldn't RDEPEND on randrproto)
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-pkg_setup() {
- G2CONF="${G2CONF}
- --with-gnome-distributor=Gentoo
- --disable-scrollkeeper
- --disable-static
- --disable-gnome-about
- --disable-desktop-docs
- --with-pnp-ids-path=/usr/share/libgnome-desktop/pnp.ids"
-}
-
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.91.3.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.91.3.ebuild
deleted file mode 100644
index 6649847..0000000
--- a/gnome-base/gnome-desktop/gnome-desktop-2.91.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-inherit gnome2 autotools eutils
-
-DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc"
-
-# TODO: Add RDEPEND on pciutils (requires support for reading gzipped pnp.ids)
-RDEPEND=">=x11-libs/gtk+-2.91.0:3
- >=dev-libs/glib-2.19.1
- >=x11-libs/libXrandr-1.2
- >=gnome-base/gconf-2
- >=x11-libs/gdk-pixbuf-2.21.3
- >=x11-libs/startup-notification-0.5
- x11-libs/libX11"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- >=dev-util/intltool-0.40
- >=dev-util/pkgconfig-0.9
- >=app-text/gnome-doc-utils-0.3.2
- doc? ( >=dev-util/gtk-doc-1.4 )
- ~app-text/docbook-xml-dtd-4.1.2
- x11-proto/xproto
- >=x11-proto/randrproto-1.2"
-# Temporarily require the 2.31 version to ensure the proper pixmaps, gnome-about,
-# etc. are installed. Switch to doing things the other way around once
-# gnome-about no longer uses pygtk 2
-PDEPEND=">=gnome-base/gnome-desktop-2.31:2"
-
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto
-# Includes X11/extensions/Xrandr.h that includes randr.h from randrproto (and
-# eventually libXrandr shouldn't RDEPEND on randrproto)
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-pkg_setup() {
- G2CONF="${G2CONF}
- --with-gnome-distributor=Gentoo
- --disable-scrollkeeper
- --disable-static
- --disable-gnome-about
- --disable-desktop-docs
- --with-pnp-ids-path=/usr/share/libgnome-desktop/pnp.ids"
-}
-
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
deleted file mode 100644
index 5ef11d8..0000000
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX gnome-settings-daemon-2.30.0-gst-vol-control-support.patch 27189 RMD160 77e44583894977b6255fba168d565c5948481401 SHA1 8db1dde75b1866619d6589e989ed27fc45050c50 SHA256 0858e7fdb97086f7f0a284d535d642c23f06fb7d9fc71d9f7477dc856439a158
-DIST gnome-settings-daemon-2.91.5.tar.bz2 1354146 RMD160 2627d9a6d43016a3cc8fe198ff9f4ab7019bcf48 SHA1 02f0af593d0583f10829918e8fb567184235d5f3 SHA256 8d1bc81c0f331ecf6680071770321c4ed4acaa57e214be94a5273294bafc42ff
-EBUILD gnome-settings-daemon-2.91.5.ebuild 2168 RMD160 25c16fe55751a8e5016a07dd041aad5404a9b7a6 SHA1 8504076b7f412f111c642bcf9d3bca59a8079a2d SHA256 a415daabfab72a3e29da78c073f9b003f985bf79fa827bed222a185a93c852b9
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.30.0-gst-vol-control-support.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.30.0-gst-vol-control-support.patch
deleted file mode 100644
index 57bb633..0000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.30.0-gst-vol-control-support.patch
+++ /dev/null
@@ -1,856 +0,0 @@
-From 32a79f1b04c352dc9b9c28c4bdd3d772eeff974d Mon Sep 17 00:00:00 2001
-From: Priit Laes <plaes@plaes.org>
-Date: Wed, 31 Mar 2010 20:53:05 +0300
-Subject: [PATCH] GStreamer support in the volume applet; powered by the Gentoo GNOME team.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=571145
----
- configure.ac | 43 ++
- plugins/media-keys/Makefile.am | 15 +-
- plugins/media-keys/cut-n-paste/Makefile.am | 34 ++-
- .../cut-n-paste/gvc-gstreamer-acme-vol.c | 402 ++++++++++++++++++++
- .../cut-n-paste/gvc-gstreamer-acme-vol.h | 56 +++
- plugins/media-keys/gsd-media-keys-manager.c | 64 +++-
- 6 files changed, 589 insertions(+), 25 deletions(-)
- create mode 100644 plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.c
- create mode 100644 plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.h
-
-diff --git a/configure.ac b/configure.ac
-index 92f20c8..723a0cf 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -251,6 +251,48 @@ AM_CONDITIONAL(HAVE_PULSE, test "x$have_pulse" = "xtrue")
- AC_SUBST(PULSE_CFLAGS)
- AC_SUBST(PULSE_LIBS)
-
-+dnl ==============================================
-+dnl GStreamer section
-+dnl ==============================================
-+GST_MAJORMINOR=auto
-+
-+AC_ARG_ENABLE(gstreamer,
-+AC_HELP_STRING([--enable-gstreamer],[use gstreamer if available (and optionally specify a version)]),
-+[case "${enableval}" in
-+ yes) ENABLE_GSTREAMER=yes ;;
-+ 0.10) ENABLE_GSTREAMER=yes && GST_MAJORMINOR=0.10 ;;
-+ no) ENABLE_GSTREAMER=no ;;
-+ *) AC_MSG_ERROR([
-+ *** Bad value ${enableval} for --enable-gstreamer
-+ *** Please use one of the following:
-+ *** --enable-gstreamer=0.10
-+ ]) ;;
-+esac],
-+[ENABLE_GSTREAMER=yes]) dnl Default value
-+
-+have_gstreamer=no
-+if test "x$ENABLE_GSTREAMER" = "xyes"; then
-+ GST_REQS=0.10.1.2
-+ PKGS="gstreamer-0.10 >= $GST_REQS gstreamer-plugins-base-0.10 >= $GST_REQS"
-+
-+ PKG_CHECK_MODULES(GST, $PKGS, have_gstreamer=yes,
-+ AC_MSG_RESULT([no]))
-+
-+ if test "x$have_pulse" = "xtrue"; then
-+ AC_MSG_ERROR([*** GStreamer & Pulseaudio both are selected ***])
-+ fi
-+
-+ if test "x$have_gstreamer" = "xyes"; then
-+ GST_LIBS="$GST_LIBS -lgstinterfaces-0.10 -lgstaudio-0.10"
-+ AC_DEFINE(HAVE_GSTREAMER,1,[enable gstreamer])
-+ fi
-+else
-+ AC_MSG_NOTICE([*** GStreamer support disabled ***])
-+fi
-+AM_CONDITIONAL(HAVE_GSTREAMER, test "x$have_gstreamer" = "xyes")
-+AC_SUBST(GST_LIBS)
-+AC_SUBST(GST_CFLAGS)
-+
- # ---------------------------------------------------------------------------
- # Enable Profiling
- # ---------------------------------------------------------------------------
-@@ -389,6 +431,7 @@ echo "
- dbus-1 system.d dir: ${DBUS_SYS_DIR}
-
- Libnotify support: ${have_libnotify}
-+ GStreamer support: ${have_gstreamer}
- PulseAudio support: ${have_pulse}
- Profiling support: ${enable_profiling}
- "
-diff --git a/plugins/media-keys/Makefile.am b/plugins/media-keys/Makefile.am
-index f9a71cd..92b19f4 100644
---- a/plugins/media-keys/Makefile.am
-+++ b/plugins/media-keys/Makefile.am
-@@ -3,13 +3,8 @@ context = actions
-
- NULL =
-
--SUBDIRS =
--plugin_LTLIBRARIES =
--
--if HAVE_PULSE
--SUBDIRS += cut-n-paste
--plugin_LTLIBRARIES += libmedia-keys.la
--endif
-+SUBDIRS = cut-n-paste
-+plugin_LTLIBRARIES = libmedia-keys.la
-
- BUILT_SOURCES = \
- gsd-media-keys-manager-glue.h \
-@@ -100,7 +95,7 @@ libmedia_keys_la_LDFLAGS = \
-
- libmedia_keys_la_LIBADD = \
- $(top_builddir)/plugins/common/libcommon.la \
-- $(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la \
-+ $(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la \
- $(SETTINGS_PLUGIN_LIBS) \
- $(XF86MISC_LIBS) \
- -lm
-@@ -108,9 +103,7 @@ libmedia_keys_la_LIBADD = \
- plugin_in_files = \
- media-keys.gnome-settings-plugin.in
-
--if HAVE_PULSE
- plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
--endif
-
- noinst_PROGRAMS = \
- test-media-keys \
-@@ -176,9 +169,7 @@ test_media_keys_LDADD = \
- $(GST_LIBS) \
- -lm
-
--if HAVE_PULSE
- test_media_keys_LDADD += $(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la
--endif
-
- gtkbuilderdir = $(pkgdatadir)
- gtkbuilder_DATA = \
-diff --git a/plugins/media-keys/cut-n-paste/Makefile.am b/plugins/media-keys/cut-n-paste/Makefile.am
-index bc59a10..6486ac0 100644
---- a/plugins/media-keys/cut-n-paste/Makefile.am
-+++ b/plugins/media-keys/cut-n-paste/Makefile.am
-@@ -4,16 +4,24 @@ noinst_LTLIBRARIES = libgvc.la
-
- INCLUDES = \
- $(WARN_CFLAGS) \
-- $(VOLUME_CONTROL_CFLAGS) \
-- $(PULSE_CFLAGS) \
- $(NULL)
-
- libgvc_la_LIBADD = \
-- $(VOLUME_CONTROL_LIBS) \
-- $(PULSE_LIBS) \
- $(NULL)
-
- libgvc_la_SOURCES = \
-+ $(NULL)
-+
-+if HAVE_PULSE
-+INCLUDES += \
-+ $(VOLUME_CONTROL_CFLAGS) \
-+ $(PULSE_CFLAGS)
-+
-+libgvc_la_LIBADD += \
-+ $(VOLUME_CONTROL_LIBS) \
-+ $(PULSE_LIBS)
-+
-+libgvc_la_SOURCES += \
- gvc-mixer-stream.h \
- gvc-mixer-stream.c \
- gvc-channel-map.h \
-@@ -31,8 +39,22 @@ libgvc_la_SOURCES = \
- gvc-mixer-event-role.h \
- gvc-mixer-event-role.c \
- gvc-mixer-control.h \
-- gvc-mixer-control.c \
-- $(NULL)
-+ gvc-mixer-control.c
-+endif
-+
-+if HAVE_GSTREAMER
-+INCLUDES += \
-+ $(SETTINGS_PLUGIN_CFLAGS) \
-+ $(AM_CFLAGS) \
-+ $(GST_CFLAGS)
-+
-+libgvc_la_LIBADD += \
-+ $(GST_LIBS)
-+
-+libgvc_la_SOURCES += \
-+ gvc-gstreamer-acme-vol.c \
-+ gvc-gstreamer-acme-vol.h
-+endif
-
- MAINTAINERCLEANFILES = \
- *~ \
-diff --git a/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.c b/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.c
-new file mode 100644
-index 0000000..8948480
---- /dev/null
-+++ b/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.c
-@@ -0,0 +1,402 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-+
-+/* acme-volume.c
-+
-+ Copyright (C) 2002, 2003 Bastien Nocera
-+ Copyright (C) 2004 Novell, Inc.
-+ Copyright (C) 2009 PERIER Romain <mrpouet@tuxfamily.org>
-+
-+ The Gnome Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Library General Public License as
-+ published by the Free Software Foundation; either version 2 of the
-+ License, or (at your option) any later version.
-+
-+ The Gnome Library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Library General Public License for more details.
-+
-+ You should have received a copy of the GNU Library General Public
-+ License along with the Gnome Library; see the file COPYING.LIB. If not,
-+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+ Boston, MA 02111-1307, USA.
-+
-+ Author: Bastien Nocera <hadess@hadess.net>
-+ Jon Trowbridge <trow@ximian.com>
-+*/
-+
-+#include "config.h"
-+#include "gvc-gstreamer-acme-vol.h"
-+
-+#include <gst/gst.h>
-+#include <gst/audio/mixerutils.h>
-+#include <gst/interfaces/mixer.h>
-+#include <gst/interfaces/propertyprobe.h>
-+
-+#include <gconf/gconf-client.h>
-+
-+#include <string.h>
-+
-+#define TIMEOUT 4
-+
-+#define DEFAULT_MIXER_DEVICE_KEY "/desktop/gnome/sound/default_mixer_device"
-+#define DEFAULT_MIXER_TRACKS_KEY "/desktop/gnome/sound/default_mixer_tracks"
-+
-+#define ACME_VOLUME_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), ACME_TYPE_VOLUME, AcmeVolumePrivate))
-+
-+struct AcmeVolumePrivate {
-+ GstMixer *mixer;
-+ GList *mixer_tracks;
-+ guint timer_id;
-+ gdouble volume;
-+ gboolean mute;
-+ GConfClient *gconf_client;
-+};
-+
-+G_DEFINE_TYPE (AcmeVolume, acme_volume, G_TYPE_OBJECT)
-+
-+static gboolean acme_volume_open (AcmeVolume *acme);
-+static void acme_volume_close (AcmeVolume *acme);
-+static gboolean acme_volume_close_real (AcmeVolume *self);
-+
-+static gpointer acme_volume_object = NULL;
-+
-+static void
-+acme_volume_finalize (GObject *object)
-+{
-+ AcmeVolume *self;
-+
-+ g_return_if_fail (object != NULL);
-+ g_return_if_fail (ACME_IS_VOLUME (object));
-+
-+ self = ACME_VOLUME (object);
-+
-+ if (self->_priv->timer_id != 0)
-+ g_source_remove (self->_priv->timer_id);
-+ acme_volume_close_real (self);
-+
-+ if (self->_priv->gconf_client != NULL) {
-+ g_object_unref (self->_priv->gconf_client);
-+ self->_priv->gconf_client = NULL;
-+ }
-+
-+ G_OBJECT_CLASS (acme_volume_parent_class)->finalize (object);
-+}
-+
-+void
-+acme_volume_set_mute (AcmeVolume *self, gboolean val)
-+{
-+ GList *t;
-+
-+ g_return_if_fail(ACME_IS_VOLUME(self));
-+ g_return_if_fail(acme_volume_open(self));
-+
-+ for (t = self->_priv->mixer_tracks; t != NULL; t = t->next) {
-+ GstMixerTrack *track = GST_MIXER_TRACK (t->data);
-+ gst_mixer_set_mute (self->_priv->mixer, track, val);
-+ }
-+ self->_priv->mute = val;
-+ acme_volume_close (self);
-+}
-+
-+static void
-+update_state (AcmeVolume * self)
-+{
-+ gint *volumes, n;
-+ gdouble vol = 0;
-+ GstMixerTrack *track = GST_MIXER_TRACK (self->_priv->mixer_tracks->data);
-+
-+ /* update mixer by getting volume */
-+ volumes = g_new0 (gint, track->num_channels);
-+ gst_mixer_get_volume (self->_priv->mixer, track, volumes);
-+ for (n = 0; n < track->num_channels; n++)
-+ vol += volumes[n];
-+ g_free (volumes);
-+ vol /= track->num_channels;
-+ vol = 100 * vol / (track->max_volume - track->min_volume);
-+
-+ /* update mute flag, and volume if not muted */
-+ if (GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_MUTE))
-+ self->_priv->mute = TRUE;
-+ self->_priv->volume = vol;
-+}
-+
-+gboolean
-+acme_volume_get_mute (AcmeVolume *self)
-+{
-+ g_return_val_if_fail(acme_volume_open(self), FALSE);
-+
-+ update_state (self);
-+ acme_volume_close (self);
-+
-+ return self->_priv->mute;
-+}
-+
-+gint
-+acme_volume_get_volume (AcmeVolume *self)
-+{
-+
-+ g_return_val_if_fail(acme_volume_open(self), 0);
-+
-+ update_state (self);
-+
-+ acme_volume_close (self);
-+
-+ return (gint) (self->_priv->volume + 0.5);
-+}
-+
-+void
-+acme_volume_set_volume (AcmeVolume *self, gint val)
-+{
-+ GList *t;
-+
-+ g_return_if_fail(acme_volume_open(self));
-+
-+ val = CLAMP (val, 0, 100);
-+
-+ for (t = self->_priv->mixer_tracks; t != NULL; t = t->next) {
-+ GstMixerTrack *track = GST_MIXER_TRACK (t->data);
-+ gint *volumes, n;
-+ gdouble scale = (track->max_volume - track->min_volume) / 100.0;
-+ gint vol = (gint) (val * scale + track->min_volume + 0.5);
-+
-+ volumes = g_new (gint, track->num_channels);
-+ for (n = 0; n < track->num_channels; n++)
-+ volumes[n] = vol;
-+ gst_mixer_set_volume (self->_priv->mixer, track, volumes);
-+ g_free (volumes);
-+ }
-+
-+ /* update state */
-+ self->_priv->volume = val;
-+
-+ acme_volume_close (self);
-+}
-+
-+void
-+acme_volume_mute_toggle (AcmeVolume *self)
-+{
-+ gboolean muted;
-+
-+ g_return_if_fail (self != NULL);
-+ g_return_if_fail (ACME_IS_VOLUME(self));
-+
-+ muted = acme_volume_get_mute(self);
-+ acme_volume_set_mute(self, !muted);
-+}
-+
-+gint
-+acme_volume_get_threshold (AcmeVolume *self)
-+{
-+ GList *t;
-+ gint steps = 101;
-+
-+ g_return_val_if_fail(acme_volume_open(self), 1);
-+
-+ for (t = self->_priv->mixer_tracks; t != NULL; t = t->next) {
-+ GstMixerTrack *track = GST_MIXER_TRACK (t->data);
-+ gint track_steps = track->max_volume - track->min_volume;
-+ if (track_steps > 0 && track_steps < steps)
-+ steps = track_steps;
-+ }
-+
-+ acme_volume_close (self);
-+
-+ return 100 / steps + 1;
-+}
-+
-+static gboolean
-+acme_volume_close_real (AcmeVolume *self)
-+{
-+ if (self->_priv->mixer != NULL)
-+ {
-+ gst_element_set_state (GST_ELEMENT (self->_priv->mixer), GST_STATE_NULL);
-+ gst_object_unref (GST_OBJECT (self->_priv->mixer));
-+ g_list_foreach (self->_priv->mixer_tracks, (GFunc) g_object_unref, NULL);
-+ g_list_free (self->_priv->mixer_tracks);
-+ self->_priv->mixer = NULL;
-+ self->_priv->mixer_tracks = NULL;
-+ }
-+
-+ self->_priv->timer_id = 0;
-+ return FALSE;
-+}
-+
-+/*
-+ * _acme_set_mixer
-+ * @mixer A pointer to mixer element
-+ * @data A pointer to user data (AcmeVolume instance to be modified)
-+ * @return A gboolean indicating success if Master track was found, failed otherwises.
-+ */
-+static gboolean
-+_acme_set_mixer(GstMixer *mixer, gpointer user_data)
-+{
-+ const GList *tracks;
-+
-+ for (tracks = gst_mixer_list_tracks (mixer); tracks != NULL; tracks = tracks->next) {
-+ GstMixerTrack *track = GST_MIXER_TRACK (tracks->data);
-+
-+ if (GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_MASTER)) {
-+ AcmeVolume *self;
-+
-+ self = ACME_VOLUME (user_data);
-+
-+ self->_priv->mixer = mixer;
-+ self->_priv->mixer_tracks = g_list_append (self->_priv->mixer_tracks, g_object_ref (track));
-+ return TRUE;
-+ }
-+
-+ continue;
-+ }
-+
-+ return FALSE;
-+}
-+
-+/* This is a modified version of code from gnome-media's gst-mixer */
-+static gboolean
-+acme_volume_open (AcmeVolume *self)
-+{
-+ gchar *mixer_device, **factory_and_device = NULL;
-+ GList *mixer_list;
-+
-+ if (self->_priv->timer_id != 0) {
-+ g_source_remove (self->_priv->timer_id);
-+ self->_priv->timer_id = 0;
-+ return TRUE;
-+ }
-+
-+ mixer_device = gconf_client_get_string (self->_priv->gconf_client, DEFAULT_MIXER_DEVICE_KEY, NULL);
-+ if (mixer_device != NULL)
-+ factory_and_device = g_strsplit (mixer_device, ":", 2);
-+
-+ if (factory_and_device != NULL && factory_and_device[0] != NULL) {
-+ GstElement *element;
-+
-+ element = gst_element_factory_make (factory_and_device[0], NULL);
-+
-+ if (element != NULL) {
-+ if (factory_and_device[1] != NULL &&
-+ g_object_class_find_property (G_OBJECT_GET_CLASS (element), "device"))
-+ g_object_set (G_OBJECT (element), "device", factory_and_device[1], NULL);
-+ gst_element_set_state (element, GST_STATE_READY);
-+
-+ if (GST_IS_MIXER (element))
-+ self->_priv->mixer = GST_MIXER (element);
-+ else {
-+ gst_element_set_state (element, GST_STATE_NULL);
-+ gst_object_unref (element);
-+ }
-+ }
-+ }
-+
-+ g_free (mixer_device);
-+ g_strfreev (factory_and_device);
-+
-+ if (self->_priv->mixer != NULL) {
-+ const GList *m;
-+ GSList *tracks, *t;
-+ GError *error = NULL;
-+
-+ /* Try to use tracks saved in GConf
-+ Note: errors need to be treated , for example if the user set a non type list for this key
-+ or if the elements type_list are not "matched" */
-+ tracks = gconf_client_get_list (self->_priv->gconf_client, DEFAULT_MIXER_TRACKS_KEY,
-+ GCONF_VALUE_STRING, &error);
-+
-+ if (error) {
-+ g_warning("ERROR: %s\n", error->message);
-+ g_error_free(error);
-+ }
-+
-+ /* We use these tracks ONLY if they are supported on the system with the following mixer */
-+ for (m = gst_mixer_list_tracks (self->_priv->mixer); m != NULL; m = m->next) {
-+ GstMixerTrack *track = GST_MIXER_TRACK (m->data);
-+
-+ for (t = tracks; t != NULL; t = t->next)
-+ if (!strcmp (t->data, track->label))
-+ self->_priv->mixer_tracks = g_list_append (self->_priv->mixer_tracks, g_object_ref (track));
-+
-+ }
-+
-+ g_slist_foreach (tracks, (GFunc)g_free, NULL);
-+ g_slist_free (tracks);
-+
-+ /* If no track stored in GConf is avaiable try to use Master track */
-+ if (self->_priv->mixer_tracks == NULL) {
-+ for (m = gst_mixer_list_tracks (self->_priv->mixer); m != NULL; m = m->next) {
-+ GstMixerTrack *track = GST_MIXER_TRACK (m->data);
-+
-+ if (GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_MASTER)) {
-+ self->_priv->mixer_tracks = g_list_append (self->_priv->mixer_tracks, g_object_ref (track));
-+ break;
-+ }
-+ }
-+ }
-+
-+ if (self->_priv->mixer_tracks != NULL)
-+ return TRUE;
-+ else {
-+ gst_element_set_state (GST_ELEMENT (self->_priv->mixer), GST_STATE_NULL);
-+ gst_object_unref (self->_priv->mixer);
-+ }
-+ }
-+
-+ /* Go through all elements of a certain class and check whether
-+ * they implement a mixer. If so, walk through the tracks and look
-+ * for first one named "volume".
-+ *
-+ * We should probably do something intelligent if we don't find an
-+ * appropriate mixer/track. But now we do something stupid...
-+ * everything just becomes a no-op.
-+ */
-+ mixer_list = gst_audio_default_registry_mixer_filter (_acme_set_mixer,
-+ TRUE,
-+ self);
-+
-+ if (mixer_list == NULL)
-+ return FALSE;
-+
-+ /* do not unref the mixer as we keep the ref for self->priv->mixer */
-+ g_list_free (mixer_list);
-+
-+ return TRUE;
-+}
-+
-+static void
-+acme_volume_close (AcmeVolume *self)
-+{
-+ self->_priv->timer_id = g_timeout_add_seconds (TIMEOUT,
-+ (GSourceFunc) acme_volume_close_real, self);
-+}
-+
-+static void
-+acme_volume_init (AcmeVolume *self)
-+{
-+ self->_priv = ACME_VOLUME_GET_PRIVATE (self);
-+ self->_priv->gconf_client = gconf_client_get_default ();
-+}
-+
-+static void
-+acme_volume_class_init (AcmeVolumeClass *klass)
-+{
-+ G_OBJECT_CLASS (klass)->finalize = acme_volume_finalize;
-+
-+ gst_init (NULL, NULL);
-+
-+ g_type_class_add_private (klass, sizeof (AcmeVolumePrivate));
-+}
-+
-+/* acme_volume_new
-+ * @return A singleton instance of type AcmeVolume
-+ */
-+AcmeVolume *
-+acme_volume_new (void)
-+{
-+ if (acme_volume_object == NULL) {
-+ acme_volume_object = g_object_new (ACME_TYPE_VOLUME, NULL);
-+ return ACME_VOLUME(acme_volume_object);
-+ }
-+ g_object_ref(acme_volume_object);
-+ return ACME_VOLUME(acme_volume_object);
-+}
-+
-diff --git a/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.h b/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.h
-new file mode 100644
-index 0000000..c14ebc8
---- /dev/null
-+++ b/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.h
-@@ -0,0 +1,56 @@
-+/* acme-volume.h
-+
-+ Copyright (C) 2002, 2003 Bastien Nocera
-+ Copyright (C) 2004 Novell, Inc.
-+ Copyright (C) 2009 PERIER Romain <mrpouet@tuxfamily.org>
-+
-+ The Gnome Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Library General Public License as
-+ published by the Free Software Foundation; either version 2 of the
-+ License, or (at your option) any later version.
-+
-+ The Gnome Library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Library General Public License for more details.
-+
-+ You should have received a copy of the GNU Library General Public
-+ License along with the Gnome Library; see the file COPYING.LIB. If not,
-+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+ Boston, MA 02111-1307, USA.
-+
-+ Author: Bastien Nocera <hadess@hadess.net>
-+ Jon Trowbridge <trow@ximian.com>
-+ */
-+
-+#include <glib-object.h>
-+
-+#define ACME_TYPE_VOLUME (acme_volume_get_type ())
-+#define ACME_VOLUME(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ACME_TYPE_VOLUME, AcmeVolume))
-+#define ACME_VOLUME_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ACME_TYPE_VOLUME, AcmeVolumeClass))
-+#define ACME_IS_VOLUME(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ACME_TYPE_VOLUME))
-+#define ACME_VOLUME_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ACME_TYPE_VOLUME, AcmeVolumeClass))
-+
-+typedef struct AcmeVolume AcmeVolume;
-+typedef struct AcmeVolumeClass AcmeVolumeClass;
-+typedef struct AcmeVolumePrivate AcmeVolumePrivate;
-+
-+struct AcmeVolume {
-+ GObject parent;
-+ AcmeVolumePrivate *_priv;
-+};
-+
-+struct AcmeVolumeClass {
-+ GObjectClass parent;
-+};
-+
-+GType acme_volume_get_type (void);
-+AcmeVolume *acme_volume_new (void);
-+void acme_volume_set_mute (AcmeVolume *self, gboolean val);
-+void acme_volume_mute_toggle (AcmeVolume *self);
-+gboolean acme_volume_get_mute (AcmeVolume *self);
-+void acme_volume_set_volume (AcmeVolume *self, gint val);
-+gint acme_volume_get_volume (AcmeVolume *self);
-+gint acme_volume_get_threshold (AcmeVolume *self);
-+
-+
-diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
-index b563f73..64893b5 100644
---- a/plugins/media-keys/gsd-media-keys-manager.c
-+++ b/plugins/media-keys/gsd-media-keys-manager.c
-@@ -53,6 +53,8 @@
- #ifdef HAVE_PULSE
- #include <canberra-gtk.h>
- #include "gvc-mixer-control.h"
-+#elif defined(HAVE_GSTREAMER)
-+#include "gvc-gstreamer-acme-vol.h"
- #endif /* HAVE_PULSE */
-
- #define GSD_DBUS_PATH "/org/gnome/SettingsDaemon"
-@@ -78,6 +80,8 @@ struct GsdMediaKeysManagerPrivate
- /* Volume bits */
- GvcMixerControl *volume;
- GvcMixerStream *stream;
-+#elif defined(HAVE_GSTREAMER)
-+ AcmeVolume *volume;
- #endif /* HAVE_PULSE */
- GtkWidget *dialog;
- GConfClient *conf_client;
-@@ -650,14 +654,16 @@ do_touchpad_action (GsdMediaKeysManager *manager)
- gconf_client_set_bool (client, TOUCHPAD_ENABLED_KEY, !state, NULL);
- }
-
--#ifdef HAVE_PULSE
-+#if defined(HAVE_PULSE) || defined(HAVE_GSTREAMER)
- static void
- update_dialog (GsdMediaKeysManager *manager,
- guint vol,
- gboolean muted,
- gboolean sound_changed)
- {
-+#ifdef HAVE_PULSE
- vol = (int) (100 * (double) vol / PA_VOLUME_NORM);
-+#endif
- vol = CLAMP (vol, 0, 100);
-
- dialog_init (manager);
-@@ -668,12 +674,14 @@ update_dialog (GsdMediaKeysManager *manager,
- GSD_MEDIA_KEYS_WINDOW_ACTION_VOLUME);
- dialog_show (manager);
-
-+#ifdef HAVE_PULSE
- if (sound_changed != FALSE && muted == FALSE)
- ca_gtk_play_for_widget (manager->priv->dialog, 0,
- CA_PROP_EVENT_ID, "audio-volume-change",
- CA_PROP_EVENT_DESCRIPTION, "volume changed through key press",
- CA_PROP_APPLICATION_ID, "org.gnome.VolumeControl",
- NULL);
-+#endif
- }
-
- static void
-@@ -685,7 +693,11 @@ do_sound_action (GsdMediaKeysManager *manager,
- int vol_step;
- gboolean sound_changed;
-
-+#ifdef HAVE_PULSE
- if (manager->priv->stream == NULL)
-+#else
-+ if (manager->priv->volume == NULL)
-+#endif
- return;
-
- vol_step = gconf_client_get_int (manager->priv->conf_client,
-@@ -695,20 +707,35 @@ do_sound_action (GsdMediaKeysManager *manager,
- if (vol_step <= 0 || vol_step > 100)
- vol_step = VOLUME_STEP;
-
-+ sound_changed = FALSE;
-+#ifdef HAVE_PULSE
- norm_vol_step = PA_VOLUME_NORM * vol_step / 100;
-
- /* FIXME: this is racy */
- vol = gvc_mixer_stream_get_volume (manager->priv->stream);
- muted = gvc_mixer_stream_get_is_muted (manager->priv->stream);
-- sound_changed = FALSE;
--
-+#else
-+ if (vol_step > 0) {
-+ gint threshold = acme_volume_get_threshold (manager->priv->volume);
-+ if (vol_step < threshold)
-+ vol_step = threshold;
-+ g_debug ("Using volume step of %d", vol_step);
-+ }
-+ vol = acme_volume_get_volume (manager->priv->volume);
-+ muted = acme_volume_get_mute (manager->priv->volume);
-+#endif
- switch (type) {
- case MUTE_KEY:
- muted = !muted;
-- gvc_mixer_stream_change_is_muted (manager->priv->stream, muted);
- sound_changed = TRUE;
-+#ifdef HAVE_PULSE
-+ gvc_mixer_stream_change_is_muted (manager->priv->stream, muted);
-+#else
-+ acme_volume_mute_toggle (manager->priv->volume);
-+#endif
- break;
- case VOLUME_DOWN_KEY:
-+#ifdef HAVE_PULSE
- if (!muted && (vol <= norm_vol_step)) {
- muted = !muted;
- vol = 0;
-@@ -724,11 +751,17 @@ do_sound_action (GsdMediaKeysManager *manager,
- sound_changed = TRUE;
- }
- }
-+#else
-+ if (!muted && (vol <= vol_step))
-+ acme_volume_mute_toggle (manager->priv->volume);
-+ acme_volume_set_volume (manager->priv->volume, vol - vol_step);
-+#endif
- break;
- case VOLUME_UP_KEY:
- if (muted) {
- muted = !muted;
- if (vol == 0) {
-+#ifdef HAVE_PULSE
- vol = vol + norm_vol_step;
- gvc_mixer_stream_change_is_muted (manager->priv->stream, muted);
- if (gvc_mixer_stream_set_volume (manager->priv->stream, vol) != FALSE) {
-@@ -739,7 +772,15 @@ do_sound_action (GsdMediaKeysManager *manager,
- gvc_mixer_stream_change_is_muted (manager->priv->stream, muted);
- sound_changed = TRUE;
- }
-+#else
-+ /* We need to unmute otherwise vol is blocked (and muted) */
-+ acme_volume_set_mute (manager->priv->volume, FALSE);
-+ }
-+ acme_volume_set_volume (manager->priv->volume, vol + vol_step);
-+
-+#endif
- } else {
-+#ifdef HAVE_PULSE
- if (vol < MAX_VOLUME) {
- if (vol + norm_vol_step >= MAX_VOLUME) {
- vol = MAX_VOLUME;
-@@ -751,13 +792,18 @@ do_sound_action (GsdMediaKeysManager *manager,
- sound_changed = TRUE;
- }
- }
-+#else
-+ acme_volume_set_volume (manager->priv->volume, vol + vol_step);
-+#endif /* HAVE_PULSE */
- }
- break;
- }
-
- update_dialog (manager, vol, muted, sound_changed);
- }
-+#endif /* defined(HAVE_PULSE) || defined(HAVE_GSTREAMER) */
-
-+#ifdef HAVE_PULSE
- static void
- update_default_sink (GsdMediaKeysManager *manager)
- {
-@@ -793,7 +839,6 @@ on_control_default_sink_changed (GvcMixerControl *control,
- {
- update_default_sink (manager);
- }
--
- #endif /* HAVE_PULSE */
-
- static gint
-@@ -919,9 +964,9 @@ do_action (GsdMediaKeysManager *manager,
- case MUTE_KEY:
- case VOLUME_DOWN_KEY:
- case VOLUME_UP_KEY:
--#ifdef HAVE_PULSE
-+#if defined(HAVE_PULSE) || defined(HAVE_GSTREAMER)
- do_sound_action (manager, type);
--#endif /* HAVE_PULSE */
-+#endif /* HAVE_PULSE || HAVE_GSTREAMER */
- break;
- case POWER_KEY:
- do_exit_action (manager);
-@@ -1122,6 +1167,10 @@ gsd_media_keys_manager_start (GsdMediaKeysManager *manager,
- gvc_mixer_control_open (manager->priv->volume);
-
- gnome_settings_profile_end ("gvc_mixer_control_new");
-+#elif defined(HAVE_GSTREAMER)
-+ gnome_settings_profile_start ("acme_volume_new");
-+ manager->priv->volume = acme_volume_new ();
-+ gnome_settings_profile_end ("acme_volume_new");
- #endif /* HAVE_PULSE */
- g_idle_add ((GSourceFunc) start_media_keys_idle_cb, manager);
-
-@@ -1199,6 +1248,7 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager)
- g_object_unref (priv->stream);
- priv->stream = NULL;
- }
-+#elif defined(HAVE_GSTREAMER)
-
- if (priv->volume) {
- g_object_unref (priv->volume);
---
-1.7.0.3
-
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.91.5.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.91.5.ebuild
deleted file mode 100644
index da733af..0000000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.91.5.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Gnome Settings Daemon"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug libnotify policykit pulseaudio"
-
-RDEPEND=">=dev-libs/dbus-glib-0.74
- >=dev-libs/glib-2.18.0
- >=x11-libs/gtk+-2.91.0:3
- >=gnome-base/gsettings-desktop-schemas-0.1.1
- >=gnome-base/libgnomekbd-2.91.1
- >=gnome-base/gnome-desktop-2.91.3:3
-
- x11-libs/libX11
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libXext
- x11-libs/libXxf86misc
- >=x11-libs/libxklavier-5.0
- media-libs/fontconfig
-
- libnotify? ( >=x11-libs/libnotify-0.6.0 )
- policykit? (
- >=sys-auth/polkit-0.91
- >=dev-libs/dbus-glib-0.71
- >=sys-apps/dbus-1.1.2 )
- pulseaudio? (
- >=media-sound/pulseaudio-0.9.15
- media-libs/libcanberra[gtk] )
- !pulseaudio? (
- >=media-libs/gstreamer-0.10.1.2
- >=media-libs/gst-plugins-base-0.10.1.2 )"
-DEPEND="${RDEPEND}
- !<gnome-base/gnome-control-center-2.22
- sys-devel/gettext
- >=dev-util/intltool-0.40
- >=dev-util/pkgconfig-0.19
- x11-proto/inputproto
- x11-proto/xproto"
-
-# README is empty
-DOCS="AUTHORS NEWS ChangeLog MAINTAINERS"
-
-pkg_setup() {
- G2CONF="${G2CONF}
- --disable-static
- $(use_enable debug)
- $(use_with libnotify)
- $(use_enable policykit polkit)
- $(use_enable pulseaudio pulse)
- $(use_enable !pulseaudio gstreamer)"
-
- if use pulseaudio; then
- elog "Building volume media keys using Pulseaudio"
- else
- elog "Building volume media keys using GStreamer"
- fi
-}
-
-src_prepare() {
- gnome2_src_prepare
-
- # Restore gstreamer volume control support, upstream bug #571145
- epatch "${FILESDIR}/${PN}-2.30.0-gst-vol-control-support.patch"
-
- intltoolize --force --copy --automake || die "intltoolize failed"
- eautoreconf
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- if ! use pulseaudio; then
- elog "GStreamer volume control support is a feature powered by Gentoo GNOME Team"
- elog "PLEASE DO NOT report bugs upstream, report on https://bugs.gentoo.org instead"
- fi
-}
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
deleted file mode 100644
index 0346cef..0000000
--- a/gnome-base/gnome-shell/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST gnome-shell-2.91.1.tar.bz2 803066 RMD160 c8a030427bea60a8edbd9baedde6fc4a68782b19 SHA1 841a237936b447c836a69ba224640114429ebf08 SHA256 9ff972455a0fc3b1693d9bc0d880619d4a4a087574c92df062723368b529e937
-DIST gnome-shell-2.91.2.tar.bz2 809309 RMD160 140b1235cb767eb023120f14f7b8660c6a0050cd SHA1 934ea7729428954bba86cfc7170b1a897dc0c871 SHA256 b7a32b55a99193b552ac4e9cb574d76659874abbf9777cd7f74a5685e082ec0f
-EBUILD gnome-shell-2.91.1.ebuild 1312 RMD160 535bbb24a6010719a48f10c8c891ca1df95f3f74 SHA1 73e56abc4c81f3f784196231663d9070eb6db9d0 SHA256 f310f14eaace98391e9d7176034afe1893bd3e2c842bdf69b9412dc41579ae08
-EBUILD gnome-shell-2.91.2.ebuild 1314 RMD160 e712dafe2ed32ee5a1e98e028913da894cf6cf11 SHA1 f59eaabd6540d8e19add7113c2f8af2f00bd3cad SHA256 159f44171be7e51d2cce5e2444a7c94f05bf2aedd30d44a65f3715c68f2694cc
-EBUILD gnome-shell-9999.ebuild 1477 RMD160 5cba45d01286d8810fb5d72ee685928ab26f4733 SHA1 315f807817419dec36b7ed9e074d1598ad10e239 SHA256 0824019c7369b24082653f6172d657b1e168bf7ebe1d03714da9b0b2cf44ebee
diff --git a/gnome-base/gnome-shell/gnome-shell-2.91.1.ebuild b/gnome-base/gnome-shell/gnome-shell-2.91.1.ebuild
deleted file mode 100644
index 27f2968..0000000
--- a/gnome-base/gnome-shell/gnome-shell-2.91.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
-HOMEPAGE="http://live.gnome.org/GnomeShell"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.25.9
- >=x11-libs/gtk+-2.91.0:3[introspection]
- >=media-libs/gstreamer-0.10.16
- >=media-libs/gst-plugins-base-0.10.16
- >=gnome-base/gnome-desktop-2.91.0:3
- >=dev-libs/gobject-introspection-0.9.5
-
- dev-libs/dbus-glib
- >=dev-libs/gjs-0.7
- x11-libs/pango[introspection]
- >=media-libs/clutter-1.4.0[introspection]
- dev-libs/libcroco:0.6
-
- >=gnome-base/dconf-0.4.1
- gnome-base/gconf[introspection]
- gnome-base/gnome-menus
- x11-libs/startup-notification
- x11-libs/libXfixes
- >=x11-wm/mutter-2.91.2[introspection]
- x11-apps/mesa-progs
- dev-python/dbus-python
- media-sound/pulseaudio
- gnome-base/gsettings-desktop-schemas
-"
-
-DEPEND="${RDEPEND}
- >=sys-devel/libtool-2.2.6
- >=dev-lang/python-2.5
- sys-devel/gettext
- >=dev-util/pkgconfig-0.22
- >=dev-util/intltool-0.26
- gnome-base/gnome-common
-"
-DOCS="AUTHORS README"
-
-pkg_postinst() {
- elog " Start with 'gnome-shell --replace' "
- elog " or add gnome-shell.desktop to ~/.config/autostart/ "
-
- gnome2_pkg_postinst
-}
diff --git a/gnome-base/gnome-shell/gnome-shell-2.91.2.ebuild b/gnome-base/gnome-shell/gnome-shell-2.91.2.ebuild
deleted file mode 100644
index 33e42bb..0000000
--- a/gnome-base/gnome-shell/gnome-shell-2.91.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
-HOMEPAGE="http://live.gnome.org/GnomeShell"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.25.9
- >=x11-libs/gtk+-2.91.0:3[introspection]
- >=media-libs/gstreamer-0.10.16
- >=media-libs/gst-plugins-base-0.10.16
- >=gnome-base/gnome-desktop-2.91.0:3
- >=dev-libs/gobject-introspection-0.9.5
-
- dev-libs/dbus-glib
- >=dev-libs/gjs-0.7.5
- x11-libs/pango[introspection]
- >=media-libs/clutter-1.4.0[introspection]
- dev-libs/libcroco:0.6
-
- >=gnome-base/dconf-0.4.1
- gnome-base/gconf[introspection]
- gnome-base/gnome-menus
- x11-libs/startup-notification
- x11-libs/libXfixes
- >=x11-wm/mutter-2.91.2[introspection]
- x11-apps/mesa-progs
- dev-python/dbus-python
- media-sound/pulseaudio
- gnome-base/gsettings-desktop-schemas
-"
-
-DEPEND="${RDEPEND}
- >=sys-devel/libtool-2.2.6
- >=dev-lang/python-2.5
- sys-devel/gettext
- >=dev-util/pkgconfig-0.22
- >=dev-util/intltool-0.26
- gnome-base/gnome-common
-"
-DOCS="AUTHORS README"
-
-pkg_postinst() {
- elog " Start with 'gnome-shell --replace' "
- elog " or add gnome-shell.desktop to ~/.config/autostart/ "
-
- gnome2_pkg_postinst
-}
diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
deleted file mode 100644
index 02d8a1e..0000000
--- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-EGIT_REPO_URI="git://git.gnome.org/gnome-shell"
-
-inherit autotools gnome2 git
-
-DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
-HOMEPAGE="http://live.gnome.org/GnomeShell"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.25.9
- >=x11-libs/gtk+-2.91.0:3[introspection]
- >=media-libs/gstreamer-0.10.16
- >=media-libs/gst-plugins-base-0.10.16
- >=gnome-base/gnome-desktop-2.91.2:3
- >=dev-libs/gobject-introspection-0.9.5
-
- dev-libs/dbus-glib
- >=dev-libs/gjs-0.7.5
- x11-libs/pango[introspection]
- >=media-libs/clutter-1.4.0[introspection]
- dev-libs/libcroco:0.6
-
- >=gnome-base/dconf-0.4.1
- gnome-base/gconf[introspection]
- gnome-base/gnome-menus
- x11-libs/startup-notification
- x11-libs/libXfixes
- >=x11-wm/mutter-2.91.2[introspection]
- x11-apps/mesa-progs
- dev-python/dbus-python
- media-sound/pulseaudio
- gnome-base/gsettings-desktop-schemas
-"
-
-DEPEND="${RDEPEND}
- >=sys-devel/libtool-2.2.6
- >=dev-lang/python-2.5
- sys-devel/gettext
- >=dev-util/pkgconfig-0.22
- >=dev-util/intltool-0.26
- gnome-base/gnome-common
-"
-DOCS="AUTHORS README"
-
-src_prepare() {
-
- mkdir m4
- intltoolize --force --copy --automake || die
- eautoreconf
-}
-
-pkg_postinst() {
- elog " Start with 'gnome-shell --replace' "
- elog " or add gnome-shell.desktop to ~/.config/autostart/ "
-
- gnome2_pkg_postinst
-}
diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest
deleted file mode 100644
index f242fa9..0000000
--- a/gnome-base/gsettings-desktop-schemas/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gsettings-desktop-schemas-0.1.2.tar.bz2 90449 RMD160 f04561f3b53a4278ab82c87f30338faa467c06fe SHA1 9aa357e95316736a3a7f60221036f46781a9d664 SHA256 971519a80cb51b6aba41ea1ba9a388d588b00ab018f3825733c438fae004e68b
-EBUILD gsettings-desktop-schemas-0.1.2.ebuild 550 RMD160 1bdd5eef994a5ef557d9c31b70c09c47897b75fb SHA1 dc0c32bab1e718fa8f080c03af6774ae89dbdc66 SHA256 ebed9c1ecddeefebbd0c9ba2c2f835cc3e7116d02d20174ce034a4b752086f9d
-EBUILD gsettings-desktop-schemas-9999.ebuild 679 RMD160 e6378b8b7f96b807efd4a3e0a3e6755e1f1f07c8 SHA1 bc3fa8ed43943ab96c889c97cdba2eb317a8501b SHA256 7ebe8c20a9bea455961f9f0c5b4c36bf6fd8483dad5ad2d1a87a35a42f5f6a45
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-0.1.2.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-0.1.2.ebuild
deleted file mode 100644
index e2f51c8..0000000
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-0.1.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-inherit gnome2
-
-DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.21"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- >=dev-util/intltool-0.40"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-9999.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-9999.ebuild
deleted file mode 100644
index 13c3e0c..0000000
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-EGIT_REPO_URI="git://git.gnome.org/gsettings-desktop-schemas"
-
-inherit autotools gnome2 git
-
-DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
-HOMEPAGE="http://www.gnome.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.21"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- >=dev-util/intltool-0.40"
-
-src_prepare() {
- mkdir m4
- intltoolize --force --copy --automake || die
- eautoreconf
-}
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
deleted file mode 100644
index 06a6dc8..0000000
--- a/gnome-base/gvfs/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX gvfs-1.2.2-expose-archive-backend.patch 1607 RMD160 cd17c501805fb81e560c35deb1d234280fd07f5c SHA1 70b1824a49ba654dda5ae2ef267ca45a31b53dc4 SHA256 a6cd0f6b848e1943f9121cf4ce4105f32573f9cf7cf75bc0d7d61a98babec519
-AUX gvfs-1.2.2-gphoto2-stricter-checks.patch 1127 RMD160 0c6d83f8b38cf41002dbe6f863916cfac66cd231 SHA1 fc4927fc0f3604689d446d4fe47b48384bee70a5 SHA256 146349147b82721551ce717d892068d608b352fdabd40b969ec9c2b97595c062
-AUX gvfs-1.6.4-sftp-timeout.patch 978 RMD160 01baba58c316fddda48cae2abf8ffee3942ac7fb SHA1 8f36224495e845db734de15c3478b9a5499d8713 SHA256 9b66f6e711dd70172204fa40a2a0e77f47253720532f831d5e571ec8021c98f6
-AUX gvfs-glib-2.27-port.patch 11813 RMD160 735bc7b8db5921c826840b1fb8be943c62de5bc2 SHA1 9e4fc13b1816c7f2e4e1c761ed5b198b20539fc5 SHA256 0a43dc5bffcefcae0db68b0a0c085a7cea06ab51664618dd585eead4358359ce
-DIST gvfs-1.7.0.tar.bz2 1388236 RMD160 2424e68e1bb55ff779c7d9383d26a68e571d33e4 SHA1 6d7f6c640e1486e39eb55c720b3db021aedfcc29 SHA256 0ff012cdcbc4de672ef0bc40dc8b54fb2f5e830e4ffe6a56016ad334ac28a483
-EBUILD gvfs-1.7.0.ebuild 3047 RMD160 90f2654b2705f48483b65324a11e94d62135576c SHA1 467ad3940113cde2e9844bd21bb07b43af88247e SHA256 d5cb49cab904e0ee2c940099a27b2ca6da3edd3734f03c05c0ef7034c2adb4dd
diff --git a/gnome-base/gvfs/files/gvfs-1.2.2-expose-archive-backend.patch b/gnome-base/gvfs/files/gvfs-1.2.2-expose-archive-backend.patch
deleted file mode 100644
index 86222e5..0000000
--- a/gnome-base/gvfs/files/gvfs-1.2.2-expose-archive-backend.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Upstream bug: http://bugzilla.gnome.org/show_bug.cgi?id=567235 (Fedora)
-Our bug: http://bugs.gentoo.org/show_bug.cgi?id=249829
-----
-Index: mount-archive.desktop.in.in
-===================================================================
---- mount-archive.desktop.in.in (revision 0)
-+++ mount-archive.desktop.in.in (revision 0)
-@@ -0,0 +1,14 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+_Name=Archive Mounter
-+Exec=@libexecdir@/gvfsd-archive file=%u
-+X-Gnome-Vfs-System=gio
-+MimeType=application/x-cd-image;application/x-bzip-compressed-tar;application/x-compressed-tar;application/x-tar;application/x-cpio;application/x-zip;application/zip;application/x-lzma-compressed-tar;
-+Terminal=false
-+StartupNotify=false
-+Type=Application
-+NoDisplay=true
-+X-GNOME-Bugzilla-Bugzilla=GNOME
-+X-GNOME-Bugzilla-Product=gvfs
-+X-GNOME-Bugzilla-Component=archive-backend
-+X-GNOME-Bugzilla-Version=@VERSION@
-Index: Makefile.am
-===================================================================
---- Makefile.am.orig 2008-07-22 15:35:49.000000000 +0200
-+++ Makefile.am 2008-07-22 17:56:59.417180064 +0200
-@@ -1,5 +1,20 @@
- NULL =
-
-+@INTLTOOL_DESKTOP_RULE@
-+
-+desktop_in_files = mount-archive.desktop.in
-+
-+mount-archive.desktop.in: mount-archive.desktop.in.in
-+ sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-+
-+desktopdir = $(datadir)/applications
-+if HAVE_ARCHIVE
-+desktop_DATA = mount-archive.desktop
-+else
-+desktop_DATA =
-+endif
-+
-+
- SUBDIRS = \
- common \
- client \
-@@ -15,6 +30,8 @@
-
- EXTRA_DIST = \
- MAINTAINERS \
-+ mount-archive.desktop.in.in \
-+ $(desktop_in_files) \
- $(NULL)
-
- DISTCLEANFILES = \
diff --git a/gnome-base/gvfs/files/gvfs-1.2.2-gphoto2-stricter-checks.patch b/gnome-base/gvfs/files/gvfs-1.2.2-gphoto2-stricter-checks.patch
deleted file mode 100644
index 78fecb7..0000000
--- a/gnome-base/gvfs/files/gvfs-1.2.2-gphoto2-stricter-checks.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Gentoo bug 264941
-Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=578027
----
-diff -urNp gvfs-1.2.2/configure.ac gvfs-1.2.2-new/configure.ac
---- gvfs-1.2.2/configure.ac 2009-04-03 13:00:54.000000000 +0530
-+++ gvfs-1.2.2-new/configure.ac 2009-05-04 22:53:24.000000000 +0530
-@@ -307,12 +307,20 @@ if test "x$enable_gphoto2" != "xno" -a "
- ;;
- esac
-
-+ if test "x$enable_gphoto2" = "xyes" -a "x$msg_gphoto2" != "xyes"; then
-+ AC_MSG_ERROR([gphoto2 support requested but not available])
-+ fi
-+
- if test "x$msg_gphoto2" = "xyes"; then
- if test "x$use_gphoto2" = "xyes"; then
- PKG_CHECK_MODULES(GPHOTO2, libgphoto2 >= 2.4.0)
- AC_DEFINE(HAVE_GPHOTO2, 1, [Define to 1 if gphoto2 is available])
- else
-- AC_MSG_WARN([Not building with gphoto2 support. Need OS tweaks in hal volume monitor.])
-+ if test "x$enable_gphoto2" = "xyes"; then
-+ AC_MSG_ERROR([Cannot build with gphoto2 support. Need OS tweaks in hal volume monitor.])
-+ else
-+ AC_MSG_WARN([Not building with gphoto2 support. Need OS tweaks in hal volume monitor.])
-+ fi
- msg_gphoto2=no
- fi
- fi
diff --git a/gnome-base/gvfs/files/gvfs-1.6.4-sftp-timeout.patch b/gnome-base/gvfs/files/gvfs-1.6.4-sftp-timeout.patch
deleted file mode 100644
index a236dd2..0000000
--- a/gnome-base/gvfs/files/gvfs-1.6.4-sftp-timeout.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 4033907045abcf498686c1b34be7b0160260088d Mon Sep 17 00:00:00 2001
-From: Andreas Henriksson <andreas@fatal.se>
-Date: Sat, 02 Oct 2010 12:51:54 +0000
-Subject: sftp: fix poll() timeout.
-
-When switching from select() to poll() in commit
-"sftp: Use poll() to cope with openssh-5.6 changes" (c6be45c8934)
-the difference in seconds vs milliseconds for select/poll timeout
-argument was missed.
-
-SFTP_READ_TIMEOUT is defined in seconds, so multiply it with 1000
-when using it with poll().
-
-https://bugzilla.gnome.org/show_bug.cgi?id=631169
----
-diff --git a/daemon/gvfsbackendsftp.c b/daemon/gvfsbackendsftp.c
-index 9fecf6a..f6b7785 100644
---- a/daemon/gvfsbackendsftp.c
-+++ b/daemon/gvfsbackendsftp.c
-@@ -869,7 +869,7 @@ handle_login (GVfsBackend *backend,
- fds[1].fd = prompt_fd;
- fds[1].events = POLLIN;
-
-- ret = poll(fds, 2, SFTP_READ_TIMEOUT);
-+ ret = poll(fds, 2, SFTP_READ_TIMEOUT * 1000);
-
- if (ret <= 0)
- {
---
-cgit v0.8.3.1
diff --git a/gnome-base/gvfs/files/gvfs-glib-2.27-port.patch b/gnome-base/gvfs/files/gvfs-glib-2.27-port.patch
deleted file mode 100644
index 73cc912..0000000
--- a/gnome-base/gvfs/files/gvfs-glib-2.27-port.patch
+++ /dev/null
@@ -1,388 +0,0 @@
-From e868c0c306c31ffb9b65ca8555fd27cdc53a083d Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Tue, 5 Oct 2010 14:12:00 +0100
-Subject: [PATCH] Remove app lookup extension
-
-Now done in GIO itself
-
-https://bugzilla.gnome.org/show_bug.cgi?id=631398
----
- Makefile.am | 1 -
- configure.ac | 1 -
- gconf/Makefile.am | 32 ---------
- gconf/gapplookupgconf.c | 178 -----------------------------------------------
- gconf/gapplookupgconf.h | 51 -------------
- gconf/gconf-module.c | 55 ---------------
- 6 files changed, 0 insertions(+), 318 deletions(-)
- delete mode 100644 gconf/Makefile.am
- delete mode 100644 gconf/gapplookupgconf.c
- delete mode 100644 gconf/gapplookupgconf.h
- delete mode 100644 gconf/gconf-module.c
-
-diff --git a/Makefile.am b/Makefile.am
-index 95d0654..23261da 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -6,7 +6,6 @@ SUBDIRS = \
- client \
- daemon \
- monitor \
-- gconf \
- po \
- programs \
- test \
-diff --git a/configure.ac b/configure.ac
-index a4e3387..94c870e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -704,7 +704,6 @@ monitor/hal/Makefile
- monitor/gdu/Makefile
- monitor/gphoto2/Makefile
- monitor/afc/Makefile
--gconf/Makefile
- programs/Makefile
- test/Makefile
- po/Makefile.in
-diff --git a/gconf/Makefile.am b/gconf/Makefile.am
-deleted file mode 100644
-index 85d4d8d..0000000
---- a/gconf/Makefile.am
-+++ /dev/null
-@@ -1,32 +0,0 @@
--
--NULL =
--
--module_flags = -export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload|query)'
--
--if USE_GCONF
--giomodules_LTLIBRARIES = libgiogconf.la
--endif
--
--libgiogconf_la_SOURCES = \
-- gapplookupgconf.c gapplookupgconf.h \
-- gconf-module.c \
-- $(NULL)
--
--libgiogconf_la_CFLAGS = \
-- -DG_LOG_DOMAIN=\"GVFS-GConf\" \
-- -I$(top_srcdir)/common \
-- $(GLIB_CFLAGS) \
-- $(GCONF_CFLAGS) \
-- -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
-- -DGVFS_LOCALEDIR=\""$(localedir)"\" \
-- -DG_DISABLE_DEPRECATED \
-- $(NULL)
--
--libgiogconf_la_LDFLAGS = \
-- $(module_flags) \
-- $(NULL)
--
--libgiogconf_la_LIBADD = \
-- $(GLIB_LIBS) \
-- $(GCONF_LIBS) \
-- $(NULL)
-diff --git a/gconf/gapplookupgconf.c b/gconf/gapplookupgconf.c
-deleted file mode 100644
-index 2690265..0000000
---- a/gconf/gapplookupgconf.c
-+++ /dev/null
-@@ -1,178 +0,0 @@
--
--/* GIO - GLib Input, Output and Streaming Library
-- *
-- * Copyright (C) 2006-2007 Red Hat, Inc.
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This library is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General
-- * Public License along with this library; if not, write to the
-- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-- * Boston, MA 02111-1307, USA.
-- *
-- * Author: Alexader Larsson <alexl@redhat.com>
-- */
--
--#include <config.h>
--
--#include <string.h>
--
--#include <glib.h>
--#include <glib/gi18n-lib.h>
--#include <gio/gio.h>
--#include <gconf/gconf-client.h>
--
--#include "gapplookupgconf.h"
--
--
--struct _GAppLookupGConf {
-- GObject parent;
--
--};
--
--static void lookup_iface_init (GDesktopAppInfoLookupIface *iface);
--static void g_app_lookup_gconf_finalize (GObject *object);
--
--G_DEFINE_DYNAMIC_TYPE_EXTENDED (GAppLookupGConf, g_app_lookup_gconf, G_TYPE_OBJECT, 0,
-- G_IMPLEMENT_INTERFACE_DYNAMIC (G_TYPE_DESKTOP_APP_INFO_LOOKUP,
-- lookup_iface_init))
--
--static void
--g_app_lookup_gconf_finalize (GObject *object)
--{
-- if (G_OBJECT_CLASS (g_app_lookup_gconf_parent_class)->finalize)
-- (*G_OBJECT_CLASS (g_app_lookup_gconf_parent_class)->finalize) (object);
--}
--
--static GObject *
--g_app_lookup_gconf_constructor (GType type,
-- guint n_construct_properties,
-- GObjectConstructParam *construct_properties)
--{
-- GObject *object;
-- GAppLookupGConfClass *klass;
-- GObjectClass *parent_class;
--
-- object = NULL;
--
-- /* Invoke parent constructor. */
-- klass = G_APP_LOOKUP_GCONF_CLASS (g_type_class_peek (G_TYPE_APP_LOOKUP_GCONF));
-- parent_class = G_OBJECT_CLASS (g_type_class_peek_parent (klass));
-- object = parent_class->constructor (type,
-- n_construct_properties,
-- construct_properties);
--
-- return object;
--}
--
--static void
--g_app_lookup_gconf_init (GAppLookupGConf *lookup)
--{
--}
--
--static void
--g_app_lookup_gconf_class_finalize (GAppLookupGConfClass *klass)
--{
--}
--
--
--static void
--g_app_lookup_gconf_class_init (GAppLookupGConfClass *klass)
--{
-- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
--
-- gobject_class->constructor = g_app_lookup_gconf_constructor;
-- gobject_class->finalize = g_app_lookup_gconf_finalize;
--}
--
--#define GCONF_PATH_PREFIX "/desktop/gnome/url-handlers/"
--
--static GAppInfo *
--get_default_for_uri_scheme (GDesktopAppInfoLookup *lookup,
-- const char *uri_scheme)
--{
-- GAppInfo *appinfo;
-- GConfClient *client;
-- char *command_key, *enabled_key, *terminal_key, *command;
-- gboolean enabled, needs_terminal;
-- GAppInfoCreateFlags flags;
--
-- appinfo = NULL;
--
-- client = gconf_client_get_default ();
--
-- command_key = g_strconcat (GCONF_PATH_PREFIX,
-- uri_scheme,
-- "/command",
-- NULL);
-- command = gconf_client_get_string (client,
-- command_key,
-- NULL);
-- g_free (command_key);
-- if (command)
-- {
-- enabled_key = g_strconcat (GCONF_PATH_PREFIX,
-- uri_scheme,
-- "/enabled",
-- NULL);
-- enabled = gconf_client_get_bool (client,
-- enabled_key,
-- NULL);
-- g_free (enabled_key);
--
-- terminal_key = g_strconcat (GCONF_PATH_PREFIX,
-- uri_scheme,
-- "/needs_terminal",
-- NULL);
-- needs_terminal = gconf_client_get_bool (client,
-- terminal_key,
-- NULL);
-- g_free (terminal_key);
--
-- if (enabled)
-- {
-- if (g_str_has_suffix (command, "\"%s\"") ||
-- g_str_has_suffix (command, "\'%s\'"))
-- command[strlen (command) - 4] = 0;
-- else if (g_str_has_suffix (command, "%s"))
-- command[strlen (command) - 2] = 0;
--
-- flags = G_APP_INFO_CREATE_SUPPORTS_URIS;
-- if (needs_terminal)
-- flags |= G_APP_INFO_CREATE_NEEDS_TERMINAL;
-- appinfo = g_app_info_create_from_commandline (command,
-- NULL,
-- flags,
-- NULL);
-- }
-- }
--
-- g_object_unref (client);
-- g_free (command);
--
-- return appinfo;
--}
--
--static void
--lookup_iface_init (GDesktopAppInfoLookupIface *iface)
--{
-- iface->get_default_for_uri_scheme = get_default_for_uri_scheme;
--}
--
--void
--g_app_lookup_gconf_register (GIOModule *module)
--{
-- g_app_lookup_gconf_register_type (G_TYPE_MODULE (module));
-- g_io_extension_point_implement (G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME,
-- G_TYPE_APP_LOOKUP_GCONF,
-- "gconf",
-- 10);
--}
-diff --git a/gconf/gapplookupgconf.h b/gconf/gapplookupgconf.h
-deleted file mode 100644
-index a268415..0000000
---- a/gconf/gapplookupgconf.h
-+++ /dev/null
-@@ -1,51 +0,0 @@
--/* GIO - GLib Input, Output and Streaming Library
-- *
-- * Copyright (C) 2006-2007 Red Hat, Inc.
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This library is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General
-- * Public License along with this library; if not, write to the
-- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-- * Boston, MA 02111-1307, USA.
-- *
-- * Author: Alexander Larsson <alexl@redhat.com>
-- */
--
--#ifndef __G_APP_LOOKUP_GCONF_H__
--#define __G_APP_LOOKUP_GCONF_H__
--
--#include <glib-object.h>
--#include <gio/gio.h>
--#include <gio/gdesktopappinfo.h>
--
--
--G_BEGIN_DECLS
--
--#define G_TYPE_APP_LOOKUP_GCONF (g_app_lookup_gconf_get_type ())
--#define G_APP_LOOKUP_GCONF(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_APP_LOOKUP_GCONF, GAppLookupGConf))
--#define G_APP_LOOKUP_GCONF_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_APP_LOOKUP_GCONF, GAppLookupGConfClass))
--#define G_IS_APP_LOOKUP_GCONF(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_APP_LOOKUP_GCONF))
--#define G_IS_APP_LOOKUP_GCONF_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_APP_LOOKUP_GCONF))
--
--typedef struct _GAppLookupGConf GAppLookupGConf;
--typedef struct _GAppLookupGConfClass GAppLookupGConfClass;
--
--struct _GAppLookupGConfClass {
-- GObjectClass parent_class;
--};
--
--GType g_app_lookup_gconf_get_type (void) G_GNUC_CONST;
--void g_app_lookup_gconf_register (GIOModule *module);
--
--G_END_DECLS
--
--#endif /* __G_APP_LOOKUP_GCONF_H__ */
-diff --git a/gconf/gconf-module.c b/gconf/gconf-module.c
-deleted file mode 100644
-index e5753a6..0000000
---- a/gconf/gconf-module.c
-+++ /dev/null
-@@ -1,55 +0,0 @@
--
--/* GIO - GLib Input, Output and Streaming Library
-- *
-- * Copyright (C) 2006-2007 Red Hat, Inc.
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This library is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- * Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General
-- * Public License along with this library; if not, write to the
-- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-- * Boston, MA 02111-1307, USA.
-- *
-- * Author: David Zeuthen <davidz@redhat.com>
-- */
--
--#include <config.h>
--
--#include <glib.h>
--#include <glib/gi18n-lib.h>
--#include <gmodule.h>
--#include <gio/gio.h>
--
--#include "gapplookupgconf.h"
--
--void
--g_io_module_load (GIOModule *module)
--{
-- bindtextdomain (GETTEXT_PACKAGE, GVFS_LOCALEDIR);
-- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
--
-- g_app_lookup_gconf_register (module);
--}
--
--void
--g_io_module_unload (GIOModule *module)
--{
--}
--
--char **
--g_io_module_query (void)
--{
-- char *eps[] = {
-- G_DESKTOP_APP_INFO_LOOKUP_EXTENSION_POINT_NAME,
-- NULL
-- };
-- return g_strdupv (eps);
--}
---
-1.7.2.2
-
diff --git a/gnome-base/gvfs/gvfs-1.7.0.ebuild b/gnome-base/gvfs/gvfs-1.7.0.ebuild
deleted file mode 100644
index 8d523bf..0000000
--- a/gnome-base/gvfs/gvfs-1.7.0.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.6.4-r1.ebuild,v 1.1 2010/10/05 08:49:12 pacho Exp $
-
-EAPI="3"
-
-inherit autotools bash-completion gnome2 eutils
-
-DESCRIPTION="GNOME Virtual Filesystem Layer"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="LGPL-2"
-SLOT="0"
-# Needs glib-2.27, which is unkeyworded
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="archive avahi bluetooth cdda doc fuse gdu gnome-keyring gphoto2 hal
-+http iphone samba +udev"
-
-# Need newer glib for gnome bug 631398
-# patch applied below
-RDEPEND=">=dev-libs/glib-2.27.1
- >=sys-apps/dbus-1.0
- dev-libs/libxml2
- net-misc/openssh
- >=sys-fs/udev-138
- archive? ( app-arch/libarchive )
- avahi? ( >=net-dns/avahi-0.6 )
- bluetooth? (
- >=app-mobilephone/obex-data-server-0.4.5
- dev-libs/dbus-glib
- net-wireless/bluez
- dev-libs/expat )
- fuse? ( sys-fs/fuse )
- gdu? ( >=sys-apps/gnome-disk-utility-2.29 )
- gnome-keyring? ( >=gnome-base/gnome-keyring-1.0 )
- gphoto2? ( >=media-libs/libgphoto2-2.4.7 )
- iphone? ( app-pda/libimobiledevice )
- udev? (
- cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
- >=sys-fs/udev-145[extras] )
- hal? (
- cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
- >=sys-apps/hal-0.5.10 )
- http? ( >=net-libs/libsoup-gnome-2.26.0 )
- samba? ( || ( >=net-fs/samba-3.4.6[smbclient]
- <=net-fs/samba-3.3 ) )"
-DEPEND="${RDEPEND}
- >=dev-util/intltool-0.40
- >=dev-util/pkgconfig-0.19
- dev-util/gtk-doc-am
- doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
- if use cdda && ! use hal && ! use udev; then
- ewarn "You have \"+cdda\", but you have \"-hal\" and \"-udev\""
- ewarn "cdda support will NOT be built unless you enable EITHER hal OR udev"
- fi
-
- G2CONF="${G2CONF}
- --enable-udev
- --disable-bash-completion
- --with-dbus-service-dir=/usr/share/dbus-1/services
- $(use_enable archive)
- $(use_enable avahi)
- $(use_enable bluetooth obexftp)
- $(use_enable cdda)
- $(use_enable fuse)
- $(use_enable gdu)
- $(use_enable gphoto2)
- $(use_enable iphone afc)
- $(use_enable udev gudev)
- $(use_enable hal)
- $(use_enable http)
- $(use_enable gnome-keyring keyring)
- $(use_enable samba)"
-}
-
-src_prepare() {
- gnome2_src_prepare
-
- # Conditional patching purely to avoid eautoreconf
- use gphoto2 && epatch "${FILESDIR}/${PN}-1.2.2-gphoto2-stricter-checks.patch"
-
- if use archive; then
- epatch "${FILESDIR}/${PN}-1.2.2-expose-archive-backend.patch"
- echo "mount-archive.desktop.in" >> po/POTFILES.in
- echo "mount-archive.desktop.in.in" >> po/POTFILES.in
- fi
-
- use gphoto2 || use archive && eautoreconf
-}
-
-src_install() {
- gnome2_src_install
- use bash-completion && \
- dobashcompletion programs/gvfs-bash-completion.sh ${PN}
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- use bash-completion && bash-completion_pkg_postinst
-
- ewarn "In order to use the new gvfs services, please reload dbus configuration"
- ewarn "You may need to log out and log back in for some changes to take effect"
-}
diff --git a/gnome-base/libgnomekbd/Manifest b/gnome-base/libgnomekbd/Manifest
deleted file mode 100644
index 9c66b3f..0000000
--- a/gnome-base/libgnomekbd/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST libgnomekbd-2.91.3.1.tar.bz2 412398 RMD160 75ba3891777f0e6b1b8976020d83525563df1744 SHA1 8ab3a79de9ea88b8f4b707b74d0e18540aa8d827 SHA256 06771653341d63dc838db997ba963275c363ab92efdf539ef720c1c62b681fb0
-EBUILD libgnomekbd-2.91.3.1.ebuild 1061 RMD160 197a78bd21edc41689f0834c98397bedac4bd0db SHA1 1ae54a6624ea7d466f02ae9c350b7084374a76bd SHA256 557f8bc064904e1c005fb04e3494a6493a062769bd98ce817e2b188d0b5eec33
diff --git a/gnome-base/libgnomekbd/libgnomekbd-2.91.3.1.ebuild b/gnome-base/libgnomekbd/libgnomekbd-2.91.3.1.ebuild
deleted file mode 100644
index 8dd54bb..0000000
--- a/gnome-base/libgnomekbd/libgnomekbd-2.91.3.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.30.1.ebuild,v 1.1 2010/06/13 16:47:46 pacho Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 multilib
-
-DESCRIPTION="Gnome keyboard configuration library"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.18
- >=sys-apps/dbus-0.92
- >=dev-libs/dbus-glib-0.34
- >=x11-libs/gtk+-2.90:3
- >=x11-libs/libxklavier-5.0"
-DEPEND="${RDEPEND}
- >=dev-util/intltool-0.35
- >=dev-util/pkgconfig-0.19"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
- # Only user interaction required graphical tests at the time of 2.22.0 - not useful for us
- G2CONF="${G2CONF} --disable-tests --disable-static"
-}
-
-src_compile() {
- # FreeBSD doesn't like -j, upstream? bug #????
- use x86-fbsd && MAKEOPTS="${MAKEOPTS} -j1"
- gnome2_src_compile
-}
diff --git a/media-libs/clutter/Manifest b/media-libs/clutter/Manifest
deleted file mode 100644
index e245044..0000000
--- a/media-libs/clutter/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX clutter-9999-perfneu1.patch 9954 RMD160 01a2cde328ae679306ef9b22ec9c3379db69ac3e SHA1 b0744464efedd7ea0fb0fc3b52db69eabeed16d4 SHA256 34d1d29777a970cd5700d980a6b33384915fdc5b681e02900ba527341ac4ed7b
-AUX clutter-9999-perfneu2.patch 4273 RMD160 b959603a0ebd98a1730344b48d127ece18b2a1b8 SHA1 341b26fef9ab4c8ff940cc1dccdeca10178212df SHA256 8f6d90a3f314a691f3c0483783877fcbe396598f5e38c9ee33f676ace9352081
-AUX clutter-9999-perfneu3.patch 1279 RMD160 34707927a17f568f013d57bd4f548c1f997a1344 SHA1 6420c2cacd4dda2d4697a4d119d0681a355f7953 SHA256 6af62a96d225f57473cd405414e8b40acca98f673f22167ca7e3433172018472
-AUX clutter-9999-perfneu4.patch 5970 RMD160 b628417bc2eef56dd03f2333da64a7dca59b547d SHA1 5fb0021ad22501998de4dc6f69563a7e37dc1b4e SHA256 acf2e34ff4a0b7180bcd4cbf51c3a72c30245484994d2abcd640291b3e6f4755
-AUX clutter-9999-perfneu5.patch 20332 RMD160 1c74cdcbe46f2ae40ee94fe2e1f7d8614a90b8c6 SHA1 d64c677876bf1a9e3ad2e7a09f04def689cf1b57 SHA256 c1916661519a85fb8d40f97259ab3647378ec4609236fbf4438cdc67fe7c8472
-AUX clutter-9999-perfneu6.patch 3416 RMD160 168039d8e0363ce109fc9cc4285ca5717e46c884 SHA1 95fa439f4a7ed1a0a02d8556fa2b75981e195f78 SHA256 539bf54212b8dd65ccc68e9e199396efe4d25204dadd11d0f76aff665e2adf3c
-DIST clutter-1.5.8.tar.bz2 4754383 RMD160 9368ff3b24699952098c42ba79fda77fb3ea55c1 SHA1 1396b172479cdac1d54ecd1c0efabdee2ee9bc14 SHA256 f342b57027a94f3266060aaaae73ea06f4bf0be66196bfc0cacf17240e14139c
-EBUILD clutter-1.5.8.ebuild 1986 RMD160 277a7bde5cf2d55fd393c67ab9857cd84c2539a4 SHA1 a6cddc53cc090cf3977675a2cdfcf5e7f6a0139a SHA256 c71f8d9f9516bc364fa6ceb2617cae277b82227b98bebb522eaf1bd2cb85768b
diff --git a/media-libs/clutter/clutter-1.5.8.ebuild b/media-libs/clutter/clutter-1.5.8.ebuild
deleted file mode 100644
index 2ef5ae0..0000000
--- a/media-libs/clutter/clutter-1.5.8.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit clutter
-
-DESCRIPTION="Clutter is a library for creating graphical user interfaces"
-
-SLOT="1.0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="debug doc +gtk +introspection"
-
-# NOTE: glx flavour uses libdrm + >=mesa-7.3
-RDEPEND=">=dev-libs/glib-2.26
- >=x11-libs/cairo-1.10
- >=x11-libs/pango-1.20[introspection?]
- >=dev-libs/json-glib-0.12[introspection?]
- >=dev-libs/atk-1.7
-
- virtual/opengl
- x11-libs/libdrm
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXdamage
- x11-libs/libXi
- x11-proto/inputproto
- >=x11-libs/libXfixes-3
- >=x11-libs/libXcomposite-0.4
-
- gtk? ( || (
- x11-libs/gdk-pixbuf
- >=x11-libs/gtk+-2.0 ) )
- introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
-"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- dev-util/pkgconfig
- >=dev-util/gtk-doc-am-1.13
- doc? (
- >=dev-util/gtk-doc-1.13
- >=app-text/docbook-sgml-utils-0.6.14[jadetex]
- dev-libs/libxslt )
-"
-
-src_configure() {
- # We only need conformance tests, the rest are useless for us
-# sed -e 's/^\(SUBDIRS =\).*/\1/g' \
-# -i tests/Makefile.{am,in} || die "tests sed failed"
-
- # XXX: Conformance test suite (and clutter itself) does not work under Xvfb
- # XXX: Profiling, coverage disabled for now
- # XXX: What do we do about eglx/eglnative/opengl-egl-xlib/osx/etc flavours?
- local myconf="
- --enable-debug=minimum
- --enable-cogl-debug=minimum
- --enable-conformance=no
- --disable-gcov
- --enable-profile=no
- --enable-maintainer-flags=no
- --enable-xinput
- --with-flavour=glx
- --with-imagebackend=gdk-pixbuf
- $(use_enable introspection)
- $(use_enable doc docs)"
-
- if ! use gtk; then
- myconf="${myconf} --with-imagebackend=internal"
- # Internal image backend is experimental
- ewarn "You have selected the experimental internal image backend"
- fi
-
- if use debug; then
- myconf="${myconf}
- --enable-debug=yes
- --enable-cogl-debug=yes"
- fi
-
- touch ${S}/TODO
-
- econf ${myconf}
-}
diff --git a/media-libs/clutter/files/clutter-9999-perfneu1.patch b/media-libs/clutter/files/clutter-9999-perfneu1.patch
deleted file mode 100644
index 59b2d27..0000000
--- a/media-libs/clutter/files/clutter-9999-perfneu1.patch
+++ /dev/null
@@ -1,248 +0,0 @@
-From 2b5eb9205ae85c8b459d993da803a31c847e5776 Mon Sep 17 00:00:00 2001
-From: Neil Roberts <neil@linux.intel.com>
-Date: Thu, 11 Nov 2010 15:28:44 +0000
-Subject: [PATCH] Add an internal _cogl_offscreen_new_to_texture_full function
-
-This function is the same as cogl_offscreen_new_to_texture but it
-takes a level parameter and a set of flags so that FBOs can be used to
-render to higher mipmap levels and to disable the depth and stencil
-buffers. cogl_offscreen_new_to_texture now just calls the new function
-with the level set to zero. This function could be useful in a few
-places in Cogl where we want to use FBOs as an implementation detail
-such as when copying between textures.
-
-http://bugzilla.clutter-project.org/show_bug.cgi?id=2414
----
- clutter/cogl/cogl/cogl-framebuffer-private.h | 24 ++++++
- clutter/cogl/cogl/cogl-framebuffer.c | 100 +++++++++++++++++++------
- 2 files changed, 100 insertions(+), 24 deletions(-)
-
-diff --git a/clutter/cogl/cogl/cogl-framebuffer-private.h b/clutter/cogl/cogl/cogl-framebuffer-private.h
-index 1ae102e..803befd 100644
---- a/clutter/cogl/cogl/cogl-framebuffer-private.h
-+++ b/clutter/cogl/cogl/cogl-framebuffer-private.h
-@@ -66,6 +66,12 @@ typedef struct _CoglOffscreen
- CoglHandle texture;
- } CoglOffscreen;
-
-+/* Flags to pass to _cogl_offscreen_new_to_texture_full */
-+typedef enum
-+{
-+ COGL_OFFSCREEN_DISABLE_DEPTH_STENCIL = 1
-+} CoglOffscreenFlags;
-+
- #define COGL_OFFSCREEN(X) ((CoglOffscreen *)(X))
-
- typedef struct _CoglOnscreen
-@@ -143,5 +149,23 @@ _cogl_create_framebuffer_stack (void);
- void
- _cogl_free_framebuffer_stack (GSList *stack);
-
-+/*
-+ * _cogl_offscreen_new_to_texture_full:
-+ * @texhandle: A handle to the texture to target
-+ * @create_flags: Flags specifying how to create the FBO
-+ * @level: The mipmap level within the texture to target
-+ *
-+ * Creates a new offscreen buffer which will target the given
-+ * texture. By default the buffer will have a depth and stencil
-+ * buffer. This can be disabled by passing
-+ * %COGL_OFFSCREEN_DISABLE_DEPTH_STENCIL in @create_flags.
-+ *
-+ * Return value: the new CoglOffscreen object.
-+ */
-+CoglHandle
-+_cogl_offscreen_new_to_texture_full (CoglHandle texhandle,
-+ CoglOffscreenFlags create_flags,
-+ unsigned int level);
-+
- #endif /* __COGL_FRAMEBUFFER_PRIVATE_H */
-
-diff --git a/clutter/cogl/cogl/cogl-framebuffer.c b/clutter/cogl/cogl/cogl-framebuffer.c
-index 2042c0a..5e832b1 100644
---- a/clutter/cogl/cogl/cogl-framebuffer.c
-+++ b/clutter/cogl/cogl/cogl-framebuffer.c
-@@ -324,10 +324,18 @@ _cogl_framebuffer_init_bits (CoglFramebuffer *framebuffer)
- framebuffer->dirty_bitmasks = FALSE;
- }
-
-+typedef struct
-+{
-+ CoglHandle texture;
-+ unsigned int level;
-+ unsigned int level_width;
-+ unsigned int level_height;
-+} CoglFramebufferTryFBOData;
-+
- static gboolean
- try_creating_fbo (CoglOffscreen *offscreen,
- TryFBOFlags flags,
-- CoglHandle texture)
-+ CoglFramebufferTryFBOData *data)
- {
- GLuint gl_depth_stencil_handle;
- GLuint gl_depth_handle;
-@@ -339,7 +347,8 @@ try_creating_fbo (CoglOffscreen *offscreen,
-
- _COGL_GET_CONTEXT (ctx, FALSE);
-
-- if (!cogl_texture_get_gl_texture (texture, &tex_gl_handle, &tex_gl_target))
-+ if (!cogl_texture_get_gl_texture (data->texture,
-+ &tex_gl_handle, &tex_gl_target))
- return FALSE;
-
- if (tex_gl_target != GL_TEXTURE_2D
-@@ -362,7 +371,7 @@ try_creating_fbo (CoglOffscreen *offscreen,
- offscreen->fbo_handle = fbo_gl_handle;
-
- GE (glFramebufferTexture2D (GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
-- tex_gl_target, tex_gl_handle, 0));
-+ tex_gl_target, tex_gl_handle, data->level));
-
- if (flags & _TRY_DEPTH_STENCIL)
- {
-@@ -370,8 +379,8 @@ try_creating_fbo (CoglOffscreen *offscreen,
- GE (glGenRenderbuffers (1, &gl_depth_stencil_handle));
- GE (glBindRenderbuffer (GL_RENDERBUFFER, gl_depth_stencil_handle));
- GE (glRenderbufferStorage (GL_RENDERBUFFER, GL_DEPTH_STENCIL,
-- cogl_texture_get_width (texture),
-- cogl_texture_get_height (texture)));
-+ data->level_width,
-+ data->level_height));
- GE (glBindRenderbuffer (GL_RENDERBUFFER, 0));
- GE (glFramebufferRenderbuffer (GL_FRAMEBUFFER,
- GL_STENCIL_ATTACHMENT,
-@@ -391,8 +400,8 @@ try_creating_fbo (CoglOffscreen *offscreen,
- /* For now we just ask for GL_DEPTH_COMPONENT16 since this is all that's
- * available under GLES */
- GE (glRenderbufferStorage (GL_RENDERBUFFER, GL_DEPTH_COMPONENT16,
-- cogl_texture_get_width (texture),
-- cogl_texture_get_height (texture)));
-+ data->level_width,
-+ data->level_height));
- GE (glBindRenderbuffer (GL_RENDERBUFFER, 0));
- GE (glFramebufferRenderbuffer (GL_FRAMEBUFFER,
- GL_DEPTH_ATTACHMENT,
-@@ -407,8 +416,8 @@ try_creating_fbo (CoglOffscreen *offscreen,
- GE (glGenRenderbuffers (1, &gl_stencil_handle));
- GE (glBindRenderbuffer (GL_RENDERBUFFER, gl_stencil_handle));
- GE (glRenderbufferStorage (GL_RENDERBUFFER, GL_STENCIL_INDEX8,
-- cogl_texture_get_width (texture),
-- cogl_texture_get_height (texture)));
-+ data->level_width,
-+ data->level_height));
- GE (glBindRenderbuffer (GL_RENDERBUFFER, 0));
- GE (glFramebufferRenderbuffer (GL_FRAMEBUFFER,
- GL_STENCIL_ATTACHMENT,
-@@ -443,11 +452,16 @@ try_creating_fbo (CoglOffscreen *offscreen,
- }
-
- CoglHandle
--cogl_offscreen_new_to_texture (CoglHandle texhandle)
-+_cogl_offscreen_new_to_texture_full (CoglHandle texhandle,
-+ CoglOffscreenFlags create_flags,
-+ unsigned int level)
- {
- CoglOffscreen *offscreen;
- static TryFBOFlags flags;
- static gboolean have_working_flags = FALSE;
-+ unsigned int i;
-+ CoglFramebufferTryFBOData data;
-+ gboolean fbo_created;
-
- _COGL_GET_CONTEXT (ctx, COGL_INVALID_HANDLE);
-
-@@ -462,6 +476,27 @@ cogl_offscreen_new_to_texture (CoglHandle texhandle)
- if (cogl_texture_is_sliced (texhandle))
- return COGL_INVALID_HANDLE;
-
-+ data.texture = texhandle;
-+ data.level = level;
-+
-+ /* Calculate the size of the texture at this mipmap level to ensure
-+ that it's a valid level */
-+ data.level_width = cogl_texture_get_width (texhandle);
-+ data.level_height = cogl_texture_get_height (texhandle);
-+
-+ for (i = 0; i < level; i++)
-+ {
-+ /* If neither dimension can be further divided then the level is
-+ invalid */
-+ if (data.level_width == 1 && data.level_height == 1)
-+ return COGL_INVALID_HANDLE;
-+
-+ if (data.level_width > 1)
-+ data.level_width >>= 1;
-+ if (data.level_height > 1)
-+ data.level_height >>= 1;
-+ }
-+
- /* XXX: The framebuffer_object spec isn't clear in defining whether attaching
- * a texture as a renderbuffer with mipmap filtering enabled while the
- * mipmaps have not been uploaded should result in an incomplete framebuffer
-@@ -477,25 +512,36 @@ cogl_offscreen_new_to_texture (CoglHandle texhandle)
- offscreen = g_new0 (CoglOffscreen, 1);
- offscreen->texture = cogl_handle_ref (texhandle);
-
-- if ((have_working_flags &&
-- try_creating_fbo (offscreen, flags, texhandle)) ||
-+ if ((create_flags & COGL_OFFSCREEN_DISABLE_DEPTH_STENCIL))
-+ fbo_created = try_creating_fbo (offscreen, flags = 0, &data);
-+ else
-+ {
-+ if ((have_working_flags &&
-+ try_creating_fbo (offscreen, flags, &data)) ||
- #ifdef HAVE_COGL_GL
-- try_creating_fbo (offscreen, flags = _TRY_DEPTH_STENCIL, texhandle) ||
-+ try_creating_fbo (offscreen, flags = _TRY_DEPTH_STENCIL, &data) ||
- #endif
-- try_creating_fbo (offscreen, flags = _TRY_DEPTH | _TRY_STENCIL,
-- texhandle) ||
-- try_creating_fbo (offscreen, flags = _TRY_STENCIL, texhandle) ||
-- try_creating_fbo (offscreen, flags = _TRY_DEPTH, texhandle) ||
-- try_creating_fbo (offscreen, flags = 0, texhandle))
-- {
-- /* Record that the last set of flags succeeded so that we can
-- try that set first next time */
-- have_working_flags = TRUE;
-+ try_creating_fbo (offscreen, flags = _TRY_DEPTH | _TRY_STENCIL,
-+ &data) ||
-+ try_creating_fbo (offscreen, flags = _TRY_STENCIL, &data) ||
-+ try_creating_fbo (offscreen, flags = _TRY_DEPTH, &data) ||
-+ try_creating_fbo (offscreen, flags = 0, &data))
-+ {
-+ /* Record that the last set of flags succeeded so that we can
-+ try that set first next time */
-+ have_working_flags = TRUE;
-+ fbo_created = TRUE;
-+ }
-+ else
-+ fbo_created = FALSE;
-+ }
-
-+ if (fbo_created)
-+ {
- _cogl_framebuffer_init (COGL_FRAMEBUFFER (offscreen),
- COGL_FRAMEBUFFER_TYPE_OFFSCREEN,
-- cogl_texture_get_width (texhandle),
-- cogl_texture_get_height (texhandle));
-+ data.level_width,
-+ data.level_height);
-
- return _cogl_offscreen_object_new (offscreen);
- }
-@@ -508,6 +554,12 @@ cogl_offscreen_new_to_texture (CoglHandle texhandle)
- }
- }
-
-+CoglHandle
-+cogl_offscreen_new_to_texture (CoglHandle texhandle)
-+{
-+ return _cogl_offscreen_new_to_texture_full (texhandle, 0, 0);
-+}
-+
- static void
- _cogl_offscreen_free (CoglOffscreen *offscreen)
- {
---
-1.7.3.16.g9464b \ No newline at end of file
diff --git a/media-libs/clutter/files/clutter-9999-perfneu2.patch b/media-libs/clutter/files/clutter-9999-perfneu2.patch
deleted file mode 100644
index bb1eab1..0000000
--- a/media-libs/clutter/files/clutter-9999-perfneu2.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From b52949949fff009e1e681bbce8027785b5cc7ac6 Mon Sep 17 00:00:00 2001
-From: Neil Roberts <neil@linux.intel.com>
-Date: Wed, 17 Nov 2010 15:38:20 +0000
-Subject: [PATCH] Add an internal _cogl_read_pixels_full
-
-This is the same as _cogl_read_pixels except that it takes a rowstride
-parameter for the destination buffer. Under OpenGL setting the
-rowstride this will end up calling GL_ROW_LENGTH so that the buffer
-region can be directly written to. Under GLES GL_ROW_LENGTH is not
-supported so it will use an intermediate buffer as it does if the
-format is not GL_RGBA.
-
-cogl_read_pixels now just calls the full version of the function with
-the rowstride set to width*bpp.
-
-http://bugzilla.clutter-project.org/show_bug.cgi?id=2414
----
- clutter/cogl/cogl/cogl-private.h | 10 +++++++++
- clutter/cogl/cogl/cogl.c | 39 +++++++++++++++++++++++++++----------
- 2 files changed, 38 insertions(+), 11 deletions(-)
-
-diff --git a/clutter/cogl/cogl/cogl-private.h b/clutter/cogl/cogl/cogl-private.h
-index c2f6947..6c06cce 100644
---- a/clutter/cogl/cogl/cogl-private.h
-+++ b/clutter/cogl/cogl/cogl-private.h
-@@ -29,6 +29,16 @@ G_BEGIN_DECLS
- void
- _cogl_clear (const CoglColor *color, unsigned long buffers);
-
-+void
-+_cogl_read_pixels_full (int x,
-+ int y,
-+ int width,
-+ int height,
-+ CoglReadPixelsFlags source,
-+ CoglPixelFormat format,
-+ guint8 *pixels,
-+ int rowstride);
-+
- G_END_DECLS
-
- #endif /* __COGL_PRIVATE_H__ */
-diff --git a/clutter/cogl/cogl/cogl.c b/clutter/cogl/cogl/cogl.c
-index b1882ef..67827f3 100644
---- a/clutter/cogl/cogl/cogl.c
-+++ b/clutter/cogl/cogl/cogl.c
-@@ -556,13 +556,14 @@ cogl_flush (void)
- }
-
- void
--cogl_read_pixels (int x,
-- int y,
-- int width,
-- int height,
-- CoglReadPixelsFlags source,
-- CoglPixelFormat format,
-- guint8 *pixels)
-+_cogl_read_pixels_full (int x,
-+ int y,
-+ int width,
-+ int height,
-+ CoglReadPixelsFlags source,
-+ CoglPixelFormat format,
-+ guint8 *pixels,
-+ int rowstride)
- {
- CoglFramebuffer *framebuffer;
- int framebuffer_height;
-@@ -572,7 +573,6 @@ cogl_read_pixels (int x,
- GLenum gl_format;
- GLenum gl_type;
- CoglPixelFormat bmp_format;
-- int rowstride;
-
- _COGL_GET_CONTEXT (ctx, NO_RETVAL);
-
-@@ -599,7 +599,6 @@ cogl_read_pixels (int x,
-
- /* Initialise the CoglBitmap */
- bpp = _cogl_get_format_bpp (format);
-- rowstride = bpp * width;
- bmp_format = format;
-
- if ((format & COGL_A_BIT))
-@@ -630,9 +629,12 @@ cogl_read_pixels (int x,
- to be more clever and check if the requested type matches that
- but we would need some reliable functions to convert from GL
- types to Cogl types. For now, lets just always read in
-- GL_RGBA/GL_UNSIGNED_BYTE and convert if necessary */
-+ GL_RGBA/GL_UNSIGNED_BYTE and convert if necessary. We also need
-+ to use this intermediate buffer if the rowstride has padding
-+ because GLES does not support setting GL_ROW_LENGTH */
- #ifndef COGL_HAS_GL
-- if (gl_format != GL_RGBA || gl_type != GL_UNSIGNED_BYTE)
-+ if (gl_format != GL_RGBA || gl_type != GL_UNSIGNED_BYTE ||
-+ rowstride != 4 * width)
- {
- CoglBitmap *tmp_bmp, *dst_bmp;
- guint8 *tmp_data = g_malloc (width * height * 4);
-@@ -711,6 +713,21 @@ cogl_read_pixels (int x,
- cogl_object_unref (bmp);
- }
-
-+void
-+cogl_read_pixels (int x,
-+ int y,
-+ int width,
-+ int height,
-+ CoglReadPixelsFlags source,
-+ CoglPixelFormat format,
-+ guint8 *pixels)
-+{
-+ _cogl_read_pixels_full (x, y, width, height,
-+ source, format, pixels,
-+ /* rowstride */
-+ _cogl_get_format_bpp (format) * width);
-+}
-+
- static void
- _cogl_disable_other_texcoord_arrays_cb (int texcoord_array_num, gpointer data)
- {
---
-1.7.3.16.g9464b \ No newline at end of file
diff --git a/media-libs/clutter/files/clutter-9999-perfneu3.patch b/media-libs/clutter/files/clutter-9999-perfneu3.patch
deleted file mode 100644
index 1a33716..0000000
--- a/media-libs/clutter/files/clutter-9999-perfneu3.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 533b61186f2b1ba71dba63167093a8e7ca45efbd Mon Sep 17 00:00:00 2001
-From: Neil Roberts <neil@linux.intel.com>
-Date: Wed, 17 Nov 2010 17:45:27 +0000
-Subject: [PATCH] cogl_read_pixels: Fix the format used in GLES2
-
-When converting the data in cogl_read_pixels it was using bmp_format
-instead of the format passed in to the function. bmp_format is the
-same as the passed in format except that it always has the premult bit
-set. Therefore the conversion would not handle premultiply correctly.
-
-http://bugzilla.clutter-project.org/show_bug.cgi?id=2414
----
- clutter/cogl/cogl/cogl.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/clutter/cogl/cogl/cogl.c b/clutter/cogl/cogl/cogl.c
-index 67827f3..a2a4109 100644
---- a/clutter/cogl/cogl/cogl.c
-+++ b/clutter/cogl/cogl/cogl.c
-@@ -655,7 +655,7 @@ _cogl_read_pixels_full (int x,
- allocating its own buffer so we have to copy the data
- again */
- if ((dst_bmp = _cogl_bitmap_convert_format_and_premult (tmp_bmp,
-- bmp_format)))
-+ format)))
- {
- _cogl_bitmap_copy_subregion (dst_bmp,
- bmp,
---
-1.7.3.16.g9464b \ No newline at end of file
diff --git a/media-libs/clutter/files/clutter-9999-perfneu4.patch b/media-libs/clutter/files/clutter-9999-perfneu4.patch
deleted file mode 100644
index fb7b55a..0000000
--- a/media-libs/clutter/files/clutter-9999-perfneu4.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From c2a5d27a28e2bbf9f839f06a149253688e83071e Mon Sep 17 00:00:00 2001
-From: Neil Roberts <neil@linux.intel.com>
-Date: Wed, 17 Nov 2010 17:57:17 +0000
-Subject: [PATCH] cogl-framebuffer: Try to track format of the framebuffer
-
-Previously in cogl_read_pixels we assume the format of the framebuffer
-is always premultiplied because that is the most likely format with
-the default Cogl blend mode. However when the framebuffer is bound to
-a texture we should be able to make a better guess at the format
-because we know the texture keeps track of the premult status. This
-patch adds an internal format member to CoglFramebuffer. For onscreen
-framebuffers we still assume it is RGBA_8888_PRE but for offscreen to
-textures we copy the texture format. cogl_read_pixels uses this to
-determine whether the data returned by glReadPixels will be
-premultiplied.
-
-http://bugzilla.clutter-project.org/show_bug.cgi?id=2414
----
- clutter/cogl/cogl/cogl-framebuffer-private.h | 3 +++
- clutter/cogl/cogl/cogl-framebuffer.c | 15 +++++++++++++++
- clutter/cogl/cogl/cogl.c | 22 ++++++++++------------
- 3 files changed, 28 insertions(+), 12 deletions(-)
-
-diff --git a/clutter/cogl/cogl/cogl-framebuffer-private.h b/clutter/cogl/cogl/cogl-framebuffer-private.h
-index 803befd..a831ba7 100644
---- a/clutter/cogl/cogl/cogl-framebuffer-private.h
-+++ b/clutter/cogl/cogl/cogl-framebuffer-private.h
-@@ -39,6 +39,9 @@ struct _CoglFramebuffer
- CoglFramebufferType type;
- int width;
- int height;
-+ /* Format of the pixels in the framebuffer (including the expected
-+ premult state) */
-+ CoglPixelFormat format;
-
- CoglMatrixStack *modelview_stack;
- CoglMatrixStack *projection_stack;
-diff --git a/clutter/cogl/cogl/cogl-framebuffer.c b/clutter/cogl/cogl/cogl-framebuffer.c
-index 5e832b1..ade7344 100644
---- a/clutter/cogl/cogl/cogl-framebuffer.c
-+++ b/clutter/cogl/cogl/cogl-framebuffer.c
-@@ -139,12 +139,14 @@ _cogl_is_framebuffer (void *object)
- static void
- _cogl_framebuffer_init (CoglFramebuffer *framebuffer,
- CoglFramebufferType type,
-+ CoglPixelFormat format,
- int width,
- int height)
- {
- framebuffer->type = type;
- framebuffer->width = width;
- framebuffer->height = height;
-+ framebuffer->format = format;
- framebuffer->viewport_x = 0;
- framebuffer->viewport_y = 0;
- framebuffer->viewport_width = width;
-@@ -540,6 +542,7 @@ _cogl_offscreen_new_to_texture_full (CoglHandle texhandle,
- {
- _cogl_framebuffer_init (COGL_FRAMEBUFFER (offscreen),
- COGL_FRAMEBUFFER_TYPE_OFFSCREEN,
-+ cogl_texture_get_format (texhandle),
- data.level_width,
- data.level_height);
-
-@@ -594,9 +597,21 @@ _cogl_onscreen_new (void)
- * implement CoglOnscreen framebuffers, since we can't, e.g. keep track of
- * the window size. */
-
-+ /* FIXME: We are assuming onscreen buffers will always be
-+ premultiplied so we'll set the premult flag on the bitmap
-+ format. This will usually be correct because the result of the
-+ default blending operations for Cogl ends up with premultiplied
-+ data in the framebuffer. However it is possible for the
-+ framebuffer to be in whatever format depending on what
-+ CoglPipeline is used to render to it. Eventually we may want to
-+ add a way for an application to inform Cogl that the framebuffer
-+ is not premultiplied in case it is being used for some special
-+ purpose. */
-+
- onscreen = g_new0 (CoglOnscreen, 1);
- _cogl_framebuffer_init (COGL_FRAMEBUFFER (onscreen),
- COGL_FRAMEBUFFER_TYPE_ONSCREEN,
-+ COGL_PIXEL_FORMAT_RGBA_8888_PRE,
- 0xdeadbeef, /* width */
- 0xdeadbeef); /* height */
-
-diff --git a/clutter/cogl/cogl/cogl.c b/clutter/cogl/cogl/cogl.c
-index a2a4109..1aeef9e 100644
---- a/clutter/cogl/cogl/cogl.c
-+++ b/clutter/cogl/cogl/cogl.c
-@@ -603,17 +603,14 @@ _cogl_read_pixels_full (int x,
-
- if ((format & COGL_A_BIT))
- {
-- /* FIXME: We are assuming glReadPixels will always give us
-- premultiplied data so we'll set the premult flag on the
-- bitmap format. This will usually be correct because the
-- result of the default blending operations for Cogl ends up
-- with premultiplied data in the framebuffer. However it is
-- possible for the framebuffer to be in whatever format
-- depending on what CoglPipeline is used to render to
-- it. Eventually we may want to add a way for an application to
-- inform Cogl that the framebuffer is not premultiplied in case
-- it is being used for some special purpose. */
-- bmp_format |= COGL_PREMULT_BIT;
-+ /* We match the premultiplied state of the target buffer to the
-+ * premultiplied state of the framebuffer so that it will get
-+ * converted to the right format below */
-+
-+ if ((framebuffer->format & COGL_PREMULT_BIT))
-+ bmp_format |= COGL_PREMULT_BIT;
-+ else
-+ bmp_format &= ~COGL_PREMULT_BIT;
- }
-
- bmp = _cogl_bitmap_new_from_data (pixels,
-@@ -640,7 +637,8 @@ _cogl_read_pixels_full (int x,
- guint8 *tmp_data = g_malloc (width * height * 4);
-
- tmp_bmp = _cogl_bitmap_new_from_data (tmp_data,
-- COGL_PIXEL_FORMAT_RGBA_8888_PRE,
-+ COGL_PIXEL_FORMAT_RGBA_8888 |
-+ (bmp_format & COGL_PREMULT_BIT),
- width, height, 4 * width,
- (CoglBitmapDestroyNotify) g_free,
- NULL);
---
-1.7.3.16.g9464b \ No newline at end of file
diff --git a/media-libs/clutter/files/clutter-9999-perfneu5.patch b/media-libs/clutter/files/clutter-9999-perfneu5.patch
deleted file mode 100644
index a86e2b6..0000000
--- a/media-libs/clutter/files/clutter-9999-perfneu5.patch
+++ /dev/null
@@ -1,566 +0,0 @@
-From 5a39b19ccb80af0d92d3ce74772825729a13a9c7 Mon Sep 17 00:00:00 2001
-From: Owen W. Taylor <otaylor@fishsoup.net>
-Date: Fri, 12 Nov 2010 11:02:13 -0500
-Subject: [PATCH] Use FBOs and use cogl_read_pixels() to efficiently read partial textures
-
-* cogl_texture_get_data() is converted to use
- _cogl_texture_foreach_sub_texture_in_region() to iterate
- through the underlying textures.
-
- * When we need to read only a portion of the underlying
- texture, we set up a FBO and use _cogl_read_pixels()
- to read the portion we need. This is enormously more
- efficient for reading a small portion of a large atlas
- texture.
-
- * The CoglAtlasTexture, CoglSubTexture, and CoglTexture2dSliced
- implementation of get_texture() are removed.
-
-http://bugzilla.clutter-project.org/show_bug.cgi?id=2414
----
- clutter/cogl/cogl/cogl-atlas-texture.c | 17 +---
- clutter/cogl/cogl/cogl-sub-texture.c | 70 +----------
- clutter/cogl/cogl/cogl-texture-2d-sliced.c | 149 +---------------------
- clutter/cogl/cogl/cogl-texture.c | 191 ++++++++++++++++++++++++++-
- 4 files changed, 186 insertions(+), 241 deletions(-)
-
-diff --git a/clutter/cogl/cogl/cogl-atlas-texture.c b/clutter/cogl/cogl/cogl-atlas-texture.c
-index 2ad7445..9194da3 100644
---- a/clutter/cogl/cogl/cogl-atlas-texture.c
-+++ b/clutter/cogl/cogl/cogl-atlas-texture.c
-@@ -439,21 +439,6 @@ _cogl_atlas_texture_set_region (CoglTexture *tex,
- bmp);
- }
-
--static gboolean
--_cogl_atlas_texture_get_data (CoglTexture *tex,
-- CoglPixelFormat format,
-- unsigned int rowstride,
-- guint8 *data)
--{
-- CoglAtlasTexture *atlas_tex = COGL_ATLAS_TEXTURE (tex);
--
-- /* Forward on to the sub texture */
-- return cogl_texture_get_data (atlas_tex->sub_texture,
-- format,
-- rowstride,
-- data);
--}
--
- static CoglPixelFormat
- _cogl_atlas_texture_get_format (CoglTexture *tex)
- {
-@@ -632,7 +617,7 @@ static const CoglTextureVtable
- cogl_atlas_texture_vtable =
- {
- _cogl_atlas_texture_set_region,
-- _cogl_atlas_texture_get_data,
-+ NULL, /* get_data */
- _cogl_atlas_texture_foreach_sub_texture_in_region,
- _cogl_atlas_texture_get_max_waste,
- _cogl_atlas_texture_is_sliced,
-diff --git a/clutter/cogl/cogl/cogl-sub-texture.c b/clutter/cogl/cogl/cogl-sub-texture.c
-index 9260f13..1730c87 100644
---- a/clutter/cogl/cogl/cogl-sub-texture.c
-+++ b/clutter/cogl/cogl/cogl-sub-texture.c
-@@ -416,74 +416,6 @@ _cogl_sub_texture_set_region (CoglTexture *tex,
- bmp);
- }
-
--static void
--_cogl_sub_texture_copy_region (guint8 *dst,
-- const guint8 *src,
-- int dst_x, int dst_y,
-- int src_x, int src_y,
-- int width, int height,
-- int dst_rowstride,
-- int src_rowstride,
-- int bpp)
--{
-- int y;
--
-- dst += dst_x * bpp + dst_y * dst_rowstride;
-- src += src_x * bpp + src_y * src_rowstride;
--
-- for (y = 0; y < height; y++)
-- {
-- memcpy (dst, src, bpp * width);
-- dst += dst_rowstride;
-- src += src_rowstride;
-- }
--}
--
--static gboolean
--_cogl_sub_texture_get_data (CoglTexture *tex,
-- CoglPixelFormat format,
-- unsigned int rowstride,
-- guint8 *data)
--{
-- CoglSubTexture *sub_tex = COGL_SUB_TEXTURE (tex);
-- unsigned int full_rowstride;
-- guint8 *full_data;
-- gboolean ret = TRUE;
-- int bpp;
-- int full_tex_width, full_tex_height;
--
-- /* FIXME: This gets the full data from the full texture and then
-- copies a subregion of that. It would be better if there was a
-- texture_get_sub_data virtual and it can just munge the texture
-- coordinates */
--
-- full_tex_width = cogl_texture_get_width (sub_tex->full_texture);
-- full_tex_height = cogl_texture_get_height (sub_tex->full_texture);
--
-- bpp = _cogl_get_format_bpp (format);
--
-- full_rowstride = _cogl_get_format_bpp (format) * full_tex_width;
-- full_data = g_malloc (full_rowstride * full_tex_height);
--
-- if (cogl_texture_get_data (sub_tex->full_texture, format,
-- full_rowstride, full_data))
-- _cogl_sub_texture_copy_region (data, full_data,
-- 0, 0,
-- sub_tex->sub_x,
-- sub_tex->sub_y,
-- sub_tex->sub_width,
-- sub_tex->sub_height,
-- rowstride,
-- full_rowstride,
-- bpp);
-- else
-- ret = FALSE;
--
-- g_free (full_data);
--
-- return ret;
--}
--
- static CoglPixelFormat
- _cogl_sub_texture_get_format (CoglTexture *tex)
- {
-@@ -520,7 +452,7 @@ static const CoglTextureVtable
- cogl_sub_texture_vtable =
- {
- _cogl_sub_texture_set_region,
-- _cogl_sub_texture_get_data,
-+ NULL, /* get_data */
- _cogl_sub_texture_foreach_sub_texture_in_region,
- _cogl_sub_texture_get_max_waste,
- _cogl_sub_texture_is_sliced,
-diff --git a/clutter/cogl/cogl/cogl-texture-2d-sliced.c b/clutter/cogl/cogl/cogl-texture-2d-sliced.c
-index dbaa746..5e3f65a 100644
---- a/clutter/cogl/cogl/cogl-texture-2d-sliced.c
-+++ b/clutter/cogl/cogl/cogl-texture-2d-sliced.c
-@@ -1335,153 +1335,6 @@ _cogl_texture_2d_sliced_set_region (CoglTexture *tex,
- return TRUE;
- }
-
--static gboolean
--_cogl_texture_2d_sliced_download_from_gl (
-- CoglTexture2DSliced *tex_2ds,
-- CoglBitmap *target_bmp,
-- GLuint target_gl_format,
-- GLuint target_gl_type)
--{
-- CoglSpan *x_span;
-- CoglSpan *y_span;
-- CoglHandle slice_tex;
-- int bpp;
-- int x, y;
-- CoglBitmap *slice_bmp;
-- CoglPixelFormat target_format = _cogl_bitmap_get_format (target_bmp);
--
-- bpp = _cogl_get_format_bpp (target_format);
--
-- /* Iterate vertical slices */
-- for (y = 0; y < tex_2ds->slice_y_spans->len; ++y)
-- {
-- y_span = &g_array_index (tex_2ds->slice_y_spans, CoglSpan, y);
--
-- /* Iterate horizontal slices */
-- for (x = 0; x < tex_2ds->slice_x_spans->len; ++x)
-- {
-- /*if (x != 0 || y != 1) continue;*/
-- x_span = &g_array_index (tex_2ds->slice_x_spans, CoglSpan, x);
--
-- /* Pick the sliced texture */
-- slice_tex = g_array_index (tex_2ds->slice_textures, CoglHandle,
-- y * tex_2ds->slice_x_spans->len + x);
--
-- /* If there's any waste we need to copy manually
-- (no glGetTexSubImage) */
--
-- if (y_span->waste != 0 || x_span->waste != 0)
-- {
-- int rowstride = x_span->size * bpp;
-- guint8 *data = g_malloc (rowstride * y_span->size);
--
-- /* Setup temp bitmap for slice subregion */
-- slice_bmp = _cogl_bitmap_new_from_data (data,
-- target_format,
-- x_span->size,
-- y_span->size,
-- rowstride,
-- (CoglBitmapDestroyNotify)
-- g_free,
-- NULL);
--
-- /* Setup gl alignment to 0,0 top-left corner */
-- _cogl_texture_driver_prep_gl_for_pixels_download (rowstride, bpp);
--
-- if (!cogl_texture_get_data (slice_tex,
-- target_format,
-- rowstride,
-- data))
-- {
-- /* Free temp bitmap */
-- cogl_object_unref (slice_bmp);
-- return FALSE;
-- }
--
-- /* Copy portion of slice from temp to target bmp */
-- _cogl_bitmap_copy_subregion (slice_bmp,
-- target_bmp,
-- 0, 0,
-- x_span->start,
-- y_span->start,
-- x_span->size - x_span->waste,
-- y_span->size - y_span->waste);
-- /* Free temp bitmap */
-- cogl_object_unref (slice_bmp);
-- }
-- else
-- {
-- guint8 *data;
-- GLvoid *dst;
-- gboolean ret;
-- int rowstride = _cogl_bitmap_get_rowstride (target_bmp);
--
-- data = _cogl_bitmap_map (target_bmp,
-- COGL_BUFFER_ACCESS_WRITE,
-- 0);
-- if (data == NULL)
-- return FALSE;
--
-- dst = data + x_span->start * bpp + y_span->start * rowstride;
--
-- _cogl_texture_driver_prep_gl_for_pixels_download (rowstride, bpp);
--
-- /* Download slice image data */
-- ret = cogl_texture_get_data (slice_tex,
-- target_format,
-- rowstride,
-- dst);
--
-- _cogl_bitmap_unmap (target_bmp);
--
-- if (!ret)
-- return ret;
-- }
-- }
-- }
--
-- return TRUE;
--}
--
--static gboolean
--_cogl_texture_2d_sliced_get_data (CoglTexture *tex,
-- CoglPixelFormat format,
-- unsigned int rowstride,
-- guint8 *data)
--{
-- CoglTexture2DSliced *tex_2ds = COGL_TEXTURE_2D_SLICED (tex);
-- int bpp;
-- GLenum gl_format;
-- GLenum gl_type;
-- CoglBitmap *target_bmp;
-- gboolean ret;
--
-- bpp = _cogl_get_format_bpp (format);
--
-- _cogl_pixel_format_to_gl (format,
-- NULL, /* internal format */
-- &gl_format,
-- &gl_type);
--
-- target_bmp = _cogl_bitmap_new_from_data (data,
-- format,
-- tex_2ds->width,
-- tex_2ds->height,
-- rowstride,
-- NULL, /* destroy_fn */
-- NULL /* destroy_fn_data */);
--
-- /* Retrieve data from slices */
-- ret = _cogl_texture_2d_sliced_download_from_gl (tex_2ds,
-- target_bmp,
-- gl_format,
-- gl_type);
--
-- cogl_object_unref (target_bmp);
--
-- return ret;
--}
--
- static CoglPixelFormat
- _cogl_texture_2d_sliced_get_format (CoglTexture *tex)
- {
-@@ -1528,7 +1381,7 @@ static const CoglTextureVtable
- cogl_texture_2d_sliced_vtable =
- {
- _cogl_texture_2d_sliced_set_region,
-- _cogl_texture_2d_sliced_get_data,
-+ NULL, /* get_data */
- _cogl_texture_2d_sliced_foreach_sub_texture_in_region,
- _cogl_texture_2d_sliced_get_max_waste,
- _cogl_texture_2d_sliced_is_sliced,
-diff --git a/clutter/cogl/cogl/cogl-texture.c b/clutter/cogl/cogl/cogl-texture.c
-index c4f40a1..58d96cf 100644
---- a/clutter/cogl/cogl/cogl-texture.c
-+++ b/clutter/cogl/cogl/cogl-texture.c
-@@ -4,6 +4,7 @@
- * An object oriented GL/GLES Abstraction/Utility Layer
- *
- * Copyright (C) 2007,2008,2009 Intel Corporation.
-+ * Copyright (C) 2010 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
-@@ -37,6 +38,7 @@
- #include "cogl-bitmap-private.h"
- #include "cogl-buffer-private.h"
- #include "cogl-pixel-array-private.h"
-+#include "cogl-private.h"
- #include "cogl-texture-private.h"
- #include "cogl-texture-driver.h"
- #include "cogl-texture-2d-sliced-private.h"
-@@ -1181,6 +1183,169 @@ _cogl_texture_draw_and_read (CoglHandle handle,
- return TRUE;
- }
-
-+static gboolean
-+get_texture_bits_via_offscreen (CoglHandle texture_handle,
-+ int x,
-+ int y,
-+ int width,
-+ int height,
-+ guint8 *dst_bits,
-+ unsigned int dst_rowstride,
-+ CoglPixelFormat dst_format)
-+{
-+ CoglFramebuffer *framebuffer;
-+
-+ _COGL_GET_CONTEXT (ctx, FALSE);
-+
-+ if (!cogl_features_available (COGL_FEATURE_OFFSCREEN))
-+ return FALSE;
-+
-+ framebuffer =
-+ _cogl_offscreen_new_to_texture_full (texture_handle,
-+ COGL_OFFSCREEN_DISABLE_DEPTH_STENCIL,
-+ 0);
-+
-+ if (framebuffer == NULL)
-+ return FALSE;
-+
-+ cogl_push_framebuffer (framebuffer);
-+
-+ _cogl_read_pixels_full (x, y, width, height,
-+ COGL_READ_PIXELS_COLOR_BUFFER,
-+ dst_format, dst_bits, dst_rowstride);
-+
-+ cogl_pop_framebuffer ();
-+
-+ cogl_object_unref (framebuffer);
-+
-+ return TRUE;
-+}
-+
-+static gboolean
-+get_texture_bits_via_copy (CoglHandle texture_handle,
-+ int x,
-+ int y,
-+ int width,
-+ int height,
-+ guint8 *dst_bits,
-+ unsigned int dst_rowstride,
-+ CoglPixelFormat dst_format)
-+{
-+ CoglTexture *tex = COGL_TEXTURE (texture_handle);
-+ unsigned int full_rowstride;
-+ guint8 *full_bits;
-+ gboolean ret = TRUE;
-+ int bpp;
-+ int full_tex_width, full_tex_height;
-+
-+ full_tex_width = cogl_texture_get_width (texture_handle);
-+ full_tex_height = cogl_texture_get_height (texture_handle);
-+
-+ bpp = _cogl_get_format_bpp (dst_format);
-+
-+ full_rowstride = bpp * full_tex_width;
-+ full_bits = g_malloc (full_rowstride * full_tex_height);
-+
-+ if (tex->vtable->get_data (tex,
-+ dst_format,
-+ full_rowstride,
-+ full_bits))
-+ {
-+ guint8 *dst = dst_bits;
-+ guint8 *src = full_bits + x * bpp + y * full_rowstride;
-+ int i;
-+
-+ for (i = 0; i < height; i++)
-+ {
-+ memcpy (dst, src, bpp * width);
-+ dst += dst_rowstride;
-+ src += full_rowstride;
-+ }
-+ }
-+ else
-+ ret = FALSE;
-+
-+ g_free (full_bits);
-+
-+ return ret;
-+}
-+
-+typedef struct
-+{
-+ int orig_width;
-+ int orig_height;
-+ CoglBitmap *target_bmp;
-+ guint8 *target_bits;
-+ gboolean success;
-+} CoglTextureGetData;
-+
-+static void
-+texture_get_cb (CoglHandle texture_handle,
-+ const float *subtexture_coords,
-+ const float *virtual_coords,
-+ void *user_data)
-+{
-+ CoglTexture *tex = COGL_TEXTURE (texture_handle);
-+ CoglTextureGetData *tg_data = user_data;
-+ CoglPixelFormat format = _cogl_bitmap_get_format (tg_data->target_bmp);
-+ int bpp = _cogl_get_format_bpp (format);
-+ unsigned int rowstride = _cogl_bitmap_get_rowstride (tg_data->target_bmp);
-+ int subtexture_width = cogl_texture_get_width (texture_handle);
-+ int subtexture_height = cogl_texture_get_height (texture_handle);
-+
-+ int x_in_subtexture = (int) (0.5 + subtexture_width * subtexture_coords[0]);
-+ int y_in_subtexture = (int) (0.5 + subtexture_height * subtexture_coords[1]);
-+ int width = ((int) (0.5 + subtexture_width * subtexture_coords[2])
-+ - x_in_subtexture);
-+ int height = ((int) (0.5 + subtexture_height * subtexture_coords[3])
-+ - y_in_subtexture);
-+ int x_in_bitmap = (int) (0.5 + tg_data->orig_width * virtual_coords[0]);
-+ int y_in_bitmap = (int) (0.5 + tg_data->orig_height * virtual_coords[1]);
-+
-+ guint8 *dst_bits;
-+
-+ if (!tg_data->success)
-+ return;
-+
-+ dst_bits = tg_data->target_bits + x_in_bitmap * bpp + y_in_bitmap * rowstride;
-+
-+ /* If we can read everything as a single slice, then go ahead and do that
-+ * to avoid allocating an FBO. We'll leave it up to the GL implementation to
-+ * do glGetTexImage as efficiently as possible. (GLES doesn't have that,
-+ * so we'll fall through) */
-+ if (x_in_subtexture == 0 && y_in_subtexture == 0 &&
-+ width == subtexture_width && height == subtexture_height)
-+ {
-+ if (tex->vtable->get_data (tex,
-+ format,
-+ rowstride,
-+ dst_bits))
-+ return;
-+ }
-+
-+ /* Next best option is a FBO and glReadPixels */
-+ if (get_texture_bits_via_offscreen (texture_handle,
-+ x_in_subtexture, y_in_subtexture,
-+ width, height,
-+ dst_bits,
-+ rowstride,
-+ format))
-+ return;
-+
-+ /* Getting ugly: read the entire texture, copy out the part we want */
-+ if (get_texture_bits_via_copy (texture_handle,
-+ x_in_subtexture, y_in_subtexture,
-+ width, height,
-+ dst_bits,
-+ rowstride,
-+ format))
-+ return;
-+
-+ /* No luck, the caller will fall back to the draw-to-backbuffer and
-+ * read implementation */
-+ tg_data->success = FALSE;
-+}
-+
- int
- cogl_texture_get_data (CoglHandle handle,
- CoglPixelFormat format,
-@@ -1196,13 +1361,14 @@ cogl_texture_get_data (CoglHandle handle,
- GLenum closest_gl_type;
- CoglBitmap *target_bmp;
- CoglBitmap *new_bmp;
-- gboolean success;
- guint8 *src;
- guint8 *dst;
- int y;
- int tex_width;
- int tex_height;
-
-+ CoglTextureGetData tg_data;
-+
- if (!cogl_is_texture (handle))
- return 0;
-
-@@ -1253,17 +1419,26 @@ cogl_texture_get_data (CoglHandle handle,
- NULL);
- }
-
-- if ((dst = _cogl_bitmap_map (target_bmp, COGL_BUFFER_ACCESS_WRITE,
-- COGL_BUFFER_MAP_HINT_DISCARD)) == NULL)
-+ tg_data.orig_width = tex_width;
-+ tg_data.orig_height = tex_height;
-+ tg_data.target_bmp = target_bmp;
-+ tg_data.target_bits = _cogl_bitmap_map (target_bmp, COGL_BUFFER_ACCESS_WRITE,
-+ COGL_BUFFER_MAP_HINT_DISCARD);
-+ if (tg_data.target_bits == NULL)
- {
- cogl_object_unref (target_bmp);
- return 0;
- }
-+ tg_data.success = TRUE;
-
-- success = tex->vtable->get_data (tex,
-- closest_format,
-- rowstride,
-- dst);
-+ /* Iterating through the subtextures allows piecing together
-+ * the data for a sliced texture, and allows us to do the
-+ * read-from-framebuffer logic here in a simple fashion rather than
-+ * passing offsets down through the code. */
-+ _cogl_texture_foreach_sub_texture_in_region (handle,
-+ 0, 0, 1, 1,
-+ texture_get_cb,
-+ &tg_data);
-
- _cogl_bitmap_unmap (target_bmp);
-
-@@ -1271,7 +1446,7 @@ cogl_texture_get_data (CoglHandle handle,
- * to read back the texture data; such as for GLES which doesn't
- * support glGetTexImage, so here we fallback to drawing the
- * texture and reading the pixels from the framebuffer. */
-- if (!success)
-+ if (!tg_data.success)
- _cogl_texture_draw_and_read (tex, target_bmp,
- closest_gl_format,
- closest_gl_type);
---
-1.7.3.16.g9464b \ No newline at end of file
diff --git a/media-libs/clutter/files/clutter-9999-perfneu6.patch b/media-libs/clutter/files/clutter-9999-perfneu6.patch
deleted file mode 100644
index c579968..0000000
--- a/media-libs/clutter/files/clutter-9999-perfneu6.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 13e13619f96b8840c24fe349799aaf8d87b065f5 Mon Sep 17 00:00:00 2001
-From: Neil Roberts <neil@linux.intel.com>
-Date: Wed, 17 Nov 2010 17:31:23 +0000
-Subject: [PATCH] test-cogl-texture-get-set-data: Test the alpha component
-
-Previously the alpha component of the test texture data was always set
-to 255 and the data was read back as RGB so that the alpha component
-is ignored. Now the alpha component is set to a generated value and
-the data is read back a second time as RGBA to verify that Cogl is not
-doing any premult conversions when the internal texture and target
-data is the same.
-
-http://bugzilla.clutter-project.org/show_bug.cgi?id=2414
----
- tests/conform/test-cogl-texture-get-set-data.c | 39 ++++++++++++++++++++++--
- 1 files changed, 36 insertions(+), 3 deletions(-)
-
-diff --git a/tests/conform/test-cogl-texture-get-set-data.c b/tests/conform/test-cogl-texture-get-set-data.c
-index 84206ff..26ba058 100644
---- a/tests/conform/test-cogl-texture-get-set-data.c
-+++ b/tests/conform/test-cogl-texture-get-set-data.c
-@@ -18,7 +18,7 @@ check_texture (int width, int height, CoglTextureFlags flags)
- *(p++) = x;
- *(p++) = y;
- *(p++) = 128;
-- *(p++) = 255;
-+ *(p++) = (x ^ y);
- }
-
- tex = cogl_texture_new_from_data (width, height,
-@@ -38,6 +38,7 @@ check_texture (int width, int height, CoglTextureFlags flags)
- p[0] = ~p[0];
- p[1] = ~p[1];
- p[2] = ~p[2];
-+ p[3] = ~p[3];
- p += 4;
- }
- p += width * 2;
-@@ -55,14 +56,16 @@ check_texture (int width, int height, CoglTextureFlags flags)
- width * 4, /* rowstride */
- data);
-
-- memset (data, 0, width * height * 4);
--
- /* Check passing a NULL pointer and a zero rowstride. The texture
- should calculate the needed data size and return it */
- g_assert_cmpint (cogl_texture_get_data (tex, COGL_PIXEL_FORMAT_ANY, 0, NULL),
- ==,
- width * height * 4);
-
-+ /* Try first receiving the data as RGB. This should cause a
-+ * conversion */
-+ memset (data, 0, width * height * 4);
-+
- cogl_texture_get_data (tex, COGL_PIXEL_FORMAT_RGB_888,
- width * 3, data);
-
-@@ -86,6 +89,36 @@ check_texture (int width, int height, CoglTextureFlags flags)
- p += 3;
- }
-
-+ /* Now try receiving the data as RGBA. This should not cause a
-+ * conversion and no unpremultiplication because we explicitly set
-+ * the internal format when we created the texture */
-+ memset (data, 0, width * height * 4);
-+
-+ cogl_texture_get_data (tex, COGL_PIXEL_FORMAT_RGBA_8888,
-+ width * 4, data);
-+
-+ p = data;
-+
-+ for (y = 0; y < height; y++)
-+ for (x = 0; x < width; x++)
-+ {
-+ if (x >= width / 2 && y >= height / 2)
-+ {
-+ g_assert_cmpint (p[0], ==, ~x & 0xff);
-+ g_assert_cmpint (p[1], ==, ~y & 0xff);
-+ g_assert_cmpint (p[2], ==, ~128 & 0xff);
-+ g_assert_cmpint (p[3], ==, ~(x ^ y) & 0xff);
-+ }
-+ else
-+ {
-+ g_assert_cmpint (p[0], ==, x & 0xff);
-+ g_assert_cmpint (p[1], ==, y & 0xff);
-+ g_assert_cmpint (p[2], ==, 128);
-+ g_assert_cmpint (p[3], ==, (x ^ y) & 0xff);
-+ }
-+ p += 4;
-+ }
-+
- cogl_handle_unref (tex);
- g_free (data);
- }
---
-1.7.3.16.g9464b \ No newline at end of file
diff --git a/media-libs/libcanberra/Manifest b/media-libs/libcanberra/Manifest
deleted file mode 100644
index 2e07e32..0000000
--- a/media-libs/libcanberra/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST libcanberra-0.26.tar.gz 463209 RMD160 f58fc2cfa4b35f6a6b2577057b969977f7de3b5d SHA1 31a1cb8757e5da39b4cdc06e523d011578d7a3e3 SHA256 4b5d8d2c2835133620adbc53745dd107b6e58b9a2963059e8f457143fee00982
-EBUILD libcanberra-0.26-r1.ebuild 1803 RMD160 a9ce071f108c72c0c5f8d6c4892fe491f30fe0b9 SHA1 07a2e995f22ea4f259064629aa6452eeb8c8c1b8 SHA256 c3da25dc848536702375ba8b1359d80bad023fc51b1725084979a7b06e6e8639
diff --git a/media-libs/libcanberra/libcanberra-0.26-r1.ebuild b/media-libs/libcanberra/libcanberra-0.26-r1.ebuild
deleted file mode 100644
index beadf8d..0000000
--- a/media-libs/libcanberra/libcanberra-0.26-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcanberra/libcanberra-0.25.ebuild,v 1.1 2010/06/18 10:11:15 pacho Exp $
-
-EAPI="3"
-inherit gnome2-utils libtool
-
-DESCRIPTION="Portable Sound Event Library"
-HOMEPAGE="http://0pointer.de/lennart/projects/libcanberra/"
-SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="alsa gstreamer +gtk +gtk3 oss pulseaudio +sound tdb"
-
-COMMON_DEPEND="media-libs/libvorbis
- >=sys-devel/libtool-2.2.6b
- alsa? ( media-libs/alsa-lib )
- gstreamer? ( >=media-libs/gstreamer-0.10.15 )
- gtk? ( >=x11-libs/gtk+-2.20.0:2
- >=gnome-base/gconf-2 )
- gtk3? ( x11-libs/gtk+:3
- >=gnome-base/gconf-2 )
- pulseaudio? ( >=media-sound/pulseaudio-0.9.11 )
- tdb? ( sys-libs/tdb )"
-RDEPEND="${COMMON_DEPEND}
- sound? ( x11-themes/sound-theme-freedesktop )" # Required for index.theme wrt #323379
-DEPEND="${COMMON_DEPEND}
- >=dev-util/pkgconfig-0.17"
-
-src_prepare() {
- # Run elibtoolize for ~x86-fbsd.
- use x86-fbsd && elibtoolize
-}
-
-src_configure() {
- econf \
- --docdir=/usr/share/doc/${PF} \
- --disable-dependency-tracking \
- $(use_enable alsa) \
- $(use_enable oss) \
- $(use_enable pulseaudio pulse) \
- $(use_enable gstreamer) \
- $(use_enable gtk) \
- $(use_enable gtk3) \
- $(use_enable tdb) \
- --disable-lynx \
- --disable-gtk-doc \
- --disable-gtk-doc-html \
- --disable-gtk-doc-pdf \
- --with-html-dir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
- # Disable parallel installation until bug #253862 is solved
- emake -j1 DESTDIR="${ED}" install || die
- prepalldocs
-}
-
-pkg_preinst() { gnome2_gconf_savelist; }
-pkg_postinst() { gnome2_gconf_install; }
diff --git a/profiles/package.mask b/profiles/package.mask
index 38023bb..4e4671b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -6,22 +6,3 @@
# NOTE: Please add your entry at the top!
#
-# Live ebuilds for GNOME Shell stuff
-=dev-libs/gir-repository-9999
-=dev-libs/gjs-9999
-=dev-libs/gobject-introspection-9999
-=gnome-base/gnome-shell-9999
-=gnome-base/gsettings-desktop-schemas-9999
-=x11-wm/mutter-9999
-
-# New gnome-desktop, only works with live gnome-shell packages
-
-# GNOME 3 theme work, live ebuild
-=x11-themes/gtk-theme-engine-clearlooks-9999
-=x11-themes/gnome-themes-standard-9999
-
-# Masked as newer libnotify breaks practically everything
->=gnome-base/gnome-desktop-2.91.3
->=gnome-base/gnome-settings-daemon-2.91.5
->=gnome-base/libgnomekbd-2.91.0
->=x11-libs/libnotify-0.7.0
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
deleted file mode 100644
index 01f27fd..0000000
--- a/x11-libs/gtk+/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST gtk+-2.91.5.tar.bz2 16380309 RMD160 491a8f42f88a881c7a5ccb9d73fcdfcf86605f68 SHA1 349fe9ecd35e2101cb4f3ec1ffae9fd57fdf3bcd SHA256 3893a158682e4954e31847c5f4aaa1b1f0ff259cff8d141f8ed8a58121e2cc21
-EBUILD gtk+-2.91.5.ebuild 4625 RMD160 ca788861fede5a6d2b808fdd5cc8747ded728df2 SHA1 71f7a84c0b2de5bfd5fe7e7e7a8d17cb6a647af8 SHA256 6d02fd750cf962bb4c2d14879dba512ef9d3ae364572539290e8c006f4a16dfb
diff --git a/x11-libs/gtk+/gtk+-2.91.5.ebuild b/x11-libs/gtk+/gtk+-2.91.5.ebuild
deleted file mode 100644
index cafb5f1..0000000
--- a/x11-libs/gtk+/gtk+-2.91.5.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit gnome.org flag-o-matic eutils libtool virtualx
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="aqua cups debug doc +introspection jpeg jpeg2k tiff test vim-syntax xinerama"
-
-# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
-# glib-2.27.0 is required for GApplication
-RDEPEND="!aqua? (
- x11-libs/libX11
- x11-libs/libXi
- x11-libs/libXt
- x11-libs/libXext
- >=x11-libs/libXrandr-1.3
- x11-libs/libXcursor
- x11-libs/libXfixes
- x11-libs/libXcomposite
- x11-libs/libXdamage
- >=x11-libs/cairo-1.10.0[X,svg]
- >=x11-libs/gdk-pixbuf-2.21[X,introspection?,jpeg?,jpeg2k?,tiff?]
- )
- aqua? (
- >=x11-libs/cairo-1.10.0[aqua,svg]
- >=x11-libs/gdk-pixbuf-2.21[introspection?,jpeg?,jpeg2k?,tiff?]
- )
- xinerama? ( x11-libs/libXinerama )
- >=dev-libs/glib-2.27.3
- >=x11-libs/pango-1.20[introspection?]
- >=dev-libs/atk-1.29.2[introspection?]
- media-libs/fontconfig
- x11-misc/shared-mime-info
- cups? ( net-print/cups )
- introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
- !<gnome-base/gail-1000"
-DEPEND="${RDEPEND}
- >=dev-util/pkgconfig-0.9
- !aqua? (
- x11-proto/xextproto
- x11-proto/xproto
- x11-proto/inputproto
- x11-proto/damageproto
- )
- x86-interix? (
- sys-libs/itx-bind
- )
- xinerama? ( x11-proto/xineramaproto )
- >=dev-util/gtk-doc-am-1.11
- doc? (
- >=dev-util/gtk-doc-1.11
- ~app-text/docbook-xml-dtd-4.1.2 )
- test? (
- media-fonts/font-misc-misc
- media-fonts/font-cursor-misc )"
-PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
-
-src_prepare() {
- # -O3 and company cause random crashes in applications. Bug #133469
- replace-flags -O3 -O2
- strip-flags
-
- # Non-working test in gentoo's env
- sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
- -i gtk/tests/testing.c || die "sed 1 failed"
- sed '\%/recent-manager/add%,/recent_manager_purge/ d' \
- -i gtk/tests/recentmanager.c || die "sed 2 failed"
-
- if use x86-interix; then
- # activate the itx-bind package...
- append-flags "-I${EPREFIX}/usr/include/bind"
- append-ldflags "-L${EPREFIX}/usr/lib/bind"
- fi
-
- elibtoolize
-}
-
-src_configure() {
- # png always on to display icons (foser)
- local myconf="$(use_enable doc gtk-doc)
- $(use_enable xinerama)
- $(use_enable cups cups auto)
- $(use_enable introspection)
- --disable-papi"
- if use aqua; then
- myconf="${myconf} --with-gdktarget=quartz"
- else
- myconf="${myconf} --with-gdktarget=x11 --with-xinput"
- fi
-
- # Passing --disable-debug is not recommended for production use
- use debug && myconf="${myconf} --enable-debug=yes"
-
- # need libdir here to avoid a double slash in a path that libtool doesn't
- # grok so well during install (// between $EPREFIX and usr ...)
- econf --libdir="${EPREFIX}/usr/$(get_libdir)" ${myconf}
-}
-
-src_compile() {
- # Unfortunately, the parellel make breaks if USE=introspection
- use introspection && export MAKEOPTS="${MAKEOPTS} -j1"
- default
-}
-
-src_test() {
- unset DBUS_SESSION_BUS_ADDRESS
- Xemake check || die "tests failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "Installation failed"
-
- # see bug #133241
- echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
- insinto /etc/gtk-3.0
- doins "${T}"/gtkrc
-
- # Enable xft in environment as suggested by <utx@gentoo.org>
- echo "GDK_USE_XFT=1" > "${T}"/50gtk3
- doenvd "${T}"/50gtk3
-
- dodoc AUTHORS ChangeLog* HACKING NEWS* README* || die "dodoc failed"
-
- # Remove unneeded *.la files
- find "${ED}" -name "*.la" -delete
-
- # add -framework Carbon to the .pc files
- use aqua && for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
- sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
- done
-}
-
-pkg_postinst() {
- local GTK3_MODDIR="${EROOT}usr/$(get_libdir)/gtk-3.0/3.0.0"
- if [[ -d ${GTK3_MODDIR} ]]; then
- gtk-query-immodules-3.0 > "${GTK3_MODDIR}/immodules.cache"
- else
- ewarn "The destination path ${GTK3_MODDIR} doesn't exist;"
- ewarn "to complete the installation of GTK+, please create the"
- ewarn "directory and then manually run:"
- ewarn " cd ${GTK3_MODDIR}"
- ewarn " gtk-query-immodules-3.0 > immodules.cache"
- fi
-
- elog "Please install app-text/evince for print preview functionality."
- elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
- elog "add it to your gtkrc."
-}
diff --git a/x11-libs/libnotify/Manifest b/x11-libs/libnotify/Manifest
deleted file mode 100644
index 916e3e2..0000000
--- a/x11-libs/libnotify/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST libnotify-0.7.0.tar.bz2 309390 RMD160 d77eced59a776f035e29d01bb6f43e518cf90516 SHA1 1671f2faa62c450eb505196570d141c8c44d8f4c SHA256 7efc797a75241d9324f1642d9f2d7abf9dc6d2382ab9d77a21578e3c5dc0f0f9
-EBUILD libnotify-0.7.0.ebuild 799 RMD160 925d526624e21dde1cd24340a678f0cb338bbb3b SHA1 4405c82ae779337512676d7599c934b3aea709cd SHA256 0748975d27ba3cb02412c79c693eadd763225887c2640918aef8d3e82bcdec44
diff --git a/x11-libs/libnotify/libnotify-0.7.0.ebuild b/x11-libs/libnotify/libnotify-0.7.0.ebuild
deleted file mode 100644
index 496e198..0000000
--- a/x11-libs/libnotify/libnotify-0.7.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libnotify/libnotify-0.4.5.ebuild,v 1.14 2010/03/26 16:28:15 ssuominen Exp $
-
-EAPI=2
-
-inherit gnome.org
-
-DESCRIPTION="Notifications library"
-HOMEPAGE="http://www.galago-project.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.26"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- >=x11-libs/gtk+-2.90:3"
-PDEPEND="|| ( x11-misc/notification-daemon
- xfce-extra/xfce4-notifyd )"
-
-src_install() {
- emake install DESTDIR="${D}" || die "emake install failed"
- dodoc AUTHORS ChangeLog NEWS
-}
diff --git a/x11-themes/gnome-themes-standard/Manifest b/x11-themes/gnome-themes-standard/Manifest
deleted file mode 100644
index eeadeb0..0000000
--- a/x11-themes/gnome-themes-standard/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-themes-standard-2.91.2.1.tar.bz2 350077 RMD160 0338ceb10ec21737f826445c92d4b77e964ac320 SHA1 116e99932df725b904bd4c2cee9964a35e4e8c7c SHA256 8a0109c55e251785df30fdf5dbd3df3be537186417301b7993c1a5e3c4910d26
-EBUILD gnome-themes-standard-2.91.2.1.ebuild 681 RMD160 3f2979709c4f6418bd21cca73c9f3ec354051953 SHA1 504e5624f0db7ac3af186fc0767f03f448076a4a SHA256 e47f7170180f4a2261730210892af78c64a15d415f7773e94b5fdaf0274ecb96
-EBUILD gnome-themes-standard-9999.ebuild 884 RMD160 27fc314025f6bc96af1f6e6bf7b091e5eae50c90 SHA1 82fd3439136f0b52fbbf85ef22a74e972e418464 SHA256 5a87d878d3f5cf6c4caee7114b1c9cb34925d76c5bd02b79aa42e94537378ecf
diff --git a/x11-themes/gnome-themes-standard/gnome-themes-standard-2.91.2.1.ebuild b/x11-themes/gnome-themes-standard/gnome-themes-standard-2.91.2.1.ebuild
deleted file mode 100644
index 75c34aa..0000000
--- a/x11-themes/gnome-themes-standard/gnome-themes-standard-2.91.2.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit gnome2
-
-DESCRIPTION="GNOME 3 default themes for GTK+ and Metacity"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:3
- x11-themes/gtk-theme-engine-clearlooks"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- >=dev-util/pkgconfig-0.19
- >=dev-util/intltool-0.35"
-
-
-DOCS="ChangeLog NEWS"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
diff --git a/x11-themes/gnome-themes-standard/gnome-themes-standard-9999.ebuild b/x11-themes/gnome-themes-standard/gnome-themes-standard-9999.ebuild
deleted file mode 100644
index 0fd98c8..0000000
--- a/x11-themes/gnome-themes-standard/gnome-themes-standard-9999.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-EGIT_REPO_URI="git://git.gnome.org/gnome-themes-standard"
-
-inherit autotools gnome2 git
-
-DESCRIPTION="GNOME 3 default themes for GTK+ and Metacity"
-HOMEPAGE="http://www.gnome.org/"
-SRC_URI=""
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:3
- x11-themes/gtk-theme-engine-clearlooks"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- >=dev-util/pkgconfig-0.19
- >=dev-util/intltool-0.35"
-
-
-DOCS="ChangeLog NEWS"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-src_prepare() {
- gnome2_src_prepare
-
- intltoolize --force --copy --automake || die "intltoolize failed"
- eautoreconf
-} \ No newline at end of file
diff --git a/x11-themes/gtk-theme-engine-clearlooks/Manifest b/x11-themes/gtk-theme-engine-clearlooks/Manifest
deleted file mode 100644
index 59c483e..0000000
--- a/x11-themes/gtk-theme-engine-clearlooks/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gtk-theme-engine-clearlooks-2.91.3.tar.bz2 369277 RMD160 19ad72b29eda57e75c0c6111acf49cebf6be4680 SHA1 eaae3dc3ee304dd973f121121da879dd3424ed5e SHA256 a26543bfacae4c914124b38fdf3c43b214f06ab5353fcf0b8c498ea6f40be481
-EBUILD gtk-theme-engine-clearlooks-2.91.3.ebuild 842 RMD160 f45c2d357763c7cc3ec569ffa9d81316aff4b0c5 SHA1 927d7cfc49241f80dedf6aef61a26004c78cf801 SHA256 f6756f412a609d99222a26e25009e84509405759485dc4ef41f07f65fd0296bb
-EBUILD gtk-theme-engine-clearlooks-9999.ebuild 1002 RMD160 82680efab33e927707b26962af26c4baec282614 SHA1 e3f1f700cef6cc6b400e29751581abbbf1ba2b11 SHA256 567d95b31e05060cf7dc5e4e63016f4ed9921fbd4843b33cfd9a2c346c62b7b2
diff --git a/x11-themes/gtk-theme-engine-clearlooks/gtk-theme-engine-clearlooks-2.91.3.ebuild b/x11-themes/gtk-theme-engine-clearlooks/gtk-theme-engine-clearlooks-2.91.3.ebuild
deleted file mode 100644
index bfc017f..0000000
--- a/x11-themes/gtk-theme-engine-clearlooks/gtk-theme-engine-clearlooks-2.91.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/gtk-engines-2.20.1-r1.ebuild,v 1.1 2010/06/13 16:16:22 pacho Exp $
-
-EAPI="3"
-
-inherit gnome2
-
-DESCRIPTION="GTK+3 default theme engine"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.91:3"
-DEPEND="${RDEPEND}
- >=dev-util/intltool-0.31
- >=dev-util/pkgconfig-0.9
- !x11-themes/gtk-engines:3"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
- G2CONF="${G2CONF} --enable-animation"
-}
-
-src_install() {
- gnome2_src_install
-
- find "${D}" -name "*.la" -delete
-}
diff --git a/x11-themes/gtk-theme-engine-clearlooks/gtk-theme-engine-clearlooks-9999.ebuild b/x11-themes/gtk-theme-engine-clearlooks/gtk-theme-engine-clearlooks-9999.ebuild
deleted file mode 100644
index 9e03f5a..0000000
--- a/x11-themes/gtk-theme-engine-clearlooks/gtk-theme-engine-clearlooks-9999.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/gtk-engines-2.20.1-r1.ebuild,v 1.1 2010/06/13 16:16:22 pacho Exp $
-
-EAPI="3"
-
-EGIT_REPO_URI="git://git.gnome.org/gtk-theme-engine-clearlooks"
-
-inherit autotools gnome2 eutils git
-
-DESCRIPTION="GTK+3 default theme engine"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI=""
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.91:3"
-DEPEND="${RDEPEND}
- >=dev-util/intltool-0.31
- >=dev-util/pkgconfig-0.9
- !x11-themes/gtk-engines:3"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
- G2CONF="${G2CONF} --enable-animation"
-}
-
-src_prepare() {
- gnome2_src_prepare
-
- cd ${S}
- ./autogen.sh
-}
-
-src_install() {
- gnome2_src_install
-
- find "${D}" -name "*.la" -delete
-}
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
deleted file mode 100644
index fa675f1..0000000
--- a/x11-wm/mutter/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mutter-2.91.2.tar.bz2 2003403 RMD160 cf6078290a2d05c82ed50f888532bc153bc6b297 SHA1 66ebedf19c0f20b3523a5bc7a36b7a42155f0c16 SHA256 b6d473e87e0897a34d9b1ad6c63073581c96300843481a73287724029882b4eb
-EBUILD mutter-2.91.2.ebuild 1560 RMD160 00507971e9cee6ad5e86ba0514f2223cddd0de9b SHA1 be3d9e3f61ad3f8d75754272e8744321f648c43f SHA256 24e3c8a27b5832edad30d6c1dd03857b18f86879c0235bea78ca9de7e0cc80ac
-EBUILD mutter-9999.ebuild 1688 RMD160 f921b6232b0e9791cfe325c7a22428f34ff0b6e6 SHA1 003f8af1322e6215f8c1cc9b5c839ad888a09692 SHA256 1004ef643781babeb0a09e6ed6a503a83f8c9a38ce94085bdad479e88fe495ef
diff --git a/x11-wm/mutter/mutter-2.91.2.ebuild b/x11-wm/mutter/mutter-2.91.2.ebuild
deleted file mode 100644
index 0eda7ac..0000000
--- a/x11-wm/mutter/mutter-2.91.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit gnome2
-
-DESCRIPTION="Upcoming GNOME 3 window manager (derived from metacity)"
-HOMEPAGE="http://blogs.gnome.org/metacity/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +introspection +sound test xinerama"
-
-RDEPEND=">=x11-libs/pango-1.2[X,introspection?]
- >=x11-libs/cairo-1.10[X]
- >=x11-libs/gtk+-2.90.7:3[introspection?]
- sound? ( >=media-libs/libcanberra-0.26[gtk3] )
- >=gnome-base/gconf-2
- >=dev-libs/glib-2.14
- >=x11-libs/startup-notification-0.7
- >=x11-libs/libXcomposite-0.2
-
- >=media-libs/clutter-1.2
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXrandr
- x11-libs/libXrender
-
- introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
- xinerama? ( x11-libs/libXinerama )
- gnome-extra/zenity
- !x11-misc/expocity"
-DEPEND="${RDEPEND}
- >=app-text/gnome-doc-utils-0.8
- sys-devel/gettext
- >=dev-util/pkgconfig-0.9
- >=dev-util/intltool-0.35
- test? ( app-text/docbook-xml-dtd:4.5 )
- xinerama? ( x11-proto/xineramaproto )
- x11-proto/xextproto
- x11-proto/xproto"
-
-DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README *.txt doc/*.txt"
-
-src_prepare() {
- G2CONF="${G2CONF}
- --enable-gconf
- --enable-shape
- --enable-sm
- --enable-startup-notification
- --enable-xsync
- --enable-verbose-mode
- --enable-compile-warnings
- $(use_with sound libcanberra)
- $(use_with introspection)
- $(use_enable xinerama)"
-
-}
diff --git a/x11-wm/mutter/mutter-9999.ebuild b/x11-wm/mutter/mutter-9999.ebuild
deleted file mode 100644
index b3da833..0000000
--- a/x11-wm/mutter/mutter-9999.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# 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/mutter"
-
-DESCRIPTION="Upcoming GNOME 3 window manager (derived from metacity)"
-HOMEPAGE="http://blogs.gnome.org/metacity/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +introspection +sound test xinerama"
-
-RDEPEND=">=x11-libs/pango-1.2[X,introspection?]
- >=x11-libs/cairo-1.10[X]
- >=x11-libs/gtk+-2.90.7:3[introspection?]
- sound? ( >=media-libs/libcanberra-0.26[gtk3] )
- >=gnome-base/gconf-2
- >=dev-libs/glib-2.14
- >=x11-libs/startup-notification-0.7
- >=x11-libs/libXcomposite-0.2
-
- >=media-libs/clutter-1.2
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXrandr
- x11-libs/libXrender
-
- introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
- xinerama? ( x11-libs/libXinerama )
- gnome-extra/zenity
- !x11-misc/expocity"
-DEPEND="${RDEPEND}
- >=app-text/gnome-doc-utils-0.8
- sys-devel/gettext
- >=dev-util/pkgconfig-0.9
- >=dev-util/intltool-0.35
- test? ( app-text/docbook-xml-dtd:4.5 )
- xinerama? ( x11-proto/xineramaproto )
- x11-proto/xextproto
- x11-proto/xproto"
-
-DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README *.txt doc/*.txt"
-
-src_prepare() {
- G2CONF="${G2CONF}
- --enable-gconf
- --enable-shape
- --enable-sm
- --enable-startup-notification
- --enable-xsync
- --enable-verbose-mode
- --enable-compile-warnings
- $(use_with sound libcanberra)
- $(use_with introspection)
- $(use_enable xinerama)"
-
- intltoolize --force --copy --automake || die
- eautoreconf
-}