summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2013-08-24 16:48:13 +0000
committerJeroen Roovers <jer@gentoo.org>2013-08-24 16:48:13 +0000
commit93491ca22feecafc777ced3ee81f5edb0e64b463 (patch)
tree89fb31a80656768e4b70312e11f344bed5140927 /app-misc/gentoo
parentadd ~x86, bug #478294 (diff)
downloadgentoo-2-93491ca22feecafc777ced3ee81f5edb0e64b463.tar.gz
gentoo-2-93491ca22feecafc777ced3ee81f5edb0e64b463.tar.bz2
gentoo-2-93491ca22feecafc777ced3ee81f5edb0e64b463.zip
Version bump that merely incorporates the uncredited NLS patch already added in 0.20.2.
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'app-misc/gentoo')
-rw-r--r--app-misc/gentoo/ChangeLog9
-rw-r--r--app-misc/gentoo/files/gentoo-0.20.2-nls.patch24
-rw-r--r--app-misc/gentoo/gentoo-0.20.3.ebuild (renamed from app-misc/gentoo/gentoo-0.20.2.ebuild)4
3 files changed, 9 insertions, 28 deletions
diff --git a/app-misc/gentoo/ChangeLog b/app-misc/gentoo/ChangeLog
index 631eb21a6c23..024e0925d8be 100644
--- a/app-misc/gentoo/ChangeLog
+++ b/app-misc/gentoo/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for app-misc/gentoo
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/ChangeLog,v 1.123 2013/08/24 12:34:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/ChangeLog,v 1.124 2013/08/24 16:48:13 jer Exp $
+
+*gentoo-0.20.3 (24 Aug 2013)
+
+ 24 Aug 2013; Jeroen Roovers <jer@gentoo.org> -gentoo-0.20.2.ebuild,
+ +gentoo-0.20.3.ebuild, -files/gentoo-0.20.2-nls.patch:
+ Version bump that merely incorporates the uncredited NLS patch already added
+ in 0.20.2.
*gentoo-0.20.2 (24 Aug 2013)
diff --git a/app-misc/gentoo/files/gentoo-0.20.2-nls.patch b/app-misc/gentoo/files/gentoo-0.20.2-nls.patch
deleted file mode 100644
index ee922f23a9b0..000000000000
--- a/app-misc/gentoo/files/gentoo-0.20.2-nls.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/src/gentoo.c 2013-08-22 19:33:15.000000000 +0200
-+++ b/src/gentoo.c 2013-08-24 14:16:17.978060205 +0200
-@@ -466,6 +466,10 @@
- gboolean no_rc = FALSE, no_gtk_rc = FALSE, no_dir_history = FALSE, list_commands = FALSE;
- gchar *dir_left = NULL;
- gchar *dir_right = NULL;
-+#if defined ENABLE_NLS
-+ gboolean show_locale_info = FALSE;
-+ gint i;
-+#endif
- GOptionEntry option_entries[] = {
- { "version", 0, 0, G_OPTION_ARG_NONE, &show_version, N_("Report the version to standard output, and exit"), NULL },
- #if defined ENABLE_NLS
-@@ -482,10 +486,6 @@
- { "list-commands", 0, 0, G_OPTION_ARG_NONE, &list_commands, N_("Print a list of all built-in commands, and exit"), NULL },
- { NULL }
- };
--#if defined ENABLE_NLS
-- gboolean show_locale_info = FALSE;
-- gint i;
--#endif
- GtkWidget *box;
- GOptionContext *context;
- GError *err = NULL;
diff --git a/app-misc/gentoo/gentoo-0.20.2.ebuild b/app-misc/gentoo/gentoo-0.20.3.ebuild
index 896416ce9fc9..92fa4d4af6f8 100644
--- a/app-misc/gentoo/gentoo-0.20.2.ebuild
+++ b/app-misc/gentoo/gentoo-0.20.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.20.2.ebuild,v 1.1 2013/08/24 12:34:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.20.3.ebuild,v 1.1 2013/08/24 16:48:13 jer Exp $
EAPI=5
inherit autotools eutils
@@ -31,8 +31,6 @@ DOCS=(
)
src_prepare() {
- epatch "${FILESDIR}"/${P}-nls.patch
-
sed -i \
-e 's^icons/gnome/16x16/mimetypes^gentoo/icons^' \
gentoorc.in || die