From: Brad Laue Date: Thu, 7 Oct 2004 05:22:19 +0000 (+0000) Subject: Remove the locale check entirely X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=300eb79049689297b3ef18474065ece3af803ad1;p=gentoo.git Remove the locale check entirely --- diff --git a/app-misc/emelfm2/ChangeLog b/app-misc/emelfm2/ChangeLog index ef7d7eab60e9..b118ddf3a580 100644 --- a/app-misc/emelfm2/ChangeLog +++ b/app-misc/emelfm2/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-misc/emelfm2 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/emelfm2/ChangeLog,v 1.2 2004/09/04 23:00:17 dholm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/emelfm2/ChangeLog,v 1.3 2004/10/07 05:22:19 brad Exp $ + +*emelfm2-0.0.9-r1 (07 Oct 2004) + + 07 Oct 2004; Brad Laue +files/locale.patch, + +emelfm2-0.0.9-r1.ebuild: + Patch to remove the Locale check entirely, as its spurious. 05 Sep 2004; David Holm emelfm2-0.0.9.ebuild: Added to ~ppc. diff --git a/app-misc/emelfm2/Manifest b/app-misc/emelfm2/Manifest index 285c8d8dcbf8..03cbda619e6c 100644 --- a/app-misc/emelfm2/Manifest +++ b/app-misc/emelfm2/Manifest @@ -1,4 +1,7 @@ -MD5 1eca8ba873e82d82c64acbb7bc2aaee8 ChangeLog 443 MD5 eea2633f17a169742bdc26557bea711d emelfm2-0.0.9.ebuild 1407 +MD5 b5590dcee5fb7f2dd93f99910dcccaf6 emelfm2-0.0.9-r1.ebuild 937 +MD5 452037aa446c5851901acc128f1b879d ChangeLog 630 MD5 5d0c50012374761745d511ea0ff0fbb5 metadata.xml 195 +MD5 5feae118f9304790adf4f1f9dbaad1d0 files/locale.patch 1725 +MD5 97bb852c320593564b70f34bea8b6532 files/digest-emelfm2-0.0.9-r1 65 MD5 97bb852c320593564b70f34bea8b6532 files/digest-emelfm2-0.0.9 65 diff --git a/app-misc/emelfm2/emelfm2-0.0.9-r1.ebuild b/app-misc/emelfm2/emelfm2-0.0.9-r1.ebuild new file mode 100644 index 000000000000..34f3ff394ce2 --- /dev/null +++ b/app-misc/emelfm2/emelfm2-0.0.9-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/emelfm2/emelfm2-0.0.9-r1.ebuild,v 1.1 2004/10/07 05:22:19 brad Exp $ + +inherit eutils + +DESCRIPTION="A file manager that implements the popular two-pane design based on gtk+-2" +HOMEPAGE="http://dasui.prima.de/e2wiki/" +SRC_URI="http://dasui.prima.de/~tooar/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~ppc" +IUSE="nls" + +DEPEND=">=x11-libs/gtk+-2.4*" + +src_unpack() { + unpack ${A} + epatch ${FILESDIR}/locale.patch +} + +src_compile() { + local myconf + + use nls && myconf="-DENABLE_NLS" + emake PREFIX=/usr \ + CC="gcc ${CFLAGS}" \ + NLS=${myconf} || die "emake failed" +} + +src_install() { + local myconf + + use nls && myconf="-DENABLE_NLS" + dodir /usr/bin + + make PREFIX=${D}/usr \ + NLS=${myconf} \ + DOC_DIR=${D}/usr/share/doc/${PF} \ + install || die "make install failed" + prepalldocs +} diff --git a/app-misc/emelfm2/files/digest-emelfm2-0.0.9-r1 b/app-misc/emelfm2/files/digest-emelfm2-0.0.9-r1 new file mode 100644 index 000000000000..0c74953b042e --- /dev/null +++ b/app-misc/emelfm2/files/digest-emelfm2-0.0.9-r1 @@ -0,0 +1 @@ +MD5 d627839065b51ad90ded488e9d34c4a8 emelfm2-0.0.9.tar.gz 467516 diff --git a/app-misc/emelfm2/files/locale.patch b/app-misc/emelfm2/files/locale.patch new file mode 100644 index 000000000000..726b747fe192 --- /dev/null +++ b/app-misc/emelfm2/files/locale.patch @@ -0,0 +1,58 @@ +--- emelfm2-0.0.9/src/e2_main.c.orig 2004-10-07 01:16:15.378509936 -0400 ++++ emelfm2-0.0.9/src/e2_main.c 2004-10-07 01:13:45.373314192 -0400 +@@ -272,47 +272,6 @@ + } + } + +-static void check_locale () +-{ +- printd (DEBUG, "check_locale ()"); +- gchar *locale = gtk_set_locale (); +- printd (NOTICE, "current locale is '%s'", locale); +- const gchar *broken = g_getenv ("G_BROKEN_FILENAMES"); +- if (broken != NULL && g_str_equal (locale, "C")) +- { +- printf (_("Your current locale is '%s'.\n"), locale); +- printf +- ( +- _("You have set the environment variable G_BROKEN_FILENAMES. GTK+ is\n" +- "supposed to convert filenames from the system locale to UTF8 encoding.\n" +- "However, you have not set a system locale. Thus, please adjust your locale.\n") +- ); +- if (!e2_cl_options.ignore_problems) +- { +- printf +- ( +- _("(Note: There is the command line option -i/--ignore-problems, but use it\n" +- "at your own risk!)\n") +- ); +- exit (1); +- } else +- printf +- ( +- _("emelFM2 will ignore locale problems when reading filenames because\n" +- "--ignore-problems/-i has been set. This might result in segfaults and all\n" +- "kind of problems. You should really set a system locale with the\n" +- "LANG environment variable\n.") +- ); +- +- } +-#ifdef ENABLE_NLS +- printd (DEBUG, "setting locale dir to '%s'", LOCALE_DIR); +- bindtextdomain (BINNAME, LOCALE_DIR); +- textdomain (BINNAME); +-#endif +- +-} +- + //blind log handler to stop gtk warnings + static void blind_log_handler () { } + +@@ -342,7 +301,6 @@ + gtk_init (&argc, &argv); + + e2_cl_option_process (argc, argv); +- check_locale (); + + if (e2_cl_options.surpress_gtk_output) + g_log_set_handler ("Gtk", G_LOG_LEVEL_WARNING | G_LOG_FLAG_FATAL