Version bump. Removed old

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

5 files changed, 25 insertions, 201 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/Manifest b/sys-devel/gettext/Manifest
index 51a2b9b999ee..7f09a51e6175 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -1,31 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX gettext-0.18.3.1-use_m4_fallback_dir.patch 646 SHA256 2648ff594e544b706f16c4bebf87da126940e23cba438e32757cdf6d2ec15b83 SHA512 3dc8486b71c6cea0e2b1761056c1517babde201bcc3213f630cd6e0f6750da044be64584de95986ff24a60635049241aeb9a5fa95d6776a7a11b6ecdd000a824 WHIRLPOOL dc563b318d679c7f1429306a1f783ca21859a71ae68ae81403ae4b55a7399d8528d396500b3dd12d3710bbcb8eba00f36415b49dbb0d836aa918bd4267d9ae1d
 DIST gettext-0.18.3.2.tar.gz 16189249 SHA256 d1a4e452d60eb407ab0305976529a45c18124bd518d976971ac6dc7aa8b4c5d7 SHA512 0cf8f2bb844b9d94f5e63a0f4bddc133e2388d103fd4189614d2fc157a94e27836ec399eb32ab69410e2214425676e6bc195bbf13238cc5ad32b454ec6e2b5ef WHIRLPOOL 0bb2e33788a12fbeaa4756aaa354a308424cdea5008d6b686bbd8601b7b7c513483d79f323904ebaf94e1fd67f65dfa7cb993ba5c5751e16a297b94b3307ae66
-DIST gettext-0.19.2.tar.gz 17141404 SHA256 0c48ae6ef6e0abcf6cd9cb9dcdc593d0e1a367e82259bbe113ce88ceea9249bb SHA512 540440b41025a68eed3e77530be77e1b0fc68ce74e56f0e8b724c843cc2f2fc968bbb7627006bbe4fa83b5042bd860136a67f63dcf22d5f79e0f60f4df2279e7 WHIRLPOOL efa858843c209a6c70c2e2c26991a7d8065e774d6f63c52e2606ce9806924781bd681e37b51f6086be4daa8672849027a1fb53563777ec69f848e1ba0a3e0aa9
 DIST gettext-0.19.3.tar.gz 17414357 SHA256 93952d505a3d3b1ec10c69d340c7d438b1f9c332710d583981c0608be3eeb3f6 SHA512 2ec02065b376cf9ec2b9d32328a7181d292ac940356a710f785450f37e03a8513e07d4b981824374671cfa2f60024e4649fc89ad79ee0adda87a8b9b63ad28e8 WHIRLPOOL cbf86dab685fe3a5f4dbe5bcb39295809511904fdc65d9e0ef188c228bbe38c408ea38c14ac0ad38634ef1f5d79474d38399e95ab50ff6922cb0087ccfe434be
-DIST gettext-0.19.4-rc1.tar.xz 6768560 SHA256 af3c382ce59843e8c62bd2cb396f1eb35f0954fc1994a0fbc9c5d715ac2f5acd SHA512 0fabc8362085c02981fe2523641c16b4b459affc42c416b33f573b45384fc054cc2a3b80bf4a0a8b5c6fe9a34e24f8bba8ec4cbba1d3083f5f492226aa1cf350 WHIRLPOOL ebdb755e2ff63e5b8d616f28e3e71a59fe36ddb9577b40d6aa00beb32d1a714e86b943f633267888cc1a500c655997f99b5eee14a3e9f5d786878a7eff641b30
+DIST gettext-0.19.4.tar.gz 17717034 SHA256 8ac9f1ed1a5f8c4e656a2f37f5ba6b9ee04c4df79a575e876b0b6946aa417f3f SHA512 274e00fe0149468e3073562f8f3b292597e9dbd82dfe8d068e4a1983914d25b603bb26f3fa4aa10e9fcd65826e3552c1871218342270927481e95eb64288ad97 WHIRLPOOL 2eb56c47d76f63b6557ae825538a35ae59f3f77da35321688547d9c420f47879c79ca1ab8ebd6bc6b4a3a8ce59ed620648884cd46455f6218213587f76967918
 EBUILD gettext-0.18.3.2.ebuild 3949 SHA256 d1db3fa6a73828ac1a5ca1c934475cfa91c4296c6d0da82e93a049da4c41d468 SHA512 b0000f30cf8b942b5ff236c90d45254ee4b984e87882aa8bf158bd32a494f80d4906bbdc20f4e0ec957cf58f8f55ca970afd0e6700d67566264335a849a584d4 WHIRLPOOL cf63d98134272939dedb75632be04918a9a8cafad73d6a45a7eeadf44697ebaa3c3b4003819e1bf0443bacb0512e6fcf1122d860bd5367893ff2191f242833f2
-EBUILD gettext-0.19.2.ebuild 4113 SHA256 9ed090e64dd6bf1f9859af8c2ba5c4845cb990e010603e72f497be2b21a4a403 SHA512 153031c451d6d0891c33c902941e0536eea42ae57bb89316af38804956802f398abcb1f496606a188c56959b9169a810fb41867d38724c057f910ba4ae76c385 WHIRLPOOL 8e41ea3646476f2222cbcdfec145d0e675d1c1b035bccce289af3c901543b08286b7a70db477bc65c61652d641a95d69227deaf725233c23056aa24c9c30cebe
 EBUILD gettext-0.19.3.ebuild 4117 SHA256 18058c00f47cf8d82a551130f38aedf530f6ff667fb823e7474cfc68072999a8 SHA512 42c2dac4f1c85bcb41f41faf484ae45e3f8763825a2d79fb522a193992c14db96362f270814c8c899ca8b866d4a7c52df6a477936ca71e9dfa9ea49a88c3eb0b WHIRLPOOL a7bcee45f6a878f96a2b34c339eb2c5c3f8d6cb54331abee212f734f3cd71f6706d70010dd4625372baad4f1fa2d5b14ed127d42ed45131b87631edd52021519
-EBUILD gettext-0.19.4_rc1.ebuild 4121 SHA256 5765dfb0e813c31b53e42fe92abf2dac396ea8e5e6c65c86bb0c364a57d4579d SHA512 641d9ed802924f492b3ffa3ae58caa90a44a11d458bb11499b43c2346bc9bc2a06cbab98fd45b11b192010a71edf3a608d7051ec0c0f6400f4fecc7328bc14bb WHIRLPOOL 9c715f499ea246462eb41c8dc2db7c68b3a1f8a4f0fcd059c36d00ee2a40a34d7aedb579fec490eefc8ddc2255fa262ae3246c395637c3d1680277c420fd48b2
-MISC ChangeLog 34107 SHA256 fbbc8f30d7c4c48095318c8c22045d1a67fe414b7e9ccd9f83ed05e0f2964481 SHA512 aef0d103e07005047fd60814d5c15ae79099abf4af16a3c470d9df0d2aa130b4c28aecb83987a45e35b161e57a22bed4e0e10923a33a23d98a45f5f980f3d334 WHIRLPOOL 182e64ad883098fe208966ef24040c3cbf728e5bdc9505fc8527f914b35a879606a12452b10193383f8388e87ed46a411404d89bb52a2629c4c6ec3bb37358f6
+EBUILD gettext-0.19.4.ebuild 4117 SHA256 ec3140d10d7818caec0bab1b06cf36d954dbcd180a992cc8552069db38b26195 SHA512 54a93679d7d009594735195a47411a3bd8df3acec2661c0857c6f114ea04880e73ae8743075f3b504b04df993b195e4af9a6283f799500b25c7b415a5728a0bb WHIRLPOOL e912884fe8acec243a6bd66d87f49c6c35609b21e7eac0f455267da6de8d726b208f37509a28cdea7f1cb96eb86b66f8119038e57fb2869bc0173c7dbbe30769
+MISC ChangeLog 34353 SHA256 81030d3a9f64142cb1b7edf18a8595e1022454ec9ec0f22f8909bd28e184c265 SHA512 8ede06a8fb0c01a51ccf32d757f13db3f5e2856dd9f510a3a87425c7441d76004cb67ba489296766de56db241421d3d13b0ab82ec4ae54a0f5fe27148fa5148c WHIRLPOOL f1a7b8f79042d584b40455c8c83a370d3d6251051195188455e0930a6cd88d627dc2761a88f4ec4a6c1967e37acd8f305fe5685bb43137a1ed178edef8282bee
 MISC metadata.xml 563 SHA256 414278bb30c3b2309bb33176d15a3fd4b69d70cbf18e7e58320d799066c821ab SHA512 62c3e03f6384fa66cbdeab39e01f003da47a57751e6d79e71c14ab7e2057c838815cc612e930bae437eb0230106a7bbfc2a62c777cbba5b322eae766c3b12122 WHIRLPOOL c4cb0348aa1fb450e429be93bdc6f918340575e98dfedb237e55b21906ba9ce545cbffa60c6a5ccf65da0d74b58ebd0cadd6ccc797ba8bc21d680e6fbe1edfbd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUioOaAAoJEPiazRVxLXTFQlwQAN329pUbjccYcJw/nFBAcbb/
-KT8B4hacjaUFtnPNpws7RHdQEX5GUSuODC3uOBE1x0vGDFzGNi4J3BrI6/YDFAZe
-ADai4hYbpNcGqBQvoGWKtRAtLgwUrzePgrgn5fYgvTBmjMF4vLxtvGZU9r0pcNfM
-lEVf+axyecpbbeo4QyTwNwBSvJktK7+ij8Htia8QDgAqUyf8eMPcDdwVqeGoZgmE
-dV+cGKN/c2N65CajQBGXee6XZhZV5zf9D8wGszdplMsRHoT4jt/3+pqnuNBeze9A
-mVFxCEgKnErLqTyFTF4AZl5ZE4DzsvGJZkjGajrtoLQQ4/HLhz8Fr4BhjtsX+x9T
-GbfZt16W28/B7upXD5eP0A2OTj0KjXq4R1/s0A8G+ZWW4BzfdeqBhbyAlBZYlR7Q
-rF3Zz3aqvvxz/Kb7SrfTDDhRocLbBIzozrUa4v4kT15tiY+aMWtu7v94yQkXw67A
-DL3NgrBurhTUwa0Ons8LewggyWYVihpbnLkLnks62u7kMd7EKdMBBFfKgnG46OX1
-ntS5XCImJnm4MbtvbmVPawUUkabyyf7BwnqtIF1TA926L56/SGf7zFAq9vUe6HEU
-SAFU/ZPu8SouN7wsnh68K2R30nz6mD9S9GymUTwYLIZeHueF9uB4VwQiiw+rNdRX
-KryGGq4v0jPLT+U7YyJu
-=ZlmR
+iQIcBAEBCAAGBQJUmrjMAAoJEPiazRVxLXTFtUUQAJaYlcsjgqAm11WSfQgzQfAj
+GoRy+Wm5HqZSdupxsQiG262Wjn+BhfcM+et/SsfjOesQwjpxnbNOxNreJUc9Rrov
+N3iSIzOQZNP7aqQEyUKNTGpblJO+MA5yShtvyYiMOYEj/HpvUNwRgBTxBt7WZWD4
+ynu1DdYdzlB0i92yd1DR8zorWkeuBO8AhmtMldGn0FcXlV7vOXsO31cjbP4dWswn
+PsU2ABDRJFcaHTAn9WwRTVUe2fEJxuaCcX3+ugmlJnbtXoPa3OETdX4U/CLWw+og
+Fkf/exiwz4txGkP6U21L4v4BgEPG8bdZY8P/O0olplC/8YrGbswLLugPygx50aB4
+UHbYGXgMZRfU9+8m5WUEwbJsadl3HdIJHdffybMQFpQAJfCZKvTOP8dK4ebup3kO
+z5dqFepjzBIzlDllNQHNOuGFjZUGLF9pFHJlJyOtNpOHxcdcxX5DcTIZEvmKgRJO
+CPRKacsrfhafgl9O2fr8NxXnzETIclCTh3CvuXKxoWO0BVgxBH7l/0bxBhARCr/m
+VmNSvq7sDGIatM4Ll/tiUVjcdRxKJnrsYwV0dEKdzn1IRuRW2ebblptruqGzOJmv
+U7xtEt42dGQXbjyWkltqJZBhJ+3JQiEbwoZbDniG3zwt15Nu6R+cIoFiSX9XKoIP
+/w+hetJw/AXKTiZRdHIq
+=5Avt
 -----END PGP SIGNATURE-----
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"