Permalink
Browse files

glorious funtoo updates

merged:

  funtoo-overlay: bfaeba697fe8c8e5155be9524876b88b3ad1c34e
  foo-overlay: 15d16bb4bc105fdf1309ef638f91ec792b50bd1b
  bar-overlay: f1e9085ee695ff5b6ce57d430d6b224aaf4fa0a6
  flora: bfd5882ce2949014f399443d65d05c83aa047a83
  mythtv: d5133545c1814f01e74fe9079ba83d3cd21140f4
  • Loading branch information...
1 parent c4c98be commit b14a16b45b1e8a46dc6463108d60564a821ff6be @danielrobbins danielrobbins committed Dec 10, 2012
Showing 362 changed files with 6,206 additions and 2,410 deletions.
@@ -1,4 +1,3 @@
DIST at-spi2-core-2.2.3.tar.xz 429444 SHA256 fb97f0a02fa378795e50857e22e640e099be1768081e28ca2dbdb3835f5b6af1 SHA512 4ff634339c7aecd90d1ec8b16478aae4da0db319ae1ee1ac5bcecc93098f797dc58359b718b9800bffa6da81afc41fed21eff71456a165aa6428f7a64179d631 WHIRLPOOL a698a217f99af089a9041b7162ebcff66d5d8a38050dd74750c77792380e368f57d91d2b1494a080674fb57560e566cd924cf930a5e7785f9ccdeb12a34504ab
DIST at-spi2-core-2.4.2.tar.xz 441204 SHA256 61d926ffc49c7f9236580468c5c9dabda16cec37ef3aee78ca6f2751595518fd SHA512 38968eb9a135b3f7badae2a87e7ba6b3323bfd43f8494ac81fb6696f7056d0e0ab04679173f9f8f595284611327da83fcf5ada3a406080c3faf5ada98a5d6599 WHIRLPOOL aa0902f6992dc38610599d2ccabb7796699ee4ebe0ded3b5123a4c85e290565d0a8812dec82851be69bad4afcf29f2eda120265f1707792c06f36f96cba95e95
-DIST at-spi2-core-2.6.1.tar.xz 443684 SHA256 cb087f0a9191422bc3f44c562a0dbfdf1c2266e45c267070aeb63b874e00f867 SHA512 2954c4c5f2b0328cdd1a0e76f7d9c9aab8ee8e7ed736ed1e15c8f9e6dfa4dd1d0f841d10665190c14e45ef4c492dea164ae728bb2ab9b89ff37a9b325288c677 WHIRLPOOL b9e347e8176d6861ee8c0be6f8561098ee13407daffc51db3490178de2ba0fbd6f494941d9092690d97608de5a9a7bb1d7427b9d38a0d7cf87ee8d6a63b7bb39
DIST at-spi2-core-2.6.2.tar.xz 443900 SHA256 0d5321ce9fdd7d036b072ef28cba14088394606e1687183ec5d0ae6adea8c87e SHA512 946e46bcba025d298051d99e229dfc5a3ff0b477b9c4e1a97c1ea3cee8a86832e2ee7fe34a986a9fb8e1138389e8f9ad3e27c2638769f1251e12ce4df6ccda9d WHIRLPOOL b01abdaa0f749f113e10a19ce1eab9d7bd120975a738acdf96fa25776258c51749af77f44375800724067b5b9ced253e49cd0c87225e7baee4e522b628657a1c
@@ -1,8 +1,8 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-core/at-spi2-core-2.6.1.ebuild,v 1.2 2012/11/12 12:40:28 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/at-spi2-core/at-spi2-core-2.6.2-r1.ebuild,v 1.1 2012/12/09 21:51:42 tetromino Exp $
-EAPI="4"
+EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
@@ -37,5 +37,9 @@ src_prepare() {
# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
epatch "${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
+ # important patches from 2.6.3
+ epatch "${FILESDIR}/${P}-hung-crash-"{1,2}.patch
+ epatch "${FILESDIR}/${P}-deregister.patch"
+
gnome2_src_prepare
}
@@ -0,0 +1,28 @@
+From ca6778ba2a6c4fed24d5468213f8ed918f3dcbe4 Mon Sep 17 00:00:00 2001
+From: Mike Gorse <mgorse@suse.com>
+Date: Fri, 7 Dec 2012 11:21:19 -0600
+Subject: [PATCH 3/3] Fix deregistering of applications
+
+---
+ registryd/registry.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/registryd/registry.c b/registryd/registry.c
+index a64e094..e283a90 100644
+--- a/registryd/registry.c
++++ b/registryd/registry.c
+@@ -290,9 +290,10 @@ handle_disconnection (DBusConnection *bus, DBusMessage *message, void *user_data
+ for (i = 0; i < reg->apps->len; i++)
+ {
+ SpiReference *ref = g_ptr_array_index (reg->apps, i);
+- while (!g_strcmp0 (old, ref->name))
++ if (!g_strcmp0 (old, ref->name))
+ {
+ remove_application (reg, bus, i);
++ i--;
+ }
+ }
+
+--
+1.8.0
+
@@ -0,0 +1,28 @@
+From 860ccecf3de3fdca6742060174cab1f90d708fb3 Mon Sep 17 00:00:00 2001
+From: Mike Gorse <mgorse@suse.com>
+Date: Thu, 6 Dec 2012 09:50:18 -0600
+Subject: [PATCH 1/3] Remove the correct datum when clearing a hung process
+
+When clearing hung processes, we were passing the wrong variable to
+g_list_remove, meaning that the datum would never be removed from the
+list, even though it had been freed, resulting in a crash.
+---
+ registryd/deviceeventcontroller.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c
+index b8c1bc7..101dc6f 100644
+--- a/registryd/deviceeventcontroller.c
++++ b/registryd/deviceeventcontroller.c
+@@ -1205,7 +1205,7 @@ reset_hung_process_from_ping (DBusPendingCall *pending, void *data)
+ if (!strcmp (l->data, data))
+ {
+ g_free (l->data);
+- hung_processes = g_slist_remove (hung_processes, data);
++ hung_processes = g_slist_remove (hung_processes, l->data);
+ break;
+ }
+ }
+--
+1.8.0
+
@@ -0,0 +1,26 @@
+From 00c94530c0d57808ac1f9e9b1525341654278ba3 Mon Sep 17 00:00:00 2001
+From: Mike Gorse <mgorse@suse.com>
+Date: Fri, 7 Dec 2012 10:27:58 -0600
+Subject: [PATCH 2/3] Fix another crash when removing hung processes
+
+There was another instance where we were freeing the wrong data.
+---
+ registryd/deviceeventcontroller.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c
+index 101dc6f..b14cd1e 100644
+--- a/registryd/deviceeventcontroller.c
++++ b/registryd/deviceeventcontroller.c
+@@ -1179,7 +1179,7 @@ reset_hung_process (DBusPendingCall *pending, void *data)
+ if (!strcmp (l->data, dest))
+ {
+ g_free (l->data);
+- hung_processes = g_slist_remove (hung_processes, data);
++ hung_processes = g_slist_remove (hung_processes, l->data);
+ break;
+ }
+ }
+--
+1.8.0
+
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/freeze/freeze-2.5.0.ebuild,v 1.20 2012/11/22 18:13:39 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/freeze/freeze-2.5.0.ebuild,v 1.21 2012/12/09 18:57:25 jer Exp $
EAPI="2"
inherit toolchain-funcs
@@ -14,8 +14,11 @@ SLOT="0"
KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
IUSE=""
-RDEPEND="!<=media-libs/mlt-0.4.2
- !media-libs/mlt[melt]"
+RDEPEND="
+ !<=media-libs/mlt-0.4.2
+ !app-forensics/sleuthkit
+ !media-libs/mlt[melt]
+"
DEPEND="${RDEPEND}
>=sys-apps/sed-4"
@@ -1,3 +1,4 @@
DIST bonnie++-1.93c.tgz 109175 SHA256 1520b088613f4308d07d85af767cf01120420f8c2b674c66cb50feccfea905a9 SHA512 4da6b783e49323186e179b48766c3d5022b459b75cdcee8e94486e4917429d8382477f3cfdc61005e725cd987f5897d1e21908593ae929529484b5f3831362de WHIRLPOOL 85df09e60b477f05123d95540794be55290cbbcfa20f500d1905b29b937545125be816679ba22f1f357c835a3f87d3ea5b248c78f7830329af6d5e0623e52b20
DIST bonnie++-1.95.tgz 98877 SHA256 8d04a9baa0c6090cb705ede9d60573d7a7a349ae3b5b2f7fffe6e610121cb051 SHA512 a8dadb643a1c6e8c14e9ff098aedcdfe8ae6585ebced0d3f71cb2d896356848152da6829061e405c277992eb50af75ef972dab752902b92a3d8949e992e4b4a6 WHIRLPOOL 37122089471c7f051f2a68a6128c42d71066e0bf1ce74a2a653e57439cee095203a3ca3a77a15f5a03819aa82ecf0c075bcc79a8f2ab7630639b7ec5c022ed32
DIST bonnie++-1.96.tgz 105183 SHA256 9c9d87bf09ac5a42a915ceeb9d8bb8358c0ca4642d86b85ed48ca5f15ee3456c SHA512 d389545be68eb236382ac1cc361d171e28b6204c9ea2427a6d4743086fb16a3a1ee78acc35fd0706237d8d90dd8403872ed743583496b1e2512fa57242ff0bb8 WHIRLPOOL 57b04f3cac809bd66e32c895c857bfce969ae16a207eecef743b5c522b6d7496bf518d352a673011fba3e9073f541a274cbc9a4ae5ddd88b37cb386ea2b2e5d4
+DIST bonnie++-1.97.tgz 102604 SHA256 44f5a05937648a6526ba99354555d7d15f2dd392e55d3436f6746da6f6c35982 SHA512 985fd4d0ef643fda5363e61609a5d73206ecfdd1c27470cc7babeaf9b7d87136c6bf40f62366d3f3ea58c50a307fa62aea59dc5efa69854fff9c43d1c940d3ab WHIRLPOOL 23af9926691868a208fd69f7ec401fa0c2332835ccc63e4b0143497faabb02f21ddd56a41014b532287f4418e0ac92c712aff2bc0657ad2512961fa5aa3567b9
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bonnie++/bonnie++-1.97.ebuild,v 1.1 2012/12/10 05:23:01 patrick Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="Hard drive bottleneck testing benchmark suite."
+HOMEPAGE="http://www.coker.com.au/bonnie++/"
+SRC_URI="http://www.coker.com.au/bonnie++/experimental/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug"
+
+DEPEND=""
+RDEPEND=""
+
+# hmm?
+S="${WORKDIR}/${P}.1"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-1.96-compile-flags.patch"
+}
+
+src_configure() {
+ econf \
+ $(use_with debug) \
+ --disable-stripping \
+ || die
+}
+
+src_compile() {
+ emake || die "emake failed"
+ emake zcav || die "emake zcav failed" # see #9073
+}
+
+src_install() {
+ dosbin bonnie++ zcav || die
+ dobin bon_csv2html bon_csv2txt || die
+ doman bon_csv2html.1 bon_csv2txt.1 bonnie++.8 zcav.8
+ dohtml readme.html
+ dodoc changelog.txt credits.txt
+}
@@ -1,2 +1,2 @@
-DIST libsecret-0.10.tar.xz 473952 SHA256 4015ac83042fa408bf66ca8526709662d194fe566181db6ab3d86a6ea4ab8880 SHA512 28b09871e532c26f04b760d014b54cfb478997840e010a07d8862ebf9f8f87f7e67f5ec60e486577020aee29ea75701d7263891126aec638eaad9245e5c2c076 WHIRLPOOL 5b55093a83dfacefad59735ecae895d5145b289d7ee2b0181345fa0f6053b7c8f736ac7833fc686b9b180cd0b977d5048b25ee0952dccb6f28764359926b8165
DIST libsecret-0.11.tar.xz 474716 SHA256 e5399dfb61376a7500d20cb22715152780aa3a2c8a64281ec6bc8f0ebeb8b689 SHA512 a4fa9e8e661f8165dacfc15fbe41a8429070c036ce64a7bfbd79ffc0c18ddf16d31518d25298de8e640f3b581e7d8915537ecca85a182b9bad8c03fe1d287122 WHIRLPOOL 02eef41a600597f3348b859895a62e200277e23a752071e222e87ff8229b4bc71f8ecd201b4ae118ceebd0179db3c1593c812d7c4b9f6bf6040af72b3205d419
+DIST libsecret-0.12.tar.xz 476552 SHA256 323db75a5e73058d3eb95597d9f798fd715ec7d58f500be84628b8f9a0617c01 SHA512 920da07b8674816b9f139dc71e79721d1767025e799e99dea7458c3c3b54c81ae2f4aa55ad55194e0c151fa23d13eae12928c9bbfac1c67d9ae6eed3d8a1efa4 WHIRLPOOL 1bcc96a175519f2d24ec8c5f8ee61ae0ca851511c540d69230ab05a67d7192ac5827d407c06aa054820ee1ea714efee7ee15927b4fcc152fae73ef66bb768f24
@@ -1,45 +1,70 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/libsecret/libsecret-0.10.ebuild,v 1.1 2012/09/25 10:06:41 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/libsecret/libsecret-0.12.ebuild,v 1.1 2012/12/09 22:33:23 tetromino Exp $
-EAPI="4"
+EAPI="5"
+VALA_MIN_API_VERSION=0.18
+VALA_USE_DEPEND=vapigen
-inherit gnome2 virtualx
+inherit eutils gnome2 python vala virtualx
DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API"
HOMEPAGE="https://live.gnome.org/Libsecret"
LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
SLOT="0"
-IUSE="+crypt debug +introspection"
+IUSE="+crypt debug +introspection test vala"
+REQUIRED_USE="vala? ( introspection )"
KEYWORDS="~amd64 ~x86"
COMMON_DEPEND="
>=dev-libs/glib-2.31.0:2
- crypt? ( >=dev-libs/libgcrypt-1.2.2 )
+ crypt? ( >=dev-libs/libgcrypt-1.2.2:= )
introspection? ( >=dev-libs/gobject-introspection-1.29 )"
RDEPEND="${COMMON_DEPEND}
>=gnome-base/gnome-keyring-3"
# Add ksecrets to RDEPEND when it's added to portage
DEPEND="${COMMON_DEPEND}
dev-libs/libxslt
- sys-devel/gettext
dev-util/gdbus-codegen
+ dev-util/gtk-doc-am
>=dev-util/intltool-0.35.0
- virtual/pkgconfig"
+ sys-devel/gettext
+ virtual/pkgconfig
+ test? (
+ dev-python/mock
+ introspection? (
+ =dev-lang/python-2*
+ >=dev-libs/gjs-1.32
+ dev-python/pygobject:3 )
+ )
+ vala? ( $(vala_depend) )"
pkg_setup() {
+ # python is only needed for tests
+ if use test && use introspection; then
+ python_set_active_version 2
+ python_pkg_setup
+ fi
+}
+
+src_prepare() {
DOCS="AUTHORS ChangeLog NEWS README"
- G2CONF="
+ G2CONF="${G2CONF}
--enable-manpages
--disable-strict
--disable-coverage
--disable-static
- --disable-vala
- $(use_enable crypt gcrypt)"
-}
+ $(use_enable crypt gcrypt)
+ $(use_enable introspection)
+ $(use_enable vala)"
-src_prepare() {
+ # FIXME: disable failing test
+ sed -e '/test_get_sync);/d' \
+ -e '/test_get_async);/d' \
+ -i libsecret/tests/test-service.c || die
+
+ use vala && vala_src_prepare
gnome2_src_prepare
}
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/canna-2ch/canna-2ch-20040519.ebuild,v 1.3 2012/12/07 18:03:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/canna-2ch/canna-2ch-20040519.ebuild,v 1.4 2012/12/10 00:11:39 jer Exp $
inherit cannadic eutils
@@ -11,7 +11,7 @@ SRC_URI="http://dev.gentoo.org/~naota/files/${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ppc ~ppc64 ~sparc x86"
IUSE="canna"
DEPEND="canna? ( app-i18n/canna )"
@@ -1,3 +1,2 @@
DIST gedit-plugins-2.32.0.tar.bz2 616927 SHA256 2ef7bf48e9500556d84ae4c2950f4eadcc3f9cb9c58c90f2c83956b0ddad1107 SHA512 c00535a8a166752ef764319eb79fd7dd5a55df495bf0f3de32e287214f5da8ddd32a52c5538d5e8714843e7e724d24aab9f6fca0f1f339fe299a1ffdf264761b WHIRLPOOL d7385fe3682efaeaa5fbc57a8e8fb68480983140daf78643392b6a7b335a2a5e8ce21cc8f04136efcfac6133dd1c1cd65c50eab0b0cbde766eebb850889796eb
-DIST gedit-plugins-3.2.1.tar.xz 1434840 SHA256 45dee01a196a7d5e87027187e76d57643b146ea1c313cad2686ebd369890f841 SHA512 19bb55532d16f9115f41632a39dabefaae2344037e89d09139ca150bea5d12cc31047db90291fa950f8101b957e4c09fc04216e835ecb977b039c9d87206d64a WHIRLPOOL 3d03fcc3f875cdf835e582c682938998e3baac493fb5c0497245e4f300b790871853d6985f24f96c1c20d72be355838f21f4de6f9e07d1afa4002eced71aa047
DIST gedit-plugins-3.4.0.tar.xz 1454320 SHA256 a66138b43e1a77f39258f04936be35163b4c6bfd49643791ca445cb3c3d60e0a SHA512 fab94c9c7f824fb90429a7e446ad6a0c155d1c50cb128bbfdb7f4e454ba40778c63b6f835d5e0805e401117cac41c78c32fecc0c7aaa2549d26e4fc86edde2ac WHIRLPOOL 97d31ae70b993bbd503b1e3e6e00f4c512df4a95cbf42c00bc9a6ea09ab55464382ef617663cc2f19d95ac48f87a371da7c53a119b2992b8479aacd6922d5513
@@ -1,102 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit-plugins/gedit-plugins-3.2.1-r1.ebuild,v 1.4 2012/05/03 18:33:02 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_DEPEND="python? 2:2.6"
-PYTHON_USE_WITH="xml"
-PYTHON_USE_WITH_OPT="python"
-
-inherit gnome2 multilib python eutils
-
-DESCRIPTION="Offical plugins for gedit"
-HOMEPAGE="http://live.gnome.org/GeditPlugins"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-IUSE_plugins="charmap synctex terminal"
-IUSE="+python ${IUSE_plugins}"
-
-RDEPEND=">=app-editors/gedit-3.2.0[python?]
- >=dev-libs/glib-2.26.0:2
- >=dev-libs/libpeas-0.7.3[gtk,python?]
- >=x11-libs/gtk+-3.0.0:3
- >=x11-libs/gtksourceview-3.0.0:3.0
- python? (
- >=app-editors/gedit-3.0.0[introspection]
- dev-python/pycairo
- || (
- dev-python/pygobject:2[cairo,introspection]
- dev-python/pygobject:3[cairo] )
- >=x11-libs/gtk+-3.0.0:3[introspection]
- >=x11-libs/gtksourceview-3.0.0:3.0[introspection]
- x11-libs/pango[introspection]
- x11-libs/gdk-pixbuf:2[introspection]
- )
- charmap? ( >=gnome-extra/gucharmap-3.0.0:2.90[introspection] )
- synctex? ( >=dev-python/dbus-python-0.82 )
- terminal? ( x11-libs/vte:2.90[introspection] )"
-DEPEND="${RDEPEND}
- >=dev-util/intltool-0.40.0
- virtual/pkgconfig
- sys-devel/gettext"
-
-pkg_setup() {
- # DEFAULT_PLUGINS from configure.ac
- local myplugins="bookmarks,drawspaces,wordcompletion,taglist"
-
- # python plugins with no extra dependencies beyond what USE=python brings
- use python && myplugins="${myplugins},bracketcompletion,codecomment,colorpicker,commander,joinlines,multiedit,textsize,sessionsaver,smartspaces"
-
- # python plugins with extra dependencies
- for plugin in ${IUSE_plugins/+}; do
- use ${plugin} || continue
- # FIXME: put in REQUIRED_USE when python.eclass supports EAPI4
- if use python; then
- myplugins="${myplugins},${plugin}"
- else
- ewarn "Plugin '${plugin}' auto-disabled due to USE=-python"
- fi
- done
-
- DOCS="AUTHORS ChangeLog* NEWS README"
-
- G2CONF="${G2CONF}
- --disable-schemas-compile
- --disable-dependency-tracking
- --with-plugins=${myplugins}
- $(use_enable python)"
-
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- gnome2_src_prepare
-
- # disable pyc compiling
- for d in . build-aux ; do
- echo > "${d}/py-compile"
- done
-}
-
-src_test() {
- emake check
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- if use python; then
- python_need_rebuild
- python_mod_optimize /usr/{$(get_libdir),share}/gedit/plugins
- fi
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
- use python && python_mod_cleanup /usr/{$(get_libdir),share}/gedit/plugins
-}
Oops, something went wrong.

0 comments on commit b14a16b

Please sign in to comment.