Version bump. Removed old

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

5 files changed, 35 insertions, 242 deletions

diff --git a/sys-devel/gettext/ChangeLog b/sys-devel/gettext/ChangeLog
index 4da18a765dfd..a282ad679e07 100644
--- a/sys-devel/gettext/ChangeLog
+++ b/sys-devel/gettext/ChangeLog
@@ -1,6 +1,13 @@
 # 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.244 2014/06/01 16:50:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.245 2014/06/02 22:04:45 polynomial-c Exp $
+
+*gettext-0.19 (02 Jun 2014)
+
+  02 Jun 2014; Lars Wendler <polynomial-c@gentoo.org> -gettext-0.18.2.ebuild,
+  -gettext-0.18.3.1-r1.ebuild, -gettext-0.19_rc2.ebuild, +gettext-0.19.ebuild,
+  +files/gettext-0.19-msgfmt-desktop-2_testfix.patch:
+  Version bump. Removed old.
 
   01 Jun 2014; Mike Frysinger <vapier@gentoo.org> gettext-0.18.3.2.ebuild:
   Mark arm64/m68k/s390/sh stable.
diff --git a/sys-devel/gettext/files/gettext-0.19-msgfmt-desktop-2_testfix.patch b/sys-devel/gettext/files/gettext-0.19-msgfmt-desktop-2_testfix.patch
new file mode 100644
index 000000000000..67c08f4ba61f
--- /dev/null
+++ b/sys-devel/gettext/files/gettext-0.19-msgfmt-desktop-2_testfix.patch
@@ -0,0 +1,24 @@
+From e86ccd7f4d4b575646cc335ea73c937176f20c38 Mon Sep 17 00:00:00 2001
+From: Daiki Ueno <ueno@gnu.org>
+Date: Mon, 02 Jun 2014 21:22:42 +0000
+Subject: tests: Ignore the LINGUAS envvar in msgfmt-desktop-2
+
+Reported by Lars Wendler at:
+<http://lists.gnu.org/archive/html/bug-gettext/2014-06/msg00002.html>.
+* msgfmt-desktop-2: Unset the LINGUAS envvar.
+---
+diff --git a/gettext-tools/tests/msgfmt-desktop-2 b/gettext-tools/tests/msgfmt-desktop-2
+index 69f1f89..da976b0 100755
+--- a/gettext-tools/tests/msgfmt-desktop-2
++++ b/gettext-tools/tests/msgfmt-desktop-2
+@@ -111,6 +111,8 @@ Keywords[fr]=one;two;thr\;ee;
+ Keywords=Keyword1;Keyword2;Key\;word3;
+ EOF
+ 
++unset LINGUAS
++
+ # Sanity checks for contradicting options.
+ 
+ ${MSGFMT} --desktop --template=mf.desktop -d po -o mf.desktop.out \
+--
+cgit v0.9.0.2
diff --git a/sys-devel/gettext/gettext-0.18.2.ebuild b/sys-devel/gettext/gettext-0.18.2.ebuild
deleted file mode 100644
index 871966abef35..000000000000
--- a/sys-devel/gettext/gettext-0.18.2.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.18.2.ebuild,v 1.15 2014/01/18 06:13:43 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 arm64 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 ncurses openmp static-libs elibc_glibc"
-
-DEPEND="virtual/libiconv
-	dev-libs/libxml2
-	dev-libs/expat
-	acl? ( virtual/acl )
-	ncurses? ( sys-libs/ncurses )
-	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)
-
-	# Should be able to drop this hack in next release. #333887
-	tc-is-cross-compiler && export gl_cv_func_working_acl_get_file=yes
-
-	# --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 ncurses curses) \
-		$(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)
-}
diff --git a/sys-devel/gettext/gettext-0.18.3.1-r1.ebuild b/sys-devel/gettext/gettext-0.18.3.1-r1.ebuild
deleted file mode 100644
index 423f6c4982cb..000000000000
--- a/sys-devel/gettext/gettext-0.18.3.1-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2014 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-r1.ebuild,v 1.5 2014/01/18 06:13:43 vapier Exp $
-
-EAPI="4"
-
-inherit flag-o-matic eutils multilib toolchain-funcs mono-env 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 ~arm64 ~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 ncurses openmp static-libs elibc_glibc"
-
-DEPEND="virtual/libiconv
-	dev-libs/libxml2
-	dev-libs/expat
-	acl? ( virtual/acl )
-	ncurses? ( sys-libs/ncurses )
-	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() {
-	epatch "${FILESDIR}"/${P}-use_m4_fallback_dir.patch #487794
-	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)
-
-	# Should be able to drop this hack in next release. #333887
-	tc-is-cross-compiler && export gl_cv_func_working_acl_get_file=yes
-
-	# --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 cxx libasprintf) \
-		$(use_enable ncurses curses) \
-		$(use_enable openmp) \
-		$(use_enable static-libs static) \
-		$(use_with git) \
-		$(usex git --without-cvs $(use_with cvs))
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	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
-
-	# 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)
-}
diff --git a/sys-devel/gettext/gettext-0.19_rc2.ebuild b/sys-devel/gettext/gettext-0.19.ebuild
index 6d014dc3ca1d..6de8bdfaae53 100644
--- a/sys-devel/gettext/gettext-0.19_rc2.ebuild
+++ b/sys-devel/gettext/gettext-0.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.19_rc2.ebuild,v 1.1 2014/05/15 09:11:08 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.19.ebuild,v 1.1 2014/06/02 22:04:45 polynomial-c Exp $
 
 EAPI="4"
 
@@ -44,6 +44,8 @@ MULTILIB_WRAPPED_HEADERS=(
 )
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-msgfmt-desktop-2_testfix.patch
+
 	java-pkg-opt-2_src_prepare
 	epunt_cxx
 	elibtoolize