Merge branch 'master' of git@github.com:sjnewbury/multilib-overlay

13 files changed, 1002 insertions, 11 deletions

diff --git a/eclass/multilib-native.eclass b/eclass/multilib-native.eclass
index f7babef0c..2b9fd2c9e 100644
--- a/eclass/multilib-native.eclass
+++ b/eclass/multilib-native.eclass
@@ -296,8 +296,9 @@ multilib-native_src_generic_sub() {
 		CMAKE_BUILD_DIR="${WORKDIR}/${PN}_build_${ABI}"
 		KDE_S="${S}"
 
-		[[ -d "${WORKDIR}/${PN}_build_${ABI}" ]] && \
-			cd ${WORKDIR}/${PN}_build_${ABI}
+		#[[ -d "${WORKDIR}/${PN}_build_${ABI}" ]] && \
+		#	cd ${WORKDIR}/${PN}_build_${ABI}
+		cd ${S}
 
 		export PKG_CONFIG_PATH="/usr/$(get_libdir)/pkgconfig"
 	fi
diff --git a/sys-devel/gettext/ChangeLog b/sys-devel/gettext/ChangeLog
new file mode 100644
index 000000000..7b0f5637f
--- /dev/null
+++ b/sys-devel/gettext/ChangeLog
@@ -0,0 +1,604 @@
+# ChangeLog for sys-devel/gettext
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.168 2008/11/28 22:37:38 ulm Exp $
+
+  28 Nov 2008; Ulrich Mueller <ulm@gentoo.org>
+  +files/gettext-0.17-gnuinfo.patch, gettext-0.17.ebuild:
+  Fix GNU Info file, bug 249167.
+
+  17 Oct 2008; Markus Meier <maekke@gentoo.org> metadata.xml:
+  openmp USE-flag is global now
+
+  26 Sep 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/gettext-0.17-open-args.patch, gettext-0.17.ebuild:
+  Fix bug #232081, gcc-4.3 compat. Thanks to Magnus Granberg <zorry@ume.nu>.
+
+  02 Aug 2008; Panagiotis Christopoulos <pchrist@gentoo.org> metadata.xml:
+  Update metadata.xml to include USE flag descriptions. Entries taken from
+  profiles/use.local.desc. GLEP 56
+
+  02 Jul 2008; Javier Villavicencio <the_paya@gentoo.org>
+  gettext-0.17.ebuild:
+  Fix acl dependency, fixes bug #204746.
+
+  14 Jan 2008; Mike Frysinger <vapier@gentoo.org> gettext-0.17.ebuild:
+  Flip back to internal libcroco to avoid glib/gettext circular deps #204851
+  by Robin Johnson. Make sure we control all acl aspects (headers and libs) by
+  forcing autoconf tests until gnulib/acl gets updated upstream #205568 by
+  Robin Johnson.
+
+  07 Jan 2008; Mike Frysinger <vapier@gentoo.org> gettext-0.17.ebuild:
+  Pull in ncurses/libcroco/libxml2 which we actually use, force glib to
+  bundled version, and add support for USE="acl openmp".
+
+  17 Dec 2007; Jeroen Roovers <jer@gentoo.org> gettext-0.17.ebuild:
+  Stable for HPPA (bug #202168).
+
+  16 Dec 2007; Markus Rothe <corsair@gentoo.org> gettext-0.17.ebuild:
+  Stable on ppc64; bug #202168
+
+  16 Dec 2007; Raúl Porcel <armin76@gentoo.org> gettext-0.17.ebuild:
+  alpha/ia64/sparc stable wrt #202168
+
+  15 Dec 2007; Samuli Suominen <drac@gentoo.org> gettext-0.17.ebuild:
+  amd64 stable wrt #202168
+
+  14 Dec 2007; Dawid Węgliński <cla@gentoo.org> gettext-0.17.ebuild:
+  Stable on x86 (bug #202168)
+
+  14 Dec 2007; nixnut <nixnut@gentoo.org> gettext-0.17.ebuild:
+  Stable on ppc wrt bug 202168
+
+*gettext-0.17 (10 Nov 2007)
+
+  10 Nov 2007; Mike Frysinger <vapier@gentoo.org> +gettext-0.17.ebuild:
+  Version bump.
+
+  06 Oct 2007; Ulrich Mueller <ulm@gentoo.org> -files/50po-mode-gentoo.el,
+  -gettext-0.16.1.ebuild:
+  Remove old.
+
+  06 Oct 2007; Tom Gall <tgall@gentoo.org> gettext-0.16.1-r1.ebuild:
+  stable on ppc64 bug #189031
+
+  31 Aug 2007; Christoph Mende <angelos@gentoo.org>
+  gettext-0.16.1-r1.ebuild:
+  Stable on amd64 wrt bug #189031
+
+  24 Aug 2007; Raúl Porcel <armin76@gentoo.org> gettext-0.16.1-r1.ebuild:
+  alpha/ia64 stable wrt #189031
+
+  23 Aug 2007; Joshua Kinard <kumba@gentoo.org> gettext-0.16.1-r1.ebuild:
+  Stable on mips, per #189031.
+
+  19 Aug 2007; Jeroen Roovers <jer@gentoo.org> gettext-0.16.1-r1.ebuild:
+  Stable for HPPA (bug #189031).
+
+  18 Aug 2007; nixnut <nixnut@gentoo.org> gettext-0.16.1-r1.ebuild:
+  Stable on ppc wrt bug 189031
+
+  16 Aug 2007; Christian Faulhammer <opfer@gentoo.org>
+  gettext-0.16.1-r1.ebuild:
+  stable x86, bug 189031
+
+  15 Aug 2007; Gustavo Zacarias <gustavoz@gentoo.org>
+  gettext-0.16.1-r1.ebuild:
+  Stable on sparc wrt #189031
+
+  07 Jul 2007; Ulrich Mueller <ulm@gentoo.org> gettext-0.16.1-r1.ebuild:
+  Fix PDEPEND.
+
+*gettext-0.16.1-r1 (06 Jul 2007)
+
+  06 Jul 2007; Ulrich Mueller <ulm@gentoo.org> +gettext-0.16.1-r1.ebuild:
+  Split off Emacs support to package app-emacs/po-mode, bug #149431.
+
+  16 Mar 2007; Jose Luis Rivero <yoswink@gentoo.org> gettext-0.16.1.ebuild:
+  Stable on alpha wrt bug #163178
+
+  26 Feb 2007; Mike Frysinger <vapier@gentoo.org> gettext-0.16.1.ebuild:
+  Use preserve_old_lib rather than screwing with $ROOT ourselves #168046.
+
+  21 Feb 2007; Alexander H. Færøy <eroyf@gentoo.org>
+  gettext-0.16.1.ebuild:
+  Stable on MIPS; bug #163178
+
+  06 Feb 2007; Daniel Gryniewicz <dang@gentoo.org> gettext-0.16.1.ebuild:
+  Marked stable on amd64 for bug #163178
+
+  31 Jan 2007; Tobias Scherbaum <dertobi123@gentoo.org>
+  gettext-0.16.1.ebuild:
+  Stable on ppc wrt bug #163178.
+
+  23 Jan 2007; Fabian Groffen <grobian@gentoo.org> gettext-0.12.1-r2.ebuild,
+  gettext-0.14.1-r1.ebuild, gettext-0.14.2.ebuild, gettext-0.14.4.ebuild,
+  gettext-0.14.5.ebuild, gettext-0.14.6.ebuild, gettext-0.15.ebuild,
+  gettext-0.15-r1.ebuild, gettext-0.16.1.ebuild:
+  Dropped ppc-macos keyword, see you in prefix
+
+  23 Jan 2007; Jeroen Roovers <jer@gentoo.org> gettext-0.16.1.ebuild:
+  Stable for HPPA (bug #163178).
+
+  22 Jan 2007; Gustavo Zacarias <gustavoz@gentoo.org> gettext-0.16.1.ebuild:
+  Stable on sparc wrt #163178
+
+  22 Jan 2007; Markus Rothe <corsair@gentoo.org> gettext-0.16.1.ebuild:
+  Stable on ppc64; bug #163178
+
+  22 Jan 2007; Raúl Porcel <armin76@gentoo.org> gettext-0.16.1.ebuild:
+  x86 stable wrt bug 163178
+
+  05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  gettext-0.12.1-r2.ebuild, gettext-0.14.1-r1.ebuild:
+  Remove gnuconfig_update usage, leave it to econf.
+
+*gettext-0.16.1 (30 Dec 2006)
+
+  30 Dec 2006; Mike Frysinger <vapier@gentoo.org> +gettext-0.16.1.ebuild:
+  Version bump #158820 by Guido Flohr.
+
+  28 Dec 2006; Mike Frysinger <vapier@gentoo.org> gettext-0.15-r1.ebuild:
+  Fixes from Chris Mayo to cleanup doc handling #154907.
+
+  18 Oct 2006; Roy Marples <uberlord@gentoo.org> gettext-0.15-r1.ebuild:
+  Added ~sparc-fbsd keyword.
+
+  14 Oct 2006; Aron Griffis <agriffis@gentoo.org> gettext-0.15.ebuild:
+  Mark 0.15 stable on ia64. #148798
+
+*gettext-0.15-r1 (09 Oct 2006)
+
+  09 Oct 2006; Emanuele Giaquinta <exg@gentoo.org>
+  +files/gettext-0.15-expat-no-dlopen.patch, +gettext-0.15-r1.ebuild:
+  Add support for expat-2 to xgettext by linking it at build time rather than
+  at runtime using dlopen, bug #146211.
+
+  30 Sep 2006; Fabian Groffen <grobian@gentoo.org> gettext-0.15.ebuild:
+  Backport fix from prefix. On Darwin don't do library moving, it breaks the
+  system.
+
+  30 Sep 2006; <ticho@gentoo.org> gettext-0.15.ebuild:
+  Stable on x86, bug #148798.
+
+  28 Sep 2006; Fernando J. Pereda <ferdy@gentoo.org> gettext-0.15.ebuild:
+  Stable on alpha as per bug #148798
+
+  27 Sep 2006; Stephanie Lockwood-Childs <wormo@gentoo.org>
+  gettext-0.15.ebuild:
+  stable on ppc (Bug #148798)
+
+  26 Sep 2006; Gustavo Zacarias <gustavoz@gentoo.org> gettext-0.15.ebuild:
+  Stable on sparc wrt #148798
+
+  26 Sep 2006; Gustavo Zacarias <gustavoz@gentoo.org> gettext-0.15.ebuild:
+  Stable on hppa wrt #148798
+
+  24 Sep 2006; <blubb@gentoo.org> gettext-0.15.ebuild:
+  stable on amd64
+
+  23 Sep 2006; Fabian Groffen <grobian@gentoo.org> gettext-0.15.ebuild:
+  Marked ppc-macos stable (bug #148798)
+
+  23 Sep 2006; Markus Rothe <corsair@gentoo.org> gettext-0.15.ebuild:
+  Stable on ppc64; bug #148798
+
+  13 Sep 2006; Mike Frysinger <vapier@gentoo.org> gettext-0.15.ebuild:
+  Use --without-emacs as configure has a proper check now #147258 by Charlie
+  Shepherd.
+
+  04 Sep 2006; Joshua Kinard <kumba@gentoo.org> gettext-0.14.5.ebuild:
+  Marked stable on mips.
+
+  02 Aug 2006; Diego Pettenò <flameeyes@gentoo.org> gettext-0.15.ebuild:
+  Make the ldscript use the versioned library name.
+
+  01 Aug 2006; Diego Pettenò <flameeyes@gentoo.org> gettext-0.15.ebuild:
+  Fix for Gentoo/FreeBSD: copy the old library even when it's in /lib rather
+  than /usr/lib, and move the new one in /lib.
+
+  31 Jul 2006; Fabian Groffen <grobian@gentoo.org> gettext-0.15.ebuild:
+  Remove OSX hack, as it's not needed anymore (bug #142232)
+
+  31 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> gettext-0.15.ebuild:
+  Preserve libintl library version 7, or it will break Gentoo/FreeBSD pretty
+  badly.
+
+*gettext-0.15 (31 Jul 2006)
+
+  31 Jul 2006; Mike Frysinger <vapier@gentoo.org> +gettext-0.15.ebuild:
+  Version bump #128557 by Samuli Suominen.
+
+  22 Jul 2006; Bryan Østergaard <kloeri@gentoo.org> gettext-0.14.5.ebuild:
+  Stable on alpha.
+
+  22 Jul 2006; Tobias Scherbaum <dertobi123@gentoo.org>
+  gettext-0.14.5.ebuild:
+  ppc stable, bug #140729
+
+  21 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> gettext-0.14.6.ebuild:
+  Move libintl.so in /lib(64), as /bin/bash is linked to it on Gentoo/FreeBSD.
+
+  21 Jul 2006; Luis Medinas <metalgod@gentoo.org> gettext-0.14.5.ebuild:
+  Stable on amd64. See bug #140729.
+
+  20 Jul 2006; Markus Rothe <corsair@gentoo.org> gettext-0.14.5.ebuild:
+  Stable on ppc64; bug #140729
+
+  20 Jul 2006; Gustavo Zacarias <gustavoz@gentoo.org> gettext-0.14.5.ebuild:
+  Stable on sparc wrt #140729
+
+  20 Jul 2006; Joshua Jackson <tsunam@gentoo.org> gettext-0.14.5.ebuild:
+  Stable x86; bug #140729
+
+  17 Jul 2006; Fabian Groffen <grobian@gentoo.org> gettext-0.14.5.ebuild:
+  Marked ppc-macos (bug #140729)
+
+*gettext-0.14.6 (17 Jul 2006)
+
+  17 Jul 2006; Mike Frysinger <vapier@gentoo.org> +gettext-0.14.6.ebuild:
+  Version bump.
+
+  27 Apr 2006; Alec Warner <antarus@gentoo.org>
+  files/digest-gettext-0.12.1-r2, files/digest-gettext-0.14.1-r1,
+  files/digest-gettext-0.14.2, files/digest-gettext-0.14.4, Manifest:
+  Fixing SHA256 digest, pass four
+
+  13 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> gettext-0.14.5.ebuild:
+  Change dependency to virtual/libiconv.
+
+  30 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> gettext-0.14.5.ebuild:
+  Add ~x86-fbsd keyword.
+
+  09 Mar 2006; Mike Frysinger <vapier@gentoo.org> gettext-0.14.1-r1.ebuild,
+  gettext-0.14.2.ebuild, gettext-0.14.4.ebuild, gettext-0.14.5.ebuild:
+  Use revdep-rebuild --library instead of revdep-rebuild --soname #125506 by
+  Carsten Lohrke.
+
+  06 Mar 2006; Matthew Kennedy <mkennedy@gentoo.org>
+  files/50po-mode-gentoo.el:
+  Enchanced 50po-mode-gentoo.el to support the detection of coding system via
+  PO specific protocols (as described in the manual); Resolves Bug #122417.
+
+  01 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> gettext-0.14.5.ebuild:
+  Remove charset.alias always, not just in ppc-macos case.
+
+*gettext-0.14.5 (01 Sep 2005)
+
+  01 Sep 2005; Mike Frysinger <vapier@gentoo.org> +gettext-0.14.5.ebuild:
+  Version bump.
+
+  29 Jun 2005; Joshua Kinard <kumba@gentoo.org> gettext-0.14.4.ebuild:
+  Marked stable on mips.
+
+  18 Jun 2005; Markus Rothe <corsair@gentoo.org> gettext-0.14.4.ebuild:
+  Stable on ppc64
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> gettext-0.14.4.ebuild:
+  Stable on ppc.
+
+  16 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> gettext-0.14.4.ebuild:
+  Stable on sparc
+
+  12 Jun 2005; Lina Pezzella <j4rg0n@gentoo.org> gettext-0.14.4.ebuild:
+  Stable ppc-macos
+
+  25 Apr 2005; Bryan Østergaard <kloeri@gentoo.org>
+  gettext-0.14.1-r1.ebuild:
+  Stable on alpha.
+
+*gettext-0.14.1-r1 (20 Apr 2005)
+
+  20 Apr 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/gettext-0.14.1-tempfile.patch, -gettext-0.14.1.ebuild,
+  +gettext-0.14.1-r1.ebuild:
+  Add tempfile patch to resolve #85766.
+
+*gettext-0.14.4 (19 Apr 2005)
+
+  19 Apr 2005; Mike Frysinger <vapier@gentoo.org> +gettext-0.14.4.ebuild:
+  Version bump.
+
+  12 Apr 2005; Mamoru KOMACHI <usata@gentoo.org> +files/50po-mode-gentoo.el,
+  gettext-0.14.2.ebuild:
+  Register po-mode if emacs USE is set; bug #74458.
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org> gettext-0.14.1.ebuild:
+  Stable on ppc64
+
+  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> gettext-0.14.1.ebuild:
+  Stable on ppc.
+
+  03 Apr 2005; Lina Pezzella <j4rg0n@gentoo.org> gettext-0.14.1.ebuild,
+  gettext-0.14.2.ebuild:
+  Fix for Bug #70448
+
+  26 Mar 2005; Lina Pezzella <j4rg0n@gentoo.org> gettext-0.14.1.ebuild:
+  Stable ppc-macos
+
+  15 Mar 2005; Christian Birchinger <joker@gentoo.org> gettext-0.14.1.ebuild:
+  Added sparc stable keyword
+
+  14 Mar 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/gettext-0.14.2-fix-race.patch, gettext-0.14.2.ebuild:
+  Fix race, bug #85054.
+
+*gettext-0.14.2 (13 Mar 2005)
+
+  13 Mar 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/gettext-0.14.2-no-java-tests.patch, +gettext-0.14.2.ebuild:
+  Version bump.
+
+  19 Feb 2005; Kito <kito@gentoo.org> gettext-0.14.1.ebuild:
+  add conditional to save existing libintl. ~ppc-macos keyword
+
+  06 Feb 2005; Mike Frysinger <vapier@gentoo.org> gettext-0.14.1.ebuild:
+  Disable sandbox when running tests #70358.
+
+  03 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  29 Dec 2004; Lina Pezzella <j4rg0n@gentoo.org> gettext-0.14.1.ebuild:
+  Removed ppc-macos keyword until conditional check for libintl.so.2 is made
+  OSX-compatible.
+
+  29 Dec 2004; Lina Pezzella <j4rg0n@gentoo.org> gettext-0.12.1-r2.ebuild:
+  Let gettext install libintl.h and friends; bug #64779
+
+  13 Dec 2004; Mamoru KOMACHI <usata@gentoo.org> gettext-0.12.1-r2.ebuild:
+  Disabled elibtoolize on ppc-macos; bug #72843.
+
+  08 Dec 2004; Kito <kito@gentoo.org> gettext-0.14.1.ebuild:
+  stable on ppc-macos
+
+  11 Nov 2004; Mamoru KOMACHI <usata@gentoo.org> gettext-0.14.1.ebuild:
+  ppc-macos doesn't like elibtoolize --reverse-deps
+
+  04 Nov 2004; Mike Frysinger <vapier@gentoo.org> gettext-0.14.1.ebuild:
+  Move back to unstable #66449.
+
+  04 Nov 2004; Travis Tilley <lv@gentoo.org> gettext-0.14.1.ebuild:
+  re-keywording as stable on amd64 now that bug #66449 has been fixed.
+  re-fixes bug 68578
+
+  31 Oct 2004; Mike Frysinger <vapier@gentoo.org> gettext-0.12.1-r2.ebuild,
+  gettext-0.14.1.ebuild:
+  Clean up the install phase and try to address linking issues #66449.
+
+  16 Oct 2004; Hardave Riar <hardave@gentoo.org> gettext-0.12.1-r2.ebuild:
+  Stable on mips, bug #66355.
+
+  09 Oct 2004; Tom Gall <tgall@gentoo.org> gettext-0.12.1-r2.ebuild:
+  stable on ppc64, bug #66355
+
+  09 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> gettext-0.12.1-r2.ebuild:
+  Stable on alpha, bug 66355.
+
+  08 Oct 2004; Guy Martin <gmsoft@gentoo.org> gettext-0.12.1-r2.ebuild:
+  Marked stable on hppa.
+
+  08 Oct 2004; <SeJo@gentoo.org> gettext-0.12.1-r2.ebuild:
+  stable ppc gsla bug: 66355
+
+  07 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gettext-0.12.1-r2.ebuild:
+  Stable sparc.
+
+  07 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gettext-0.12.1-r2.ebuild:
+  Stable on amd64 and x86 per security bug #66355.
+
+*gettext-0.12.1-r2 (07 Oct 2004)
+
+  07 Oct 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/gettext-0.12.1-tempfile.patch, +gettext-0.12.1-r2.ebuild:
+  Version bump for security #66355.
+
+*gettext-0.14.1 (05 Oct 2004)
+
+  05 Oct 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/gettext-0.14.1-without_java.patch, +gettext-0.14.1.ebuild:
+  Version bump #47788 and security #66355.
+
+  03 Oct 2004; Mike Frysinger <vapier@gentoo.org> gettext-0.11.5-r1.ebuild,
+  gettext-0.11.5.ebuild, gettext-0.12.1-r1.ebuild, gettext-0.12.1.ebuild:
+  Have the ebuilds install the GNU gmsgfmt symlink #43435.
+
+  31 Jul 2004; <solar@gentoo.org> gettext-0.12.1-r1.ebuild,
+  gettext-0.12.1.ebuild:
+  gnuconfig update needed for atleast uclibc
+
+  31 Jul 2004; Tom Gall <tgall@gentoo.org> gettext-0.12.1-r1:
+  stable on ppc64, bug #57114
+
+  25 Jul 2004; Lina Pezzella <burgundy@gentoo.org> :
+  gettext-0.12.1-r1:
+  Rewrote test for nls use flag.  Forced --enable-nls on macos as per bug #57868.
+
+  23 Jul 2004; Mamoru KOMACHI <usata@gentoo.org> gettext-0.12.1-r1.ebuild:
+  Stable on macos.
+
+  20 Jul 2004; Mamoru KOMACHI <usata@gentoo.org> gettext-0.12.1-r1.ebuild:
+  Fixed file collision on macos
+
+  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gettext-0.12.1-r1.ebuild, gettext-0.12.1.ebuild:
+  virtual/glibc -> virtual/libc
+
+  24 Jun 2004; Aron Griffis <agriffis@gentoo.org> gettext-0.12.1-r1.ebuild,
+  gettext-0.12.1.ebuild:
+  QA - fix use invocation
+
+  11 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> gettext-0.12.1-r1.ebuild:
+  Stable on alpha.
+
+  02 Jun 2004; Seemant Kulleen <seemant@gentoo.org> gettext-0.12.1-r1.ebuild,
+  gettext-0.12.1.ebuild:
+  Remove the emacs site-lisp stuff, if emacs is not in USE. Closes bug #47854 by
+  Andrew Kirilenko <icedank@gmx.net>. Eric Brown <bigwhitecow@hotmail.com> did
+  the actual patch to the gettext ebuild.
+
+  02 Jun 2004; Travis Tilley <lv@gentoo.org> gettext-0.12.1-r1.ebuild:
+  stable on amd64
+
+  07 Apr 2004; Travis Tilley <lv@gentoo.org> gettext-0.12.1-r1.ebuild:
+  added ~amd64 keyword
+
+  02 Mar 2004; Brian Jackson <iggy@gentoo.org> gettext-0.12.1-r1.ebuild:
+  s390 keywords
+
+  08 Feb 2004; Brad House <brad_mssw@gentoo.org> gettext-0.11.5-r1.ebuild:
+  ppc64 fixes
+
+  08 Feb 2004; Martin Schlemmer <azarah@gentoo.org> gettext-0.12.1-r1.ebuild:
+  Fix it to actually do as advertised.
+
+*gettext-0.12.1-r1 (08 Feb 2004)
+
+  08 Feb 2004; Martin Schlemmer <azarah@gentoo.org> gettext-0.12.1-r1.ebuild:
+  Build with --without-included-gettext (will use that of glibc), as we need
+  preloadable_libintl.so for new help2man, bug #40162.
+
+  16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> gettext-0.12.1.ebuild:
+  set ppc in keywords
+
+  12 Jan 2004; Guy Martin <gmsoft@gentoo.org> gettext-0.12.1.ebuild :
+  Marked stable on hppa.
+
+  09 Jan 2004; Aron Griffis <agriffis@gentoo.org> gettext-0.12.1.ebuild:
+  stable on alpha
+
+  08 Jan 2004; <gustavoz@gentoo.org> gettext-0.12.1.ebuild:
+  upgrade fix for sparc with java present
+
+  07 Jan 2004; Jason Wever <weeve@gentoo.org> gettext-0.12.1.ebuild:
+  Marked stable on sparc, resolves #35970 for sparc.
+
+  28 Dec 2003; Joshua Kinard <kumba@gentoo.org> gettext-0.12.1.ebuild:
+  Move to mips stable (~mips -> mips)
+
+  16 Dec 2003; Marius Mauch <genone@gentoo.org> gettext-0.12.1.ebuild:
+  marking stable on x86
+
+  17 Nov 2003; Aron Griffis <agriffis@gentoo.org> gettext-0.12.1.ebuild:
+  Repair compilation on alpha when compaq-jdk/jre is installed
+
+  13 Nov 2003; Brad House <brad_mssw@gentoo.org> gettext-0.12.1.ebuild:
+  take ~amd64 flag off gettext-0.12.1. It detects
+  being installed and messes things up royally.  Once portage is patched
+  to build 32bit and 64bit libsandbox.so's, or we have a native 64bit
+
+  12 Nov 2003; Will Woods <wwoods@gentoo.org> gettext-0.11.5-r1.ebuild:
+  Marked stable for alpha
+
+  10 Nov 2003; Seemant Kulleen <seemant@gentoo.org> gettext-0.11.1.ebuild,
+  gettext-0.11.3-r1.ebuild, gettext-0.12.1.ebuild,
+  files/gettext-0.10.38-gentoo.diff:
+  Added a patch to kill the C++ checks during the configure stage, for
+  bootstrapping, closes bug #25080 by: Harald Schioeberg
+  <schioebe@net.in.tum.de>
+
+  02 Nov 2003; Aron Griffis <agriffis@gentoo.org> gettext-0.11.5-r1.ebuild:
+  Repair compilation on alpha when compaq-jdk/jre is installed
+
+  16 Sep 2003; Daniel Robbins <drobbins@gentoo> gettext-0.12.1.ebuild:
+  KEYWORDS="-*" since it needs C++ to compile and breaks bootstrap.
+  Closing bug #12699.
+
+*gettext-0.12.1 (14 Jul 2003)
+
+  14 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> gettext-0.12.1.ebuild :
+  Version bump.
+
+*gettext-0.12 (13 Jul 2003)
+
+  13 Jul 2003; Hanno Boeck <hanno@gentoo.org> gettext-0.12.ebuild:
+  Version bump.
+
+*gettext-0.11.5-r1 (24 Nov 2002)
+
+  17 Sep 2003; Jon Portnoy <avenj@gentoo.org> gettext-0.11.5-r1.ebuild :
+  ia64 keywords.
+
+  01 Jul 2003; Todd Sunderlin <todd@gentoo.org> gettext-0.11.5-r1.ebuild:
+  set stable on sparc
+
+  19 May 2003; <root@gentoo.org> gettext-0.11.5-r1.ebuild:
+  Added ~mips to KEYWORDS
+
+  18 Feb 2003; Zach Welch <zwelch@gentoo.org> gettext-0.11.5-r1.ebuild : 
+  Added arm to keywords.
+
+  07 Feb 2003; Guy Martin <gmsoft@gentoo.org> gettext-0.11.5-r1.ebuild : 
+  Added hppa to keywords.
+
+*gettext-0.11.1  (12 Dec 2002)
+
+  12 Dec 2002 ; Jan Seidel <tuxus@gentoo.org> :
+  Added mips to keywords.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*gettext-0.11.5-r1 (24 Nov 2002)
+
+  24 Nov 2002; L. Boshell <leonardop@gentoo.org> : Don't delete the entire
+  ${D}/usr/lib directory, only the files that could be problematic (i.e.
+  *.{a,so}. Added IUSE var. Use mirror://gnu for SRC_URI.
+  
+  11 Sep 2002; Martin Schlemmer <azarah@gentoo.org> gettext-0.11.1.ebuild :
+
+  Make sure that no headers is installed.  Seems like this happened in
+  very rare instances, bug #7682.
+
+*gettext-0.11.5 (16 Aug 2002)
+
+  31 Mar 2003; Jan Seidel <tuxus@gentoo.org> gettext-0.11.5.ebuild :
+  Added mips to KEYWORDS
+
+  16 Aug 2002; Seemant Kulleen <seemant@gentoo.org> gettext-0.11.5.ebuild
+  files/digest-gettext-0.11.5 :
+
+  Version bump.
+
+*gettext-0.11.3-r1 (3 Aug 2002)
+
+  3 Aug 2002; Martin Schlemmer <azarah@gentoo.org> gettext-0.11.3-r1.ebuild :
+
+  Remove the installed header files, as these overwrite those that comes with
+  glibc, and then breaks things.
+
+*gettext-0.11.3 (21 Jul 2002)
+
+  21 Jul 2002; Seemant Kulleen <seemant@gentoo.org> gettext-0.11.3.ebuild :
+  files/digest-gettext-0.11.3 :
+
+  Version bump.
+
+  17 Apr 2002; Seemant Kulleen <seemant@gentoo.org> gettext-0.11.1-r1.ebuild :
+
+  Vitaly reports that glibc doesn't have libs, but contains the functioality
+  of the gettext libs.  this ebuild is unnecessary.
+
+*gettext-0.11.1-r1 (16 Apr 2002)
+
+  16 Apr 2002; Seemant Kulleen <seemant@gentoo.org> gettext-0.11.1-r1.ebuild
+  files/digest-gettext-0.11.1-r1 :
+
+  Since glibc does not seem to be providing the header files and such, I have
+  enabled gettext to install them instead.  Hopefully this solves the
+  intermittent php emerge bug.
+
+*gettext-0.11.1
+
+  27 Mar 2002; Seemant Kulleen <seemant@gentoo.org> gettext-0.11.1.ebuild :
+
+  Version bump -- copied old ebuild to new name.
+
+*gettext-0.10.40 (1 Feb 2002)
+
+  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  
+  Added initial ChangeLog which should be updated whenever the package is
+  updated in any way. This changelog is targetted to users. This means that the
+  comments should well explained and written in clean English. The details about
+  writing correct changelogs are explained in the skel.ChangeLog file which you
+  can find in the root directory of the portage repository.
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
new file mode 100644
index 000000000..77d27df3f
--- /dev/null
+++ b/sys-devel/gettext/Manifest
@@ -0,0 +1,9 @@
+AUX gettext-0.14.1-lib-path-tests.patch 707 RMD160 4ec25fa507f8f58a361991237f1b32ad52caff92 SHA1 e70dcbe2a964530ae27bfdc56e995538b8d5e5ad SHA256 c9681e9dc9f04ffb041e5fa6dac886d529231ddb1b73688157d69c3277b96097
+AUX gettext-0.14.2-fix-race.patch 372 RMD160 133c369283a0cc8ab2a9ab4423703aabcffdd282 SHA1 c8e41675adc04647daae48477c1116a71544d09c SHA256 40495c22d86688d1862742ef11a8c9dc5ffddb4e91070d365e6b9639c105c298
+AUX gettext-0.15-expat-no-dlopen.patch 585 RMD160 7e41b0b5b1f9a8eb220a445fde835c3a7a3f3ade SHA1 941da91b9e83eb137a222546e9d83777926ed46f SHA256 dc5d9adff87b786ec753b1251c135355daeb185ab275ee40d165031e56c5f539
+AUX gettext-0.17-gnuinfo.patch 634 RMD160 09ee57c6b9426bf0781fcd424a00b0ad389b7d89 SHA1 b0ad8cfe31752db56d8eaa82f2c55e6a81994677 SHA256 f38fb566eb1398a46ed93994d6576cd98d025d02e2ecde1f778d26956fe098a1
+AUX gettext-0.17-open-args.patch 1015 RMD160 11e344dcfa926fefe8045a08e97933722f47da31 SHA1 357ebe671577c4a78b2abee5228866e01dd804f8 SHA256 6409b1adbddbdb96d682ddb973e54f37d5e253b5b226e74b50b8d0874b553638
+DIST gettext-0.17.tar.gz 11640890 RMD160 36df9d4ad2848ec26729781e0d7e25b419e7d261 SHA1 c51803d9f745f6ace36bd09c0486d5735ce399cf SHA256 209638bb8e162f22c281145a34e220c66f1f6e9ff5e4c50c6f2ef2ded59537ba
+EBUILD gettext-0.17.ebuild 4072 RMD160 fcbedb3f85db75913156272374dae68fada54996 SHA1 f9eaa605a76e8e611757a87b3eaee28127f5cd37 SHA256 d7c72b8516a9fca1f47525cc2564991fbf52cf8b47d2119050cc3d35dd067612
+MISC ChangeLog 21462 RMD160 294e867ed703a9e69e8f842fb5e3c4f466d22118 SHA1 34ad73313e2c42d725a0c3d0aa64f3ad338d9e68 SHA256 ee61920dc9d0b35f6531b4fb65ca602aafdc5cb0fa9a346875b023cc45cbbfc3
+MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
diff --git a/sys-devel/gettext/files/gettext-0.14.1-lib-path-tests.patch b/sys-devel/gettext/files/gettext-0.14.1-lib-path-tests.patch
new file mode 100644
index 000000000..8a6a695eb
--- /dev/null
+++ b/sys-devel/gettext/files/gettext-0.14.1-lib-path-tests.patch
@@ -0,0 +1,17 @@
+The test env manipulates $PATH, executing binaries whose libraries 
+have not yet been installed into the standard library search path.
+Thus we manipulate LD_LIBRARY_PATH so that the current binaries 
+run with the current libraries.
+
+http://bugs.gentoo.org/show_bug.cgi?id=81628
+
+--- gettext-tools/tests/Makefile.in
++++ gettext-tools/tests/Makefile.in
+@@ -122,6 +122,7 @@
+ 
+ TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) \
+ 		    PATH=.:../src:../../gettext-runtime/src:$(top_srcdir)/../gettext-runtime/src:$$PATH \
++		    LD_LIBRARY_PATH=../lib/.libs:../src/.libs:$$LD_LIBRARY_PATH \
+ 		    GETTEXT="$(CHECKER) tstgettext" \
+ 		    NGETTEXT="$(CHECKER) tstngettext" \
+ 		    XGETTEXT="$(CHECKER) xgettext" \
diff --git a/sys-devel/gettext/files/gettext-0.14.2-fix-race.patch b/sys-devel/gettext/files/gettext-0.14.2-fix-race.patch
new file mode 100644
index 000000000..57d381d37
--- /dev/null
+++ b/sys-devel/gettext/files/gettext-0.14.2-fix-race.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/85054
+
+--- gettext-0.14.2/gettext-tools/misc/Makefile.in
++++ gettext-0.14.2/gettext-tools/misc/Makefile.in
+@@ -441,7 +441,7 @@
+ 	  shift; \
+ 	  EMACS="$(EMACS)" $(SHELL) $(elisp_comp) "$$@" || exit 1; \
+ 	else : ; fi
+-	@mv -f elc-temp $@
++	@mv -f elc-temp $@ || touch $@
+ $(am__ELCFILES): elc-stamp
+ 	@if test ! -f $@; then \
+ 	  rm -f elc-stamp; \
diff --git a/sys-devel/gettext/files/gettext-0.15-expat-no-dlopen.patch b/sys-devel/gettext/files/gettext-0.15-expat-no-dlopen.patch
new file mode 100644
index 000000000..4630d1dd9
--- /dev/null
+++ b/sys-devel/gettext/files/gettext-0.15-expat-no-dlopen.patch
@@ -0,0 +1,36 @@
+Add support for expat-2 to xgettext by linking it at build time rather than
+at runtime using dlopen
+
+http://bugs.gentoo.org/146211
+
+--- gettext-0.15/gettext-tools/configure
++++ gettext-0.15/gettext-tools/configure
+@@ -44267,19 +44266,6 @@
+ 
+ 
+ 
+-case "$host_os" in
+-  linux*)
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define DYNLOAD_LIBEXPAT 1
+-_ACEOF
+-
+-    LIBEXPAT="-ldl"
+-    LTLIBEXPAT="-ldl"
+-
+-
+-    ;;
+-  *)
+ 
+ 
+ 
+@@ -44786,8 +44772,6 @@
+ 
+ 
+ 
+-    ;;
+-esac
+ 
+  # If set to t, that means we are running in a shell under Emacs.
+  # If you have an Emacs named "t", then use the full path.
diff --git a/sys-devel/gettext/files/gettext-0.17-gnuinfo.patch b/sys-devel/gettext/files/gettext-0.17-gnuinfo.patch
new file mode 100644
index 000000000..243916636
--- /dev/null
+++ b/sys-devel/gettext/files/gettext-0.17-gnuinfo.patch
@@ -0,0 +1,16 @@
+Fix broken Info file produced by texinfo 4.11
+http://bugs.gentoo.org/249167
+
+--- gettext-0.17/gettext-tools/doc/gettext.info
++++ gettext-0.17/gettext-tools/doc/gettext.info
+@@ -1,7 +1,8 @@
++This is gettext.info, produced by makeinfo version 4.13 from
++gettext.texi.
++
+ INFO-DIR-SECTION GNU Gettext Utilities
+ START-INFO-DIR-ENTRY
+-This is gettext.info, produced by makeinfo version 4.11 from gettext.texi.
+-
+ * gettext: (gettext).                          GNU gettext utilities.
+ * autopoint: (gettext)autopoint Invocation.    Copy gettext infrastructure.
+ * envsubst: (gettext)envsubst Invocation.      Expand environment variables.
diff --git a/sys-devel/gettext/files/gettext-0.17-open-args.patch b/sys-devel/gettext/files/gettext-0.17-open-args.patch
new file mode 100644
index 000000000..330cbf614
--- /dev/null
+++ b/sys-devel/gettext/files/gettext-0.17-open-args.patch
@@ -0,0 +1,25 @@
+2007-11-07  Jim Meyering  <meyering@redhat.com>
+            Bruno Haible  <bruno@clisp.org>
+
+	* write-catalog.c (msgdomain_list_print): Fix open() call.
+
+--- gettext-tools/src/write-catalog.c	7 Oct 2007 19:35:31 -0000	1.4
++++ gettext-tools/src/write-catalog.c	7 Nov 2007 11:43:15 -0000
+@@ -1,5 +1,5 @@
+ /* GNU gettext - internationalization aids
+-   Copyright (C) 1995-1998, 2000-2006 Free Software Foundation, Inc.
++   Copyright (C) 1995-1998, 2000-2007 Free Software Foundation, Inc.
+ 
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+@@ -220,7 +220,9 @@
+       /* Open the output file.  */
+       if (!to_stdout)
+ 	{
+-	  fd = open (filename, O_WRONLY | O_CREAT);
++	  fd = open (filename, O_WRONLY | O_CREAT | O_TRUNC,
++		     /* 0666 in portable POSIX notation: */
++		     S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
+ 	  if (fd < 0)
+ 	    {
+ 	      const char *errno_description = strerror (errno);
diff --git a/sys-devel/gettext/gettext-0.17.ebuild b/sys-devel/gettext/gettext-0.17.ebuild
new file mode 100644
index 000000000..db9b16f7d
--- /dev/null
+++ b/sys-devel/gettext/gettext-0.17.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.17.ebuild,v 1.14 2008/11/28 22:37:38 ulm Exp $
+
+inherit flag-o-matic eutils multilib toolchain-funcs mono libtool java-pkg-2 multilib-native
+
+DESCRIPTION="GNU locale utilities"
+HOMEPAGE="http://www.gnu.org/software/gettext/gettext.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+IUSE="acl doc emacs nls nocxx openmp java"
+
+DEPEND="virtual/libiconv
+	dev-libs/libxml2[lib32?]
+	sys-libs/ncurses[lib32?]
+	dev-libs/expat[lib32?]
+	acl? ( kernel_linux? ( sys-apps/acl[lib32?] ) )"
+PDEPEND="emacs? ( app-emacs/po-mode )"
+RDEPEND="${DEPEND}
+	java? ( >=virtual/jdk-1.4 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epunt_cxx
+
+	epatch "${FILESDIR}"/${PN}-0.14.1-lib-path-tests.patch #81628
+	epatch "${FILESDIR}"/${PN}-0.14.2-fix-race.patch #85054
+	epatch "${FILESDIR}"/${PN}-0.15-expat-no-dlopen.patch #146211
+	epatch "${FILESDIR}"/${PN}-0.17-open-args.patch #232081
+	epatch "${FILESDIR}"/${P}-gnuinfo.patch #249167
+
+	# bundled libtool seems to be broken so skip certain rpath tests
+	# http://lists.gnu.org/archive/html/bug-libtool/2005-03/msg00070.html
+	sed -i \
+		-e '2iexit 77' \
+		autoconf-lib-link/tests/rpath-3*[ef] || die "sed tests"
+
+	# until upstream pulls a new gnulib/acl, we have to hack around it
+	if ! use acl ; then
+		eval export ac_cv_func_acl{,delete_def_file,extended_file,free,from_{mode,text},{g,s}et_{fd,file}}=no
+		export ac_cv_header_acl_libacl_h=no
+		export ac_cv_header_sys_acl_h=no
+		export ac_cv_search_acl_get_file=no
+		export gl_cv_func_working_acl_get_file=no
+		sed -i -e 's:use_acl=1:use_acl=0:' gettext-tools/configure
+	fi
+}
+
+multilib-native_src_compile_internal() {
+	local myconf=""
+	# Build with --without-included-gettext (on glibc systems)
+	if use elibc_glibc ; then
+		myconf="${myconf} --without-included-gettext $(use_enable nls)"
+	else
+		myconf="${myconf} --with-included-gettext --enable-nls"
+	fi
+	use nocxx && export CXX=$(tc-getCC)
+
+	# --without-emacs: Emacs support is now in a separate package
+	# --with-included-glib: glib depends on us so avoid circular deps
+	# --with-included-libcroco: libcroco depends on glib which ... ^^^
+	econf \
+		--docdir="/usr/share/doc/${PF}" \
+		--without-emacs \
+		$(use_enable java) \
+		--with-included-glib \
+		--with-included-libcroco \
+		$(use_enable openmp) \
+		${myconf} \
+		|| die
+	emake || die
+}
+
+multilib-native_src_install_internal() {
+	emake install DESTDIR="${D}" || die "install failed"
+	use nls || rm -r "${D}"/usr/share/locale
+	dosym msgfmt /usr/bin/gmsgfmt #43435
+	dobin gettext-tools/misc/gettextize || die "gettextize"
+
+	# remove stuff that glibc handles
+	if use elibc_glibc ; then
+		rm -f "${D}"/usr/include/libintl.h
+		rm -f "${D}"/usr/$(get_libdir)/libintl.*
+	fi
+	rm -f "${D}"/usr/share/locale/locale.alias "${D}"/usr/lib/charset.alias
+
+	if [[ ${USERLAND} == "BSD" ]] ; then
+		libname="libintl$(get_libname 8)"
+		# Move dynamic libs and creates ldscripts into /usr/lib
+		dodir /$(get_libdir)
+		mv "${D}"/usr/$(get_libdir)/${libname}* "${D}"/$(get_libdir)/
+		gen_usr_ldscript ${libname}
+	fi
+
+	if use java; then
+		java-pkg_newjar "${S}"/gettext-runtime/intl-java/libintl.jar || die
+
+		if use doc; then
+			rm -rf "${D}"/usr/share/doc/${PF}/{html,javadoc2,javadoc1}
+			java-pkg_dojavadoc gettext-runtime/intl-java/javadoc*
+		fi
+	fi
+
+	if use doc ; then
+		dohtml "${D}"/usr/share/doc/${PF}/*.html
+	else
+		rm -rf "${D}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1}
+	fi
+	rm -f "${D}"/usr/share/doc/${PF}/*.html
+
+	dodoc AUTHORS ChangeLog NEWS README THANKS
+}
+
+pkg_preinst() {
+	# older gettext's sometimes installed libintl ...
+	# need to keep the linked version or the system
+	# could die (things like sed link against it :/)
+	preserve_old_lib /{,usr/}$(get_libdir)/libintl$(get_libname 7)
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /{,usr/}$(get_libdir)/libintl$(get_libname 7)
+}
diff --git a/sys-devel/gettext/metadata.xml b/sys-devel/gettext/metadata.xml
new file mode 100644
index 000000000..96a2d5863
--- /dev/null
+++ b/sys-devel/gettext/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>base-system</herd>
+</pkgmetadata>
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 6b2114b17..d880fae98 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -7,7 +7,9 @@ AUX e2fsprogs-1.41.2-makefile.patch 2813 RMD160 11b20c97f58efe18850296aefe08a155
 AUX e2fsprogs-1.41.3-tune2fs-opt.patch 3027 RMD160 98c7ea72fc19f262b9965ef940629958de753844 SHA1 db9fcb2c696bcb71009b7ff4ecb630996712a59a SHA256 c4e7966c674d7853d03c5af5f431ffef54d463870793d8a7a7784874486bb4e1
 AUX fsck_ext2fs.8 3806 RMD160 193e4e01508ad363c28c8d5feb124f65d59a76eb SHA1 dff54a3149f8d6187f6481c428d4b980c3abfb97 SHA256 fc1155e67f17aebc8762d75a25d25511a1463be3da05baf7a322d0b5f91938e0
 AUX fsck_ext2fs.c 2797 RMD160 b5a58058b90876d11286ffb12de75bdbf6a064e3 SHA1 c0027c5e031b87dd8a5d50a3a256ac7637e59fd3 SHA256 a7c3614e76c89ab7882191c14a469789d4b5b54f3c61c5888e5bd72840816e22
+DIST e2fsprogs-1.41.3.tar.gz 4365234 RMD160 7045401ac70a7aa865a8040da4aca2683204abd6 SHA1 d85f05b7bcef1adf8306a789f3ac0325c3c67e8d SHA256 ce77edae680d090cb8275eca9be282bdbc5fbef028d7bf6f772fb4f04b578d7a
 DIST e2fsprogs-1.41.4.tar.gz 4389512 RMD160 da1f77f0a41a0047b86bf540bfb484622efd79fd SHA1 55da145bce7b024ab609aa4a6fc8be81a2bb3490 SHA256 2cc10fee2b29add737e454eb634513135b34a638f7ca2b18364864fe089020dc
-EBUILD e2fsprogs-1.41.4.ebuild 3946 RMD160 1be6a32a8f2b1573abe286e21e614debd96e7753 SHA1 e09eec7e91c5140c202d3fbe50e5adc573be88e8 SHA256 b87087ff274300153022d957022f4fb11f66e75d735c2530d0763c28a76aae39
+EBUILD e2fsprogs-1.41.3-r1.ebuild 4043 RMD160 5440164afce5d1117ef6be9957fcde1fd1a6218f SHA1 b0b02c321ad44bbd1cb0c74d7535949f7dc765f2 SHA256 bdd0a04d64925cec62c03ccb8cca69a42d575cacdfa3fda461cac7f042d55b68
+EBUILD e2fsprogs-1.41.4.ebuild 3986 RMD160 1d1b562c12d31bfe56f820c636020d34f14e74da SHA1 411d7317bfad9add2c27d753a0ac008d8da86778 SHA256 c613abb2ed5083f8a2633699807e2adc757288c50767859e0f44e844d3f9725f
 MISC ChangeLog 27039 RMD160 c75fc0fa72ec876e47beea61f615e0685c7c7308 SHA1 c4b2a984bd3639db602415b331fa60053c912dc1 SHA256 bfdd13eccf11605bf5ab8f409752c6274637ffc19f65bcb0b0c5f8436514bcea
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.41.3-r1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.41.3-r1.ebuild
new file mode 100644
index 000000000..2f0109b55
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.41.3-r1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.41.3-r1.ebuild,v 1.7 2009/03/06 06:44:17 vapier Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic toolchain-funcs multilib multilib-native
+
+DESCRIPTION="Standard EXT2 and EXT3 filesystem utilities"
+HOMEPAGE="http://e2fsprogs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.gz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE="nls elibc_FreeBSD"
+
+RDEPEND="~sys-libs/${PN}-libs-${PV}[lib32?]
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext[lib32?] )
+	sys-apps/texinfo"
+
+pkg_setup() {
+	if [[ ! -e ${ROOT}/etc/mtab ]] ; then
+		# add some crap to deal with missing /etc/mtab #217719
+		ewarn "No /etc/mtab file, creating one temporarily"
+		echo "${PN} crap for src_test" > "${ROOT}"/etc/mtab
+	fi
+}
+
+multilib-native_src_prepare_internal() {
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.38-tests-locale.patch #99766
+	epatch "${FILESDIR}"/${PN}-1.41.2-makefile.patch
+	epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
+	epatch "${FILESDIR}"/${P}-tune2fs-opt.patch #253162
+	# blargh ... trick e2fsprogs into using e2fsprogs-libs
+	rm -rf doc
+	sed -i -r \
+		-e 's:@LIBINTL@:@LTLIBINTL@:' \
+		-e '/^LIB(BLKID|COM_ERR|SS|UUID)/s:[$][(]LIB[)]/lib([^@]*)@LIB_EXT@:-l\1:' \
+		-e '/^DEPLIB(BLKID|COM_ERR|SS|UUID)/s:=.*:=:' \
+		MCONFIG.in || die "muck libs" #122368
+	sed -i -r \
+		-e '/^LIB_SUBDIRS/s:lib/(blkid|et|ss|uuid)::g' \
+		Makefile.in || die "remove subdirs"
+	touch lib/ss/ss_err.h
+}
+
+multilib-native_src_configure_internal() {
+	# Keep the package from doing silly things
+	addwrite /var/cache/fonts
+	export LDCONFIG=:
+	export CC=$(tc-getCC)
+	export STRIP=:
+
+	# We want to use the "bsd" libraries while building on Darwin, but while
+	# building on other Gentoo/*BSD we prefer elf-naming scheme.
+	local libtype
+	case ${CHOST} in
+		*-darwin*) libtype=bsd;;
+		*)         libtype=elf;;
+	esac
+
+	econf \
+		--bindir=/bin \
+		--sbindir=/sbin \
+		--enable-${libtype}-shlibs \
+		--with-ldopts="${LDFLAGS}" \
+		$(use_enable !elibc_uclibc tls) \
+		--without-included-gettext \
+		$(use_enable nls) \
+		$(use_enable userland_GNU fsck) \
+		|| die
+}
+
+multilib-native_src_compile_internal() {
+	if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
+		eerror "INTL sanity check failed, aborting build."
+		eerror "Please post your ${S}/config.log file as an"
+		eerror "attachment to http://bugs.gentoo.org/show_bug.cgi?id=81096"
+		die "Preventing included intl cruft from building"
+	fi
+	emake COMPILE_ET=compile_et MK_CMDS=mk_cmds || die
+
+	# Build the FreeBSD helper
+	if use elibc_FreeBSD ; then
+		cp "${FILESDIR}"/fsck_ext2fs.c .
+		emake fsck_ext2fs || die
+	fi
+}
+
+pkg_preinst() {
+	if [[ -r ${ROOT}/etc/mtab ]] ; then
+		if [[ $(<"${ROOT}"/etc/mtab) == "${PN} crap for src_test" ]] ; then
+			rm -f "${ROOT}"/etc/mtab
+		fi
+	fi
+}
+
+multilib-native_src_install_internal() {
+	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install-libs || die
+	dodoc README RELEASE-NOTES
+
+	# Move shared libraries to /lib/, install static libraries to /usr/lib/,
+	# and install linker scripts to /usr/lib/.
+	dodir /$(get_libdir)
+	local lib slib
+	for lib in "${D}"/usr/$(get_libdir)/*.a ; do
+		slib=${lib##*/}
+		mv "${lib%.a}"$(get_libname)* "${D}"/$(get_libdir)/ || die "moving lib ${slib}"
+		gen_usr_ldscript ${slib%.a}$(get_libname)
+	done
+
+	# move 'useless' stuff to /usr/
+	dosbin "${D}"/sbin/mklost+found
+	rm -f "${D}"/sbin/mklost+found
+
+	if use elibc_FreeBSD ; then
+		# Install helpers for us
+		into /
+		dosbin "${S}"/fsck_ext2fs || die
+		doman "${FILESDIR}"/fsck_ext2fs.8
+
+		# these manpages are already provided by FreeBSD libc
+		# and filefrag is linux only
+		rm -f \
+			"${D}"/sbin/filefrag \
+			"${D}"/usr/share/man/man8/filefrag.8 \
+			"${D}"/bin/uuidgen \
+			"${D}"/usr/share/man/man3/{uuid,uuid_compare}.3 \
+			"${D}"/usr/share/man/man1/uuidgen.1 || die
+	fi
+}
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.41.4.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.41.4.ebuild
index 970eba98b..c79c2e048 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.41.4.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.41.4.ebuild
@@ -14,10 +14,10 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="nls elibc_FreeBSD"
 
-RDEPEND="~sys-libs/${PN}-libs-${PV}
+RDEPEND="~sys-libs/${PN}-libs-${PV}[lib32?]
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
+	nls? ( sys-devel/gettext[lib32?] )
 	sys-apps/texinfo"
 
 pkg_setup() {
@@ -28,9 +28,7 @@ pkg_setup() {
 	fi
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+multilib-native_src_prepare_internal() {
 	epatch "${FILESDIR}"/${PN}-1.38-tests-locale.patch #99766
 	epatch "${FILESDIR}"/${PN}-1.41.2-makefile.patch
 	epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
@@ -47,9 +45,7 @@ src_unpack() {
 	touch lib/ss/ss_err.h
 }
 
-src_configure() { :; }
-
-multilib-native_src_compile_internal() {
+multilib-native_src_configure_internal() {
 	# Keep the package from doing silly things
 	addwrite /var/cache/fonts
 	export LDCONFIG=:
@@ -74,6 +70,9 @@ multilib-native_src_compile_internal() {
 		$(use_enable nls) \
 		$(use_enable userland_GNU fsck) \
 		|| die
+}
+
+multilib-native_src_compile_internal() {
 	if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
 		eerror "INTL sanity check failed, aborting build."
 		eerror "Please post your ${S}/config.log file as an"