diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2007-02-26 01:32:09 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2007-02-26 01:32:09 +0000 |
| commit | 0031cebe4b9870b6d025b505198279b0fdc8c53e (patch) | |
| tree | 55f26f31ebeb472b83130d271e0af74cbd700707 /sys-devel | |
| parent | Stable for HPPA (bug #165555). (diff) | |
| download | gentoo-2-0031cebe4b9870b6d025b505198279b0fdc8c53e.tar.gz gentoo-2-0031cebe4b9870b6d025b505198279b0fdc8c53e.tar.bz2 gentoo-2-0031cebe4b9870b6d025b505198279b0fdc8c53e.zip | |
Use preserve_old_lib rather than screwing with $ROOT ourselves #168046.
(Portage version: 2.1.2-r10)
Diffstat (limited to 'sys-devel')
| -rw-r--r-- | sys-devel/gettext/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-devel/gettext/gettext-0.16.1.ebuild | 25 |
2 files changed, 13 insertions, 17 deletions
diff --git a/sys-devel/gettext/ChangeLog b/sys-devel/gettext/ChangeLog index 7b01e2277caa..4235018efe0e 100644 --- a/sys-devel/gettext/ChangeLog +++ b/sys-devel/gettext/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-devel/gettext # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.141 2007/02/21 18:16:35 eroyf Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.142 2007/02/26 01:32:09 vapier Exp $ + + 26 Feb 2007; Mike Frysinger <vapier@gentoo.org> gettext-0.16.1.ebuild: + Use preserve_old_lib rather than screwing with $ROOT ourselves #168046. 21 Feb 2007; Alexander H. Færøy <eroyf@gentoo.org> gettext-0.16.1.ebuild: diff --git a/sys-devel/gettext/gettext-0.16.1.ebuild b/sys-devel/gettext/gettext-0.16.1.ebuild index c9754b498df4..f8d05e35dc28 100644 --- a/sys-devel/gettext/gettext-0.16.1.ebuild +++ b/sys-devel/gettext/gettext-0.16.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.16.1.ebuild,v 1.10 2007/02/21 18:16:35 eroyf Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.16.1.ebuild,v 1.11 2007/02/26 01:32:09 vapier Exp $ inherit flag-o-matic eutils multilib toolchain-funcs mono libtool elisp-common @@ -71,21 +71,7 @@ src_install() { fi rm -f "${D}"/usr/share/locale/locale.alias "${D}"/usr/lib/charset.alias - # older gettext's sometimes installed libintl ... - # need to keep the linked version or the system - # could die (things like sed link against it :/) - local libname="libintl$(get_libname 7)" - if [[ -e ${ROOT}/usr/$(get_libdir)/${libname} ]] ; then - cp -pPR ${ROOT}/usr/$(get_libdir)/${libname}* "${D}"/usr/$(get_libdir)/ - touch "${D}"/usr/$(get_libdir)/${libname}* - fi - if [[ -e ${ROOT}/$(get_libdir)/${libname} ]] ; then - dodir /$(get_libdir) - cp -pPR ${ROOT}/$(get_libdir)/${libname}* "${D}"/$(get_libdir)/ - touch "${D}"/$(get_libdir)/${libname}* - fi - - if [[ $USERLAND == "BSD" ]] ; then + if [[ ${USERLAND} == "BSD" ]] ; then libname="libintl$(get_libname 8)" # Move dynamic libs and creates ldscripts into /usr/lib dodir /$(get_libdir) @@ -110,6 +96,13 @@ src_install() { 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() { use emacs && elisp-site-regen ewarn "Any package that linked against the previous version" |