Drop old rc handling which confuses KEYWORD handline. Drop libintl preserve as its...

diff --git a/sys-devel/gettext/ChangeLog b/sys-devel/gettext/ChangeLog
index b326363b3151e9fe39517966a7889dffa31a3275..0759ca32bdf85711d847ac79dd59034745382b50 100644 (file)
--- a/sys-devel/gettext/ChangeLog
+++ b/sys-devel/gettext/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/gettext
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.262 2015/03/13 19:38:49 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.263 2015/03/19 19:39:58 vapier Exp $
+
+  19 Mar 2015; Mike Frysinger <vapier@gentoo.org> gettext-0.19.3.ebuild,
+  gettext-0.19.4.ebuild:
+  Drop old rc handling which confuses KEYWORD handline. Drop libintl preserve
+  as its been more than 5 years.
 
   13 Mar 2015; Mikle Kolyada <zlogene@gentoo.org> gettext-0.19.3.ebuild:
   alpha stable wrt bug #528242

diff --git a/sys-devel/gettext/gettext-0.19.3.ebuild b/sys-devel/gettext/gettext-0.19.3.ebuild
index d86fc289275016db497615f8a69022bcf2d55359..8f500c83224b27b5ebbec333db6425258b439eeb 100644 (file)
--- a/sys-devel/gettext/gettext-0.19.3.ebuild
+++ b/sys-devel/gettext/gettext-0.19.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.19.3.ebuild,v 1.10 2015/03/13 19:38:49 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.19.3.ebuild,v 1.11 2015/03/19 19:39:58 vapier Exp $
 
 EAPI="4"
 
@@ -15,12 +15,6 @@ 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.xz"
-       KEYWORDS=""
-       S="${WORKDIR}/${P/_/-}"
-fi
-
 # only runtime goes multilib
 DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
        dev-libs/libxml2
@@ -144,14 +138,5 @@ multilib_src_install_all() {
 }
 
 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.ebuild b/sys-devel/gettext/gettext-0.19.4.ebuild
index e90f29297cbecf23a022a26493ca053bf2de9cb1..d5bf409e54a4b15518e9d6cc9834edd95b38ce00 100644 (file)
--- a/sys-devel/gettext/gettext-0.19.4.ebuild
+++ b/sys-devel/gettext/gettext-0.19.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.ebuild,v 1.1 2014/12/24 12:59:55 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.19.4.ebuild,v 1.2 2015/03/19 19:39:58 vapier Exp $
 
 EAPI="4"
 
@@ -15,12 +15,6 @@ 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.xz"
-       KEYWORDS=""
-       S="${WORKDIR}/${P/_/-}"
-fi
-
 # only runtime goes multilib
 DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
        dev-libs/libxml2
@@ -144,14 +138,5 @@ multilib_src_install_all() {
 }
 
 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)
-}