Version bump. Removed old

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

4 files changed, 9 insertions, 182 deletions

diff --git a/sys-devel/gettext/ChangeLog b/sys-devel/gettext/ChangeLog
index 245682f33910..274c1fa34b01 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.252 2014/12/12 05:56:41 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.253 2014/12/24 12:59:55 polynomial-c Exp $
+
+*gettext-0.19.4 (24 Dec 2014)
+
+  24 Dec 2014; Lars Wendler <polynomial-c@gentoo.org> -gettext-0.19.2.ebuild,
+  -gettext-0.19.4_rc1.ebuild, +gettext-0.19.4.ebuild,
+  -files/gettext-0.18.3.1-use_m4_fallback_dir.patch:
+  Version bump. Removed old.
 
 *gettext-0.19.4_rc1 (12 Dec 2014)
 
diff --git a/sys-devel/gettext/files/gettext-0.18.3.1-use_m4_fallback_dir.patch b/sys-devel/gettext/files/gettext-0.18.3.1-use_m4_fallback_dir.patch
deleted file mode 100644
index 29d51a09a648..000000000000
--- a/sys-devel/gettext/files/gettext-0.18.3.1-use_m4_fallback_dir.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 38aa888cc88bb27930818ec8dc55033a072cbfd5 Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <ueno@gnu.org>
-Date: Wed, 16 Oct 2013 07:34:48 +0000
-Subject: autopoint: use 'm4' as the fallback macro directory
-
----
-diff --git a/gettext-tools/misc/autopoint.in b/gettext-tools/misc/autopoint.in
-index 72b268b..d8c7d74 100644
---- a/gettext-tools/misc/autopoint.in
-+++ b/gettext-tools/misc/autopoint.in
-@@ -347,6 +347,10 @@ if test -z "$m4dir" && test -f Makefile.am; then
-   done
- fi
- 
-+if test -z "$m4dir"; then
-+  m4dir=m4
-+fi
-+
- # Check whether to omit the intl/ directory.
- omitintl=
- xargs=`func_trace AM_GNU_GETTEXT "$configure_in"`
---
-cgit v0.9.0.2
diff --git a/sys-devel/gettext/gettext-0.19.2.ebuild b/sys-devel/gettext/gettext-0.19.2.ebuild
deleted file mode 100644
index 7fb3349077cd..000000000000
--- a/sys-devel/gettext/gettext-0.19.2.ebuild
+++ /dev/null
@@ -1,157 +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.19.2.ebuild,v 1.2 2014/10/12 01:37:17 blueness Exp $
-
-EAPI="4"
-
-inherit flag-o-matic eutils multilib toolchain-funcs mono-env libtool java-pkg-opt-2 multilib-minimal
-
-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 elibc_musl"
-
-if [[ ${PV} =~ _rc ]] ; then
-	SRC_URI="mirror://gnu-alpha/${PN}/${P/_/-}.tar.gz"
-	KEYWORDS=""
-	S="${WORKDIR}/${P/_/-}"
-fi
-
-# only runtime goes multilib
-DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	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 )
-	abi_x86_32? (
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-		!<=app-emulation/emul-linux-x86-baselibs-20131008-r11
-	)"
-PDEPEND="emacs? ( app-emacs/po-mode )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	# only installed for native ABI
-	/usr/include/gettext-po.h
-)
-
-src_prepare() {
-	java-pkg-opt-2_src_prepare
-	epunt_cxx
-	elibtoolize
-}
-
-multilib_src_configure() {
-	local myconf=(
-		# switches common to runtime and top-level
-		--cache-file="${BUILD_DIR}"/config.cache
-		--docdir="/usr/share/doc/${PF}"
-
-		$(use_enable cxx libasprintf)
-		$(use_enable java)
-		$(use_enable static-libs static)
-	)
-
-	# Build with --without-included-gettext (on glibc systems)
-	if use elibc_glibc || use elibc_musl ; then
-		myconf+=(
-			--without-included-gettext
-			$(use_enable nls)
-		)
-	else
-		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
-
-	local ECONF_SOURCE=${S}
-	if ! multilib_is_native_abi ; then
-		# for non-native ABIs, we build runtime only
-		ECONF_SOURCE+=/gettext-runtime
-	else
-		# remaining switches
-		myconf+=(
-			# Emacs support is now in a separate package
-			--without-emacs
-			--without-lispdir
-			# glib depends on us so avoid circular deps
-			--with-included-glib
-			# libcroco depends on glib which ... ^^^
-			--with-included-libcroco
-			# this will _disable_ libunistring (since it is not bundled),
-			# see bug #326477
-			--with-included-libunistring
-
-			$(use_enable acl)
-			$(use_enable ncurses curses)
-			$(use_enable openmp)
-			$(use_with git)
-			$(usex git --without-cvs $(use_with cvs))
-		)
-	fi
-
-	econf "${myconf[@]}"
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi ; then
-		dosym msgfmt /usr/bin/gmsgfmt #43435
-		dobin gettext-tools/misc/gettextize
-
-		[[ ${USERLAND} == "BSD" ]] && gen_usr_ldscript -a intl
-	fi
-}
-
-multilib_src_install_all() {
-	use nls || rm -r "${D}"/usr/share/locale
-	use static-libs || prune_libtool_files --all
-
-	rm -f "${D}"/usr/share/locale/locale.alias "${D}"/usr/lib/charset.alias
-
-	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.4_rc1.ebuild b/sys-devel/gettext/gettext-0.19.4.ebuild
index 71cd4364877c..e90f29297cbe 100644
--- a/sys-devel/gettext/gettext-0.19.4_rc1.ebuild
+++ b/sys-devel/gettext/gettext-0.19.4.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.4_rc1.ebuild,v 1.1 2014/12/12 05:56:41 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.19.4.ebuild,v 1.1 2014/12/24 12:59:55 polynomial-c Exp $
 
 EAPI="4"