Permalink
Browse files

glorious funtoo updates

merged:

  gentoo: 0d1cedf82f80b527e77d41bf69ac34b437c1803e
  funtoo-overlay: b42ad85e138901cbf7b25e4076b83c48c2ad2330
  foo-overlay: b68e568364dae252ca075796daac480847a06ba1
  bar-overlay: 490840edb883a31b75107639b102e97c6969179b
  flora: ba8a5e994d6984751dd7655c78b6bf1124e022ad
  • Loading branch information...
1 parent 77dea41 commit 5bf2193d8ebd2faca3a19716ca5dbd2d8db42c77 @danielrobbins danielrobbins committed Mar 21, 2012
Showing 4,406 changed files with 9,521 additions and 10,154 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
@@ -1,9 +1,11 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/localepurge/localepurge-0.5.3.3.ebuild,v 1.2 2008/01/26 10:20:17 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/localepurge/localepurge-0.5.3.3.ebuild,v 1.3 2012/03/21 12:04:26 pacho Exp $
+
+EAPI=4
DESCRIPTION="Script to recover diskspace wasted for unneeded locale files and localized man pages."
-HOMEPAGE="http://www.josealberto.org/blog/index.php?s=localepurge"
+HOMEPAGE="http://gentoo.org"
SRC_URI="mirror://gentoo/${P}.tbz2"
LICENSE="GPL-2"
@@ -16,12 +18,16 @@ RDEPEND="app-shells/bash"
S=${WORKDIR}/${PN}
+src_prepare() {
+ sed -i -e 's/0.5.3.2/0.5.3.3/' localepurge || die
+}
+
src_install() {
insinto /var/cache/localepurge
doins defaultlist
dosym defaultlist /var/cache/localepurge/localelist
insinto /etc
doins locale.nopurge
- dobin localepurge || die
+ dobin localepurge
doman localepurge.8
}
@@ -1,29 +1,27 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unshield/unshield-0.6.ebuild,v 1.4 2012/03/11 15:41:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unshield/unshield-0.6.ebuild,v 1.5 2012/03/21 06:12:27 ssuominen Exp $
-EAPI=2
+EAPI=4
DESCRIPTION="InstallShield CAB file extractor"
HOMEPAGE="http://www.synce.org/"
SRC_URI="mirror://sourceforge/synce/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc x86"
IUSE="static-libs"
-RDEPEND=">=sys-libs/zlib-1.1.4"
+RDEPEND="sys-libs/zlib"
DEPEND="${RDEPEND}"
src_configure() {
- econf \
- --disable-dependency-tracking \
- $(use_enable static-libs static)
+ econf $(use_enable static-libs static)
}
src_install() {
- emake DESTDIR="${D}" install || die
+ emake DESTDIR="${D}" install
dodoc README
find "${D}" -name '*.la' -exec rm -f {} +
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unshield/unshield-0.6_p20120308.ebuild,v 1.2 2012/03/08 07:56:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unshield/unshield-0.6_p20120308.ebuild,v 1.3 2012/03/21 06:10:17 ssuominen Exp $
EAPI=4
inherit autotools eutils
DESCRIPTION="InstallShield CAB file extractor"
HOMEPAGE="http://github.com/twogood/unshield http://sourceforge.net/projects/synce/"
-SRC_URI="http://dev.gentoo.org/~ssuominen/${P}.tar.xz"
+SRC_URI="mirror://gentoo/${P}.tar.xz"
LICENSE="MIT"
SLOT="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-cdr/pburn/pburn-3.4.3.ebuild,v 1.1 2012/01/03 11:08:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/pburn/pburn-3.4.3.ebuild,v 1.2 2012/03/21 06:52:36 ssuominen Exp $
# wget --user puppy --password linux "http://www.meownplanet.net/zigbert/${P}.pet"
@@ -9,7 +9,7 @@ inherit eutils
DESCRIPTION="A burning tool with GTK+ frontend"
HOMEPAGE="http://murga-linux.com/puppy/viewtopic.php?t=23881"
-SRC_URI="http://dev.gentoo.org/~ssuominen/${P}.pet"
+SRC_URI="mirror://gentoo/${P}.pet"
LICENSE="GPL-2"
SLOT="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-crypt/kstart/kstart-4.1.ebuild,v 1.1 2012/01/08 08:25:27 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/kstart/kstart-4.1.ebuild,v 1.2 2012/03/21 12:02:54 ago Exp $
EAPI=4
@@ -13,7 +13,7 @@ SRC_URI="http://archives.eyrie.org/software/kerberos/${P}.tar.gz"
LICENSE="|| ( MIT Stanford ISC )"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="afs"
DEPEND="virtual/krb5
@@ -0,0 +1,2 @@
+DIST vagrant-1.0.0.gem 1000960 RMD160 aadb5910a86bb5750ba5b877e58733bf09e5cc66 SHA1 696f9a5d5b706e3761c2d3a5677dd7170c070712 SHA256 ffee3f8b4b02dbf1ec7965342c17d555927e92658dd42eae82e527ab34f196aa
+DIST vagrant-1.0.1.gem 1001984 RMD160 2571eb08f80a098eb6df2724432fa99a0575c66d SHA1 69ee0ccd7d9ba0247405e119a583de5cb0dd7bbc SHA256 0fa25bd0c2b0910fc73629d0627df204f8d1acff5c5542373b3eb257ca8d94c0
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>radhermit@gentoo.org</email>
+ <name>Tim Harder</name>
+ </maintainer>
+</pkgmetadata>
@@ -0,0 +1,54 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vagrant/vagrant-1.0.0.ebuild,v 1.1 2012/03/21 07:08:08 radhermit Exp $
+
+EAPI="4"
+USE_RUBY="ruby18 ruby19"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
+RUBY_FAKEGEM_EXTRAINSTALL="config keys templates"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A tool for building and distributing virtual machines using VirtualBox"
+HOMEPAGE="http://vagrantup.com/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# Missing ebuild for contest
+RESTRICT="test"
+
+RDEPEND="${RDEPEND}
+ || ( app-emulation/virtualbox app-emulation/virtualbox-bin )"
+
+ruby_add_rdepend "
+ ~dev-ruby/archive-tar-minitar-0.5.2
+ >=dev-ruby/childprocess-0.3.1
+ >=dev-ruby/erubis-2.7.0
+ >=dev-ruby/i18n-0.6.0
+ >=dev-ruby/json-1.5.1
+ >=dev-ruby/log4r-1.1.9
+ >=dev-ruby/net-scp-1.0.4
+ >=dev-ruby/net-ssh-2.2.2
+"
+
+ruby_add_bdepend "
+ dev-ruby/rake
+ test? ( dev-ruby/mocha virtual/ruby-minitest )
+"
+
+all_ruby_prepare() {
+ # Remove bundler support
+ sed -i -e '/[Bb]undler/d' Rakefile || die
+ rm Gemfile || die
+
+ # Loosen unslotted dependencies
+ sed -i -e '/json\|net-ssh/s/~>/>=/' ${PN}.gemspec || die
+
+ # Remove a runtime dependency that we can't satisfy
+ sed -i -e '/git ls-files/d' ${PN}.gemspec || die
+}
@@ -0,0 +1,54 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vagrant/vagrant-1.0.1.ebuild,v 1.1 2012/03/21 10:05:10 radhermit Exp $
+
+EAPI="4"
+USE_RUBY="ruby18 ruby19"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
+RUBY_FAKEGEM_EXTRAINSTALL="config keys templates"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A tool for building and distributing virtual machines using VirtualBox"
+HOMEPAGE="http://vagrantup.com/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# Missing ebuild for contest
+RESTRICT="test"
+
+RDEPEND="${RDEPEND}
+ || ( app-emulation/virtualbox app-emulation/virtualbox-bin )"
+
+ruby_add_rdepend "
+ ~dev-ruby/archive-tar-minitar-0.5.2
+ >=dev-ruby/childprocess-0.3.1
+ >=dev-ruby/erubis-2.7.0
+ >=dev-ruby/i18n-0.6.0
+ >=dev-ruby/json-1.5.1
+ >=dev-ruby/log4r-1.1.9
+ >=dev-ruby/net-scp-1.0.4
+ >=dev-ruby/net-ssh-2.2.2
+"
+
+ruby_add_bdepend "
+ dev-ruby/rake
+ test? ( dev-ruby/mocha virtual/ruby-minitest )
+"
+
+all_ruby_prepare() {
+ # Remove bundler support
+ sed -i -e '/[Bb]undler/d' Rakefile || die
+ rm Gemfile || die
+
+ # Loosen unslotted dependencies
+ sed -i -e '/json\|net-ssh/s/~>/>=/' ${PN}.gemspec || die
+
+ # Remove a runtime dependency that we can't satisfy
+ sed -i -e '/git ls-files/d' ${PN}.gemspec || die
+}
@@ -1,2 +1 @@
-DIST ibus-hangul-1.3.1.tar.gz 431214 RMD160 996172fb00854ae2000b3197707269ebd8d6808e SHA1 e1fb0e0560d8987c3106992693638a298bd2ea1c SHA256 1e5530c1d7add8970f3a98a76a0a2feda06a08d65af56fbba5329a6645915afc
DIST ibus-hangul-1.4.0.tar.gz 439462 RMD160 07ac966ba9f878ead7e17d31a653bd5514098305 SHA1 421d7164a27eeedfea49d54b61e2a5edd4f7d3a7 SHA256 a955ec0c9ea90ecd8e8d0fd2de1596a5ba1186463862c387d74a418d1707ca0a
@@ -1,155 +0,0 @@
-From 6ce58d1d79e5b175865ee26794e9fc7ce576ce56 Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <ueno@unixuser.org>
-Date: Mon, 8 Nov 2010 14:12:35 +0900
-Subject: [PATCH] Fix build with ibus-1.4.
-
-This patch adds compatibility code for the API changes of IBusConfig and
-IBusEngineDesc in ibus-1.3 -> ibus-1.4.
----
- src/engine.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++---------
- 1 files changed, 63 insertions(+), 12 deletions(-)
-
-diff --git a/src/engine.c b/src/engine.c
-index 79db70f..a297e4d 100644
---- a/src/engine.c
-+++ b/src/engine.c
-@@ -111,7 +111,11 @@ static void ibus_hangul_engine_update_lookup_table
- static void ibus_config_value_changed (IBusConfig *config,
- const gchar *section,
- const gchar *name,
-+#if IBUS_CHECK_VERSION(1,3,99)
-+ GVariant *value,
-+#else
- GValue *value,
-+#endif /* !IBUS_CHECK_VERSION(1,3,99) */
- gpointer user_data);
-
- static void lookup_table_set_visible (IBusLookupTable *table,
-@@ -136,6 +140,11 @@ static gboolean hanja_key_list_match (HanjaKeyList *list,
- static gboolean hanja_key_list_has_modifier (HanjaKeyList *list,
- guint keyval);
-
-+static gboolean config_get_string (IBusConfig *config,
-+ const gchar *section,
-+ const gchar *name,
-+ gchar **result);
-+
- static IBusEngineClass *parent_class = NULL;
- static HanjaTable *hanja_table = NULL;
- static HanjaTable *symbol_table = NULL;
-@@ -176,7 +185,7 @@ void
- ibus_hangul_init (IBusBus *bus)
- {
- gboolean res;
-- GValue value = { 0, };
-+ gchar *str;
-
- hanja_table = hanja_table_load (NULL);
-
-@@ -187,22 +196,20 @@ ibus_hangul_init (IBusBus *bus)
- g_object_ref_sink (config);
-
- hangul_keyboard = g_string_new_len ("2", 8);
-- res = ibus_config_get_value (config, "engine/Hangul",
-- "HangulKeyboard", &value);
-+ str = NULL;
-+ res = config_get_string (config, "engine/Hangul", "HangulKeyboard", &str);
- if (res) {
-- const gchar* str = g_value_get_string (&value);
- g_string_assign (hangul_keyboard, str);
-- g_value_unset(&value);
-+ g_free (str);
- }
-
- hanja_key_list_init(&hanja_keys);
-
-- res = ibus_config_get_value (config, "engine/Hangul",
-- "HanjaKeys", &value);
-+ str = NULL;
-+ res = config_get_string (config, "engine/Hangul", "HanjaKeys", &str);
- if (res) {
-- const gchar* str = g_value_get_string (&value);
- hanja_key_list_set_from_string(&hanja_keys, str);
-- g_value_unset(&value);
-+ g_free (str);
- } else {
- hanja_key_list_append(&hanja_keys, IBUS_Hangul_Hanja, 0);
- hanja_key_list_append(&hanja_keys, IBUS_F9, 0);
-@@ -963,27 +970,71 @@ ibus_hangul_engine_property_activate (IBusEngine *engine,
- }
- }
-
-+static gboolean
-+config_get_string (IBusConfig *config,
-+ const gchar *section,
-+ const gchar *name,
-+ gchar **result)
-+{
-+#if IBUS_CHECK_VERSION(1,3,99)
-+ GVariant *value = NULL;
-+
-+ g_return_val_if_fail (result != NULL, FALSE);
-+
-+ value = ibus_config_get_value (config, section, name);
-+ if (value) {
-+ *result = g_strdup (g_variant_get_string (value, NULL));
-+ g_variant_unref (value);
-+ return TRUE;
-+ }
-+ return FALSE;
-+#else
-+ GValue value = { 0 };
-+
-+ g_return_val_if_fail (result != NULL, FALSE);
-+
-+ if (ibus_config_get_value (config, section, name, &value)) {
-+ *result = g_strdup (g_value_get_string (&value));
-+ g_value_unset (&value);
-+ return TRUE;
-+ }
-+ return FALSE;
-+#endif /* !IBUS_CHECK_VERSION(1,3,99) */
-+}
-+
-+#if IBUS_CHECK_VERSION(1,3,99)
-+#define _g_variant_get_string g_variant_get_string
-+#define _g_variant_get_int32 g_variant_get_int32
-+#else
-+#define _g_variant_get_string(value, length) g_value_get_string(value)
-+#define _g_variant_get_int32 g_value_get_int
-+#endif /* !IBUS_CHECK_VERSION(1,3,99) */
-+
- static void
- ibus_config_value_changed (IBusConfig *config,
- const gchar *section,
- const gchar *name,
-+#if IBUS_CHECK_VERSION(1,3,99)
-+ GVariant *value,
-+#else
- GValue *value,
-+#endif /* !IBUS_CHECK_VERSION(1,3,99) */
- gpointer user_data)
- {
- IBusHangulEngine *hangul = (IBusHangulEngine *) user_data;
-
- if (strcmp(section, "engine/Hangul") == 0) {
- if (strcmp(name, "HangulKeyboard") == 0) {
-- const gchar *str = g_value_get_string (value);
-+ const gchar *str = _g_variant_get_string (value, NULL);
- g_string_assign (hangul_keyboard, str);
- hangul_ic_select_keyboard (hangul->context, hangul_keyboard->str);
- } else if (strcmp(name, "HanjaKeys") == 0) {
-- const gchar* str = g_value_get_string (value);
-+ const gchar* str = _g_variant_get_string (value, NULL);
- hanja_key_list_set_from_string(&hanja_keys, str);
- }
- } else if (strcmp(section, "panel") == 0) {
- if (strcmp(name, "lookup_table_orientation") == 0) {
-- lookup_table_orientation = g_value_get_int (value);
-+ lookup_table_orientation = _g_variant_get_int32 (value);
- }
- }
- }
---
-1.7.5.1
-
Oops, something went wrong.

0 comments on commit 5bf2193

Please sign in to comment.