summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2007-08-04 16:41:44 +0000
committerFabian Groffen <grobian@gentoo.org>2007-08-04 16:41:44 +0000
commitaa457bd544d390aa54131069169442671126f6ef (patch)
tree1107e1bdedcc22fc4be7a781c65e061d0152ec35 /sys-devel/gettext
parentMarked stable on amd64 as per bug 178690. (diff)
downloadgentoo-2-aa457bd544d390aa54131069169442671126f6ef.tar.gz
gentoo-2-aa457bd544d390aa54131069169442671126f6ef.tar.bz2
gentoo-2-aa457bd544d390aa54131069169442671126f6ef.zip
whatever BSD does here, is non-standard, so don't break it
(Portage version: 2.1.2.9)
Diffstat (limited to 'sys-devel/gettext')
-rw-r--r--sys-devel/gettext/gettext-0.16.1-r1.ebuild9
-rw-r--r--sys-devel/gettext/gettext-0.16.1.ebuild9
2 files changed, 10 insertions, 8 deletions
diff --git a/sys-devel/gettext/gettext-0.16.1-r1.ebuild b/sys-devel/gettext/gettext-0.16.1-r1.ebuild
index 41048000cc70..b659d4ce4684 100644
--- a/sys-devel/gettext/gettext-0.16.1-r1.ebuild
+++ b/sys-devel/gettext/gettext-0.16.1-r1.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-r1.ebuild,v 1.4 2007/08/04 16:03:00 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.16.1-r1.ebuild,v 1.5 2007/08/04 16:41:44 grobian Exp $
inherit flag-o-matic eutils multilib toolchain-funcs mono libtool
@@ -74,11 +74,12 @@ src_install() {
fi
rm -f "${D}"/usr/share/locale/locale.alias "${D}"/usr/lib/charset.alias
- if use !elibc_glibc ; then
+ if [[ ${USERLAND} == "BSD" ]] ; then
+ libname="libintl$(get_libname 8)"
# Move dynamic libs and creates ldscripts into /usr/lib
dodir /$(get_libdir)
- mv "${D}"/usr/$(get_libdir)/libintl*$(get_libname)* "${D}"/$(get_libdir)/
- gen_usr_ldscript libintl$(get_libname 8)
+ mv "${D}"/usr/$(get_libdir)/${libname}* "${D}"/$(get_libdir)/
+ gen_usr_ldscript ${libname}
fi
if use doc ; then
diff --git a/sys-devel/gettext/gettext-0.16.1.ebuild b/sys-devel/gettext/gettext-0.16.1.ebuild
index 3af0d6929494..9babe5e4851f 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.14 2007/08/04 16:03:00 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.16.1.ebuild,v 1.15 2007/08/04 16:41:44 grobian Exp $
inherit flag-o-matic eutils multilib toolchain-funcs mono libtool elisp-common
@@ -71,11 +71,12 @@ src_install() {
fi
rm -f "${D}"/usr/share/locale/locale.alias "${D}"/usr/lib/charset.alias
- if use !elibc_glibc ; then
+ if [[ ${USERLAND} == "BSD" ]] ; then
+ libname="libintl$(get_libname 8)"
# Move dynamic libs and creates ldscripts into /usr/lib
dodir /$(get_libdir)
- mv "${D}"/usr/$(get_libdir)/libintl*$(get_libname)* "${D}"/$(get_libdir)/
- gen_usr_ldscript libintl$(get_libname 8)
+ mv "${D}"/usr/$(get_libdir)/${libname}* "${D}"/$(get_libdir)/
+ gen_usr_ldscript ${libname}
fi
if use doc ; then