- handle uclibc minimal exceptions when i18n/nls/gettext is not active

Package-Manager: portage-2.0.51.22-r1

4 files changed, 56 insertions, 20 deletions

diff --git a/sys-apps/eject/ChangeLog b/sys-apps/eject/ChangeLog
index f1e3b3566a8d..aefcd2b6181c 100644
--- a/sys-apps/eject/ChangeLog
+++ b/sys-apps/eject/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/eject
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/ChangeLog,v 1.32 2005/05/28 00:44:39 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/ChangeLog,v 1.33 2005/07/23 15:12:30 solar Exp $
+
+  23 Jul 2005; <solar.@gentoo.org> +files/eject-2.0.13-i18n-uclibc.patch,
+  eject-2.0.13-r2.ebuild:
+  - handle uclibc minimal exceptions when i18n/nls/gettext is not active
 
   28 May 2005; Diego Petten簷 <flameeyes@gentoo.org> eject-2.0.13.ebuild,
   eject-2.0.13-r1.ebuild, eject-2.0.13-r2.ebuild:
diff --git a/sys-apps/eject/Manifest b/sys-apps/eject/Manifest
index 259c1b02834b..3c658c7ac34d 100644
--- a/sys-apps/eject/Manifest
+++ b/sys-apps/eject/Manifest
@@ -1,31 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 d94b958bd27d0337d0557fd5d19889a8 eject-2.0.13-r2.ebuild 1544
 MD5 7b671ce7d61247268219763704e3bbc5 eject-2.0.13-r1.ebuild 1095
 MD5 f478cb84812897f1eab491fd5c59d79d eject-2.0.13.ebuild 1208
-MD5 4fa18c1e7791b74eabfdf73534ef6da0 eject-2.0.13-r2.ebuild 1503
-MD5 2a0fab1be29c9e4691927496fcf4ea78 ChangeLog 4959
-MD5 9ce8b7632acf54813ee4336d89293b53 files/eject-2.0.13-prefix-defaultdevice-with-dev.patch 488
-MD5 c72d5d5d53d6390c871f8ee901770c7b files/eject-2.0.13-finddev.patch 1978
+MD5 e7637d6414c2c3320600cf8724eadaa7 ChangeLog 5129
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 c7f02cf0dea0ee27a338220804de25ab files/eject-2.0.13-header.patch 848
-MD5 a8f6893c482c2b74b0e799b6cd81e867 files/digest-eject-2.0.13-r2 63
-MD5 6511dfbfe2029a7e582f958af0d41ca7 files/eject-2.0.13-xregcomp.patch 649
-MD5 4c62f46d6d72dd079fd677db6ae57059 files/eject-2.0.13-xmalloc.patch 654
-MD5 0109237261a5ce6357ddcd041259e61e files/eject-2.0.13-toggle.patch 2838
+MD5 9ce8b7632acf54813ee4336d89293b53 files/eject-2.0.13-prefix-defaultdevice-with-dev.patch 488
+MD5 ba37ff5a9223af8de446a18e62dbe19d files/eject-2.0.13-no-umount.patch 2496
+MD5 31688554edc80b2d6cf1ae427a6533f7 files/eject-2.0.13-fstab-error.patch 956
 MD5 c5613bc078215c657678c57e387731ac files/eject-2.0.13-close-check.patch 1405
+MD5 b92a6e4f192ffefdc4ad665fba3ed4a7 files/eject-2.0.13-i18n-uclibc.patch 645
+MD5 f9dc8e0281dbe9fd3f4db87d5ecfc69e files/eject-2.0.13-kernel25-support.patch 458
+MD5 4c62f46d6d72dd079fd677db6ae57059 files/eject-2.0.13-xmalloc.patch 654
+MD5 c72d5d5d53d6390c871f8ee901770c7b files/eject-2.0.13-finddev.patch 1978
 MD5 9741dfe0732a1a137742fc5302acb007 files/eject-2.0.13-pumount.patch 896
+MD5 a8f6893c482c2b74b0e799b6cd81e867 files/digest-eject-2.0.13 63
 MD5 3f842146dbaced2c09bf45e5cf14b8c8 files/eject-2.0.13-autoclose.patch 699
-MD5 f9dc8e0281dbe9fd3f4db87d5ecfc69e files/eject-2.0.13-kernel25-support.patch 458
-MD5 a8f6893c482c2b74b0e799b6cd81e867 files/digest-eject-2.0.13-r1 63
+MD5 0109237261a5ce6357ddcd041259e61e files/eject-2.0.13-toggle.patch 2838
+MD5 6511dfbfe2029a7e582f958af0d41ca7 files/eject-2.0.13-xregcomp.patch 649
 MD5 79bfd06f7b36f98ebfe676e8e37e4955 files/eject-2.0.13-use-mountpoints.patch 1100
-MD5 a8f6893c482c2b74b0e799b6cd81e867 files/digest-eject-2.0.13 63
-MD5 31688554edc80b2d6cf1ae427a6533f7 files/eject-2.0.13-fstab-error.patch 956
-MD5 ba37ff5a9223af8de446a18e62dbe19d files/eject-2.0.13-no-umount.patch 2496
+MD5 a8f6893c482c2b74b0e799b6cd81e867 files/digest-eject-2.0.13-r1 63
+MD5 a8f6893c482c2b74b0e799b6cd81e867 files/digest-eject-2.0.13-r2 63
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCxHFJgIKl8Uu19MoRAsM0AJsFVVdqTwCiLEkLpeN8OmyJ2gRZDQCeI9Q4
-unRgr5WBlGFKqLz6ezpd/6c=
-=AZga
+iQCVAwUBQuJeTJ4WFLgrx1GWAQIhQQP7BizNLMp/hZR4FIwuJlgnn15custQe1Wg
+VaiCT+9aOsW2CwK4rtEGgMj+1IPCckOEO6UssBSpAdL3SlFMTdxvELdQwurcrErU
+m5jqo6HMOktx0JZ8SZO+4ZUam154Kiptu7hQjg6mMrkrk3Lg9kTnLakAnD/tohjI
+1DNjA/mnrsE=
+=v37p
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/eject/eject-2.0.13-r2.ebuild b/sys-apps/eject/eject-2.0.13-r2.ebuild
index 46d3a087e39e..1501a47b882c 100644
--- a/sys-apps/eject/eject-2.0.13-r2.ebuild
+++ b/sys-apps/eject/eject-2.0.13-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.0.13-r2.ebuild,v 1.3 2005/05/28 00:44:39 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/eject/eject-2.0.13-r2.ebuild,v 1.4 2005/07/23 15:12:30 solar Exp $
 
 inherit eutils
 
@@ -33,6 +33,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-toggle.patch
 	epatch "${FILESDIR}"/${P}-fstab-error.patch
 	epatch "${FILESDIR}"/${P}-pumount.patch
+	epatch "${FILESDIR}"/${P}-i18n-uclibc.patch
 
 	sed -i '/^AM_CFLAGS/s:-O3::' Makefile.in
 	if ! use nls ; then
diff --git a/sys-apps/eject/files/eject-2.0.13-i18n-uclibc.patch b/sys-apps/eject/files/eject-2.0.13-i18n-uclibc.patch
new file mode 100644
index 000000000000..6e7348b101ea
--- /dev/null
+++ b/sys-apps/eject/files/eject-2.0.13-i18n-uclibc.patch
@@ -0,0 +1,28 @@
+--- i18n.h.orig	2005-07-23 10:40:55.000000000 -0400
++++ i18n.h	2005-07-23 10:41:00.000000000 -0400
+@@ -7,9 +7,11 @@
+     程式國際化設計:  謝崑中
+ */
+ 
++#include <features.h>
+ #ifndef __i18n__
+-   #define __i18n__
+    #define PKG "eject"
++ # ifndef __UCLIBC__
++   #define __i18n__
+    #define LOCALEDIR "/usr/share/locale"
+ 
+    #include <locale.h>
+@@ -17,7 +19,11 @@
+    #define _(str) gettext (str)
+    #define N_(str) (str)
+    #define I18NCODE setlocale(LC_ALL,""); textdomain(PKG); bindtextdomain(PKG,LOCALEDIR);
+-
++ #else
++   #define _(str) (str)
++   #define N_(str) (str)
++   #define I18NCODE
++ #endif
+    void i18n_init (void);
+ #endif
+