diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2014-04-12 08:34:06 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2014-04-12 08:34:06 +0000 |
| commit | 3734646ac5957ff98712df09c66bfda11be79c01 (patch) | |
| tree | eb51b1a0b629918aa2220ad58ab2057711f6a791 /app-emulation | |
| parent | Update to newer openssl due security bug (diff) | |
| download | gentoo-2-3734646ac5957ff98712df09c66bfda11be79c01.tar.gz gentoo-2-3734646ac5957ff98712df09c66bfda11be79c01.tar.bz2 gentoo-2-3734646ac5957ff98712df09c66bfda11be79c01.zip | |
libjpeg.8 hacks shouldn't be needed anymore
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/emul-linux-x86-baselibs/ChangeLog | 6 | ||||
| -rw-r--r-- | app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406-r1.ebuild | 12 |
2 files changed, 6 insertions, 12 deletions
diff --git a/app-emulation/emul-linux-x86-baselibs/ChangeLog b/app-emulation/emul-linux-x86-baselibs/ChangeLog index a643db68e677..0bec6f1fb922 100644 --- a/app-emulation/emul-linux-x86-baselibs/ChangeLog +++ b/app-emulation/emul-linux-x86-baselibs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/emul-linux-x86-baselibs # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.191 2014/04/12 08:32:19 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.192 2014/04/12 08:34:06 pacho Exp $ + + 12 Apr 2014; Pacho Ramos <pacho@gentoo.org> + emul-linux-x86-baselibs-20140406-r1.ebuild: + libjpeg.8 hacks shouldn't be needed anymore *emul-linux-x86-baselibs-20140406-r1 (12 Apr 2014) diff --git a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406-r1.ebuild b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406-r1.ebuild index 4c8b9440e974..721e56a07998 100644 --- a/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406-r1.ebuild +++ b/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406-r1.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/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406-r1.ebuild,v 1.1 2014/04/12 08:32:19 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20140406-r1.ebuild,v 1.2 2014/04/12 08:34:06 pacho Exp $ EAPI=5 inherit emul-linux-x86 @@ -88,14 +88,4 @@ src_prepare() { src_install() { emul-linux-x86_src_install rm -rf "${ED}"/usr/include # needed for openssl tbz2 - - if use abi_x86_32; then - local x86_libdir=$(get_abi_LIBDIR x86) - LIBDIR=${EPREFIX}/usr/${x86_libdir}/emul-linux - echo "LDPATH=${LIBDIR}" > 99emul-linux-x86-baselibs - doenvd 99emul-linux-x86-baselibs - - mkdir -p "${ED}${LIBDIR}" - mv "${ED}"/usr/${x86_libdir}/{libjpeg.so.8*,libturbojpeg.so.0*} "${D}${LIBDIR}"/ - fi } |