Removed old versions and files

(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

13 files changed, 12 insertions, 658 deletions

diff --git a/sys-devel/gettext/ChangeLog b/sys-devel/gettext/ChangeLog
index a44772effc95..e3627af212f7 100644
--- a/sys-devel/gettext/ChangeLog
+++ b/sys-devel/gettext/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-devel/gettext
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.227 2014/01/05 19:50:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.228 2014/01/07 09:33:35 polynomial-c Exp $
+
+  07 Jan 2014; Lars Wendler <polynomial-c@gentoo.org>
+  -gettext-0.18.1.1-r1.ebuild, -gettext-0.18.1.1-r2.ebuild,
+  -gettext-0.18.1.1-r3.ebuild, -gettext-0.18.3.1.ebuild,
+  -files/gettext-0.14.1-lib-path-tests.patch,
+  -files/gettext-0.14.2-fix-race.patch,
+  -files/gettext-0.15-expat-no-dlopen.patch, -files/gettext-0.17-gnuinfo.patch,
+  -files/gettext-0.17-open-args.patch, -files/gettext-0.17-x-python.patch,
+  -files/gettext-0.18.1.1-no-gets.patch,
+  -files/gettext-0.18.1.1-uclibc-sched_param-def.patch:
+  Removed old versions and files.
 
   05 Jan 2014; Mike Frysinger <vapier@gentoo.org> gettext-0.18.3.1-r1.ebuild:
   Control libasprintf (a C++ library) via USE=cxx #496926 by Sylvain BERTRAND.
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
deleted file mode 100644
index 8a6a695eb63f..000000000000
--- a/sys-devel/gettext/files/gettext-0.14.1-lib-path-tests.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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
deleted file mode 100644
index 57d381d37ca7..000000000000
--- a/sys-devel/gettext/files/gettext-0.14.2-fix-race.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index 4630d1dd92d3..000000000000
--- a/sys-devel/gettext/files/gettext-0.15-expat-no-dlopen.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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
deleted file mode 100644
index 243916636fbe..000000000000
--- a/sys-devel/gettext/files/gettext-0.17-gnuinfo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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
deleted file mode 100644
index 330cbf614631..000000000000
--- a/sys-devel/gettext/files/gettext-0.17-open-args.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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/files/gettext-0.17-x-python.patch b/sys-devel/gettext/files/gettext-0.17-x-python.patch
deleted file mode 100644
index 20d55f8a32ba..000000000000
--- a/sys-devel/gettext/files/gettext-0.17-x-python.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a6fed64abcc079877b33804420c666b867b50987 Mon Sep 17 00:00:00 2001
-From: Bruno Haible <bruno@clisp.org>
-Date: Sun, 03 Aug 2008 20:00:25 +0000
-Subject: Handle lone high surrogates gracefully.
-
-2008-08-03  Bruno Haible  <bruno@clisp.org>
-
-	* x-python.c (mixed_string_buffer_append): Replace a lone high
-	surrogate with U+FFFD.
-	Reported by Yann <asterix@lagaule.org>
-	via Santiago Vila <sanvila@unex.es>.
-
-diff --git a/gettext-tools/src/x-python.c b/gettext-tools/src/x-python.c
-index e6dcc31..e05aca4 100644
---- a/gettext-tools/src/x-python.c
-+++ b/gettext-tools/src/x-python.c
-@@ -930,6 +930,11 @@ mixed_string_buffer_append (struct mixed_string_buffer *bp, int c)
- 
- 	  if (c >= UNICODE (0xd800) && c < UNICODE (0xdc00))
- 	    bp->utf16_surr = UNICODE_VALUE (c);
-+	  else if (c >= UNICODE (0xdc00) && c < UNICODE (0xe000))
-+	    {
-+	      /* A half surrogate is invalid, therefore use U+FFFD instead.  */
-+	      mixed_string_buffer_append_unicode (bp, 0xfffd);
-+	    }
- 	  else
- 	    mixed_string_buffer_append_unicode (bp, UNICODE_VALUE (c));
- 	}
diff --git a/sys-devel/gettext/files/gettext-0.18.1.1-no-gets.patch b/sys-devel/gettext/files/gettext-0.18.1.1-no-gets.patch
deleted file mode 100644
index 9daa48eae649..000000000000
--- a/sys-devel/gettext/files/gettext-0.18.1.1-no-gets.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-hack until gzip pulls a newer gnulib version
-
-From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001
-From: Eric Blake <eblake@redhat.com>
-Date: Thu, 29 Mar 2012 13:30:41 -0600
-Subject: [PATCH] stdio: don't assume gets any more
-
-Gnulib intentionally does not have a gets module, and now that C11
-and glibc have dropped it, we should be more proactive about warning
-any user on a platform that still has a declaration of this dangerous
-interface.
-
---- a/gettext-tools/libgettextpo/stdio.in.h
-+++ b/gettext-tools/libgettextpo/stdio.in.h
-@@ -125,7 +125,6 @@
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- #undef gets
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
---- a/gettext-tools/gnulib-lib/stdio.in.h
-+++ b/gettext-tools/gnulib-lib/stdio.in.h
-@@ -125,7 +125,6 @@
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- #undef gets
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
---- a/gettext-runtime/gnulib-lib/stdio.in.h
-+++ b/gettext-runtime/gnulib-lib/stdio.in.h
-@@ -125,7 +125,6 @@
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- #undef gets
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
diff --git a/sys-devel/gettext/files/gettext-0.18.1.1-uclibc-sched_param-def.patch b/sys-devel/gettext/files/gettext-0.18.1.1-uclibc-sched_param-def.patch
deleted file mode 100644
index 4e392780fc65..000000000000
--- a/sys-devel/gettext/files/gettext-0.18.1.1-uclibc-sched_param-def.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-uclibc defines __GLIBC__ but it does not expose struct shed_param as much as glibc
-and is not needed too per standard. gnulib attempts to use it but we have to account
-for it because in this case uclibc does not behave like glibc.
-
--Khem
-
-http://bugs.gentoo.org/336484
-http://bugs.gentoo.org/323377
-
---- gettext/gettext-tools/gnulib-lib/spawn.in.h
-+++ gettext/gettext-tools/gnulib-lib/spawn.in.h
-@@ -31,7 +31,7 @@
- 
- /* Get definitions of 'struct sched_param' and 'sigset_t'.
-    But avoid namespace pollution on glibc systems.  */
--#ifndef __GLIBC__
-+#if !defined __GLIBC__ || defined __UCLIBC__
- # include <sched.h>
- # include <signal.h>
- #endif
diff --git a/sys-devel/gettext/gettext-0.18.1.1-r1.ebuild b/sys-devel/gettext/gettext-0.18.1.1-r1.ebuild
deleted file mode 100644
index d897bfc72ba0..000000000000
--- a/sys-devel/gettext/gettext-0.18.1.1-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.18.1.1-r1.ebuild,v 1.13 2012/09/06 18:19:33 vapier Exp $
-
-EAPI="2"
-
-inherit flag-o-matic eutils multilib toolchain-funcs mono libtool
-
-DESCRIPTION="GNU locale utilities"
-HOMEPAGE="http://www.gnu.org/software/gettext/"
-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 x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="acl doc emacs git nls +cxx openmp elibc_glibc"
-
-DEPEND="virtual/libiconv
-	dev-libs/libxml2
-	sys-libs/ncurses
-	dev-libs/expat
-	acl? ( virtual/acl )"
-RDEPEND="${DEPEND}
-	git? ( dev-vcs/git )"
-PDEPEND="emacs? ( app-emacs/po-mode )"
-
-src_prepare() {
-	epunt_cxx
-	elibtoolize
-	epatch "${FILESDIR}"/${P}-no-gets.patch
-}
-
-src_configure() {
-	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 cxx || 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 ... ^^^
-	#
-	# --with-included-libunistring will _disable_ libunistring (since
-	# --it's not bundled), see bug #326477
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		--without-emacs \
-		--without-lispdir \
-		--disable-java \
-		--with-included-glib \
-		--with-included-libcroco \
-		--with-included-libunistring \
-		$(use_enable acl) \
-		$(use_enable openmp) \
-		$(use_with git) \
-		--without-cvs
-}
-
-src_install() {
-	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)"
-		# 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 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/gettext-0.18.1.1-r2.ebuild b/sys-devel/gettext/gettext-0.18.1.1-r2.ebuild
deleted file mode 100644
index 962553f93a89..000000000000
--- a/sys-devel/gettext/gettext-0.18.1.1-r2.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.18.1.1-r2.ebuild,v 1.6 2012/09/06 18:19:33 vapier Exp $
-
-EAPI="2"
-
-inherit flag-o-matic eutils multilib toolchain-funcs mono libtool java-pkg-opt-2
-
-DESCRIPTION="GNU locale utilities"
-HOMEPAGE="http://www.gnu.org/software/gettext/"
-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 ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="acl doc emacs git java nls +cxx openmp elibc_glibc"
-
-DEPEND="virtual/libiconv
-	dev-libs/libxml2
-	sys-libs/ncurses
-	dev-libs/expat
-	acl? ( virtual/acl )
-	java? ( >=virtual/jdk-1.4 )"
-RDEPEND="${DEPEND}
-	git? ( dev-vcs/git )
-	java? ( >=virtual/jre-1.4 )"
-PDEPEND="emacs? ( app-emacs/po-mode )"
-
-src_prepare() {
-	java-pkg-opt-2_src_prepare
-	epunt_cxx
-	elibtoolize
-	epatch "${FILESDIR}"/${P}-uclibc-sched_param-def.patch
-	epatch "${FILESDIR}"/${P}-no-gets.patch
-}
-
-src_configure() {
-	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 cxx || 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 ... ^^^
-	#
-	# --with-included-libunistring will _disable_ libunistring (since
-	# --it's not bundled), see bug #326477
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		--without-emacs \
-		--without-lispdir \
-		$(use_enable java) \
-		--with-included-glib \
-		--with-included-libcroco \
-		--with-included-libunistring \
-		$(use_enable acl) \
-		$(use_enable openmp) \
-		$(use_with git) \
-		--without-cvs
-}
-
-src_install() {
-	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)"
-		# 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_dojar "${D}"/usr/share/${PN}/*.jar
-		rm -f "${D}"/usr/share/${PN}/*.jar
-		rm -f "${D}"/usr/share/${PN}/*.class
-		if use doc ; then
-			java-pkg_dojavadoc "${D}"/usr/share/doc/${PF}/javadoc2
-			rm -rf "${D}"/usr/share/doc/${PF}/javadoc2
-		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)
-
-	java-pkg-opt-2_pkg_preinst
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /{,usr/}$(get_libdir)/libintl$(get_libname 7)
-}
diff --git a/sys-devel/gettext/gettext-0.18.1.1-r3.ebuild b/sys-devel/gettext/gettext-0.18.1.1-r3.ebuild
deleted file mode 100644
index 6c478d1ac2f8..000000000000
--- a/sys-devel/gettext/gettext-0.18.1.1-r3.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.18.1.1-r3.ebuild,v 1.12 2012/09/23 19:05:55 armin76 Exp $
-
-EAPI="2"
-
-inherit flag-o-matic eutils multilib toolchain-funcs mono libtool java-pkg-opt-2
-
-DESCRIPTION="GNU locale utilities"
-HOMEPAGE="http://www.gnu.org/software/gettext/"
-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 x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="acl -cvs doc emacs git java nls +cxx openmp static-libs elibc_glibc"
-
-DEPEND="virtual/libiconv
-	dev-libs/libxml2
-	sys-libs/ncurses
-	dev-libs/expat
-	acl? ( virtual/acl )
-	java? ( >=virtual/jdk-1.4 )"
-RDEPEND="${DEPEND}
-	!git? ( cvs? ( dev-vcs/cvs ) )
-	git? ( dev-vcs/git )
-	java? ( >=virtual/jre-1.4 )"
-PDEPEND="emacs? ( app-emacs/po-mode )"
-
-src_prepare() {
-	java-pkg-opt-2_src_prepare
-	epunt_cxx
-	elibtoolize
-	epatch "${FILESDIR}"/${P}-uclibc-sched_param-def.patch
-	epatch "${FILESDIR}"/${P}-no-gets.patch
-}
-
-src_configure() {
-	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 cxx || 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 ... ^^^
-	#
-	# --with-included-libunistring will _disable_ libunistring (since
-	# --it's not bundled), see bug #326477
-	econf \
-		--cache-file="${S}"/config.cache \
-		--docdir="/usr/share/doc/${PF}" \
-		--without-emacs \
-		--without-lispdir \
-		$(use_enable java) \
-		--with-included-glib \
-		--with-included-libcroco \
-		--with-included-libunistring \
-		$(use_enable acl) \
-		$(use_enable openmp) \
-		$(use_enable static-libs static) \
-		$(use_with git) \
-		$(usex git --without-cvs $(use_with cvs))
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "install failed"
-	use nls || rm -r "${D}"/usr/share/locale
-	use static-libs || rm -f "${D}"/usr/lib*/*.la
-	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)"
-		# 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_dojar "${D}"/usr/share/${PN}/*.jar
-		rm -f "${D}"/usr/share/${PN}/*.jar
-		rm -f "${D}"/usr/share/${PN}/*.class
-		if use doc ; then
-			java-pkg_dojavadoc "${D}"/usr/share/doc/${PF}/javadoc2
-			rm -rf "${D}"/usr/share/doc/${PF}/javadoc2
-		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)
-
-	java-pkg-opt-2_pkg_preinst
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /{,usr/}$(get_libdir)/libintl$(get_libname 7)
-}
diff --git a/sys-devel/gettext/gettext-0.18.3.1.ebuild b/sys-devel/gettext/gettext-0.18.3.1.ebuild
deleted file mode 100644
index af6de3ba6ba9..000000000000
--- a/sys-devel/gettext/gettext-0.18.3.1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.18.3.1.ebuild,v 1.1 2013/08/25 01:14:18 vapier Exp $
-
-EAPI="2"
-
-inherit flag-o-matic eutils multilib toolchain-funcs mono libtool java-pkg-opt-2
-
-DESCRIPTION="GNU locale utilities"
-HOMEPAGE="http://www.gnu.org/software/gettext/"
-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 ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="acl -cvs doc emacs git java nls +cxx openmp static-libs elibc_glibc"
-
-DEPEND="virtual/libiconv
-	dev-libs/libxml2
-	sys-libs/ncurses
-	dev-libs/expat
-	acl? ( virtual/acl )
-	java? ( >=virtual/jdk-1.4 )"
-RDEPEND="${DEPEND}
-	!git? ( cvs? ( dev-vcs/cvs ) )
-	git? ( dev-vcs/git )
-	java? ( >=virtual/jre-1.4 )"
-PDEPEND="emacs? ( app-emacs/po-mode )"
-
-src_prepare() {
-	java-pkg-opt-2_src_prepare
-	epunt_cxx
-	elibtoolize
-}
-
-src_configure() {
-	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 cxx || 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 ... ^^^
-	#
-	# --with-included-libunistring will _disable_ libunistring (since
-	# --it's not bundled), see bug #326477
-	econf \
-		--cache-file="${S}"/config.cache \
-		--docdir="/usr/share/doc/${PF}" \
-		--without-emacs \
-		--without-lispdir \
-		$(use_enable java) \
-		--with-included-glib \
-		--with-included-libcroco \
-		--with-included-libunistring \
-		$(use_enable acl) \
-		$(use_enable openmp) \
-		$(use_enable static-libs static) \
-		$(use_with git) \
-		$(usex git --without-cvs $(use_with cvs))
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "install failed"
-	use nls || rm -r "${D}"/usr/share/locale
-	use static-libs || rm -f "${D}"/usr/lib*/*.la
-	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
-
-	[[ ${USERLAND} == "BSD" ]] && gen_usr_ldscript -a intl
-
-	if use java ; then
-		java-pkg_dojar "${D}"/usr/share/${PN}/*.jar
-		rm -f "${D}"/usr/share/${PN}/*.jar
-		rm -f "${D}"/usr/share/${PN}/*.class
-		if use doc ; then
-			java-pkg_dojavadoc "${D}"/usr/share/doc/${PF}/javadoc2
-			rm -rf "${D}"/usr/share/doc/${PF}/javadoc2
-		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)
-
-	java-pkg-opt-2_pkg_preinst
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /{,usr/}$(get_libdir)/libintl$(get_libname 7)
-}