[gentoo-commits] gentoo-x86 commit in app-emulation/emul-linux-x86-baselibs: emul-linux-x86-baselibs-20131008-r16.ebuild ChangeLog

[Samuli Suominen (ssuominen)]

ssuominen    14/02/10 06:58:10

  Modified:             ChangeLog
  Added:                emul-linux-x86-baselibs-20131008-r16.ebuild
  Log:
  Only move the jpeg files to /usr/lib32/emul-linux with USE="abi_x86_32" wrt #500740
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

Revision  Changes    Path
1.182                app-emulation/emul-linux-x86-baselibs/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog?rev=1.182&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog?rev=1.182&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog?r1=1.181&r2=1.182

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- ChangeLog	9 Feb 2014 17:47:41 -0000	1.181
+++ ChangeLog	10 Feb 2014 06:58:10 -0000	1.182
@@ -1,6 +1,14 @@
 # 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.181 2014/02/09 17:47:41 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-baselibs/ChangeLog,v 1.182 2014/02/10 06:58:10 ssuominen Exp $
+
+*emul-linux-x86-baselibs-20131008-r16 (10 Feb 2014)
+
+  10 Feb 2014; Samuli Suominen <ssuominen@g.o>
+  +emul-linux-x86-baselibs-20131008-r16.ebuild,
+  +files/remove-native-20131008-r16:
+  Only move the jpeg files to /usr/lib32/emul-linux with USE="abi_x86_32" wrt
+  #500740
 
 *emul-linux-x86-baselibs-20131008-r15 (09 Feb 2014)
 



1.1                  app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r16.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r16.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-baselibs/emul-linux-x86-baselibs-20131008-r16.ebuild?rev=1.1&content-type=text/plain

Index: emul-linux-x86-baselibs-20131008-r16.ebuild
===================================================================
# 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-20131008-r16.ebuild,v 1.1 2014/02/10 06:58:10 ssuominen Exp $

EAPI=5
inherit emul-linux-x86

LICENSE="Artistic GPL-1 GPL-2 GPL-3 BSD BSD-2 BZIP2 AFL-2.1 LGPL-2.1 BSD-4 MIT
	public-domain LGPL-3 LGPL-2 GPL-2-with-exceptions MPL-1.1 OPENLDAP
	Sleepycat UoI-NCSA ZLIB openafs-krb5-a HPND ISC RSA IJG libmng libtiff
	openssl tcp_wrappers_license"

KEYWORDS="-* ~amd64"
IUSE="abi_x86_32"

DEPEND=""
RDEPEND="!<app-emulation/emul-linux-x86-medialibs-10.2
	abi_x86_32? (
		>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
		>=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)]
		>=media-libs/libpng-1.5.16-r1:0[abi_x86_32(-)]
		>=dev-libs/udis86-1.7-r2[abi_x86_32(-)]
		>=virtual/libffi-3.0.13-r1[abi_x86_32(-)]
		>=sys-devel/llvm-3.3-r1[abi_x86_32(-)]
		>=media-libs/libpng-1.2.50-r1:1.2[abi_x86_32(-)]
		virtual/jpeg:62[abi_x86_32(-)]
		>=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)]
		>=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)]
		>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)]
		>=virtual/libusb-0-r1:0[abi_x86_32(-)]
		>=virtual/libusb-1-r1:1[abi_x86_32(-)]
		|| (
			>=virtual/udev-206-r1[abi_x86_32(-)]
			~virtual/udev-204[abi_x86_32(-)] )
		>=media-libs/tiff-4.0.3-r5:0[abi_x86_32(-)]
		>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
		>=dev-libs/glib-2.36.3-r2:2[abi_x86_32(-)]
		>=media-libs/lcms-2.5-r1:2[abi_x86_32(-)]
		>=app-text/libpaper-1.1.24-r2[abi_x86_32(-)]
		>=media-libs/tiff-3.9.7-r1:3[abi_x86_32(-)]
		|| (
			>=dev-libs/elfutils-0.155-r1[abi_x86_32(-)]
			>=dev-libs/libelf-0.8.13-r2[abi_x86_32(-)]
		)
		>=sys-libs/e2fsprogs-libs-1.42.7-r1[abi_x86_32(-)]
		>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
		>=sys-libs/gpm-1.20.7-r2[abi_x86_32(-)]
		>=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)]
		>=dev-libs/libpcre-8.33-r1[abi_x86_32(-)]
		>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
		>=sys-apps/tcp-wrappers-7.6.22-r1[abi_x86_32(-)]
		>=sys-libs/gdbm-1.10-r1[abi_x86_32(-)]
		>=dev-libs/json-c-0.11-r1[abi_x86_32(-)]
		>=dev-libs/libxml2-2.9.1-r2[abi_x86_32(-)]
		>=dev-libs/dbus-glib-0.100.2-r1[abi_x86_32(-)]
		>=sys-libs/readline-6.2_p5-r1:0[abi_x86_32(-)]
		>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
		>=dev-libs/libgpg-error-1.12-r1[abi_x86_32(-)]
		>=dev-db/sqlite-3.8.3:3[abi_x86_32(-)]
	)
	>=sys-libs/glibc-2.15" # bug 340613

PYTHON_UPDATER_IGNORE="1"

src_prepare() {
	export ALLOWED="(${S}/lib32/security/pam_filter/upperLOWER|${S}/etc/env.d|${S}/lib32/security/pam_ldap.so)"
	emul-linux-x86_src_prepare
	rm -rf "${S}/etc/env.d/binutils/" \
			"${S}/usr/i686-pc-linux-gnu/lib" \
			"${S}/usr/lib32/engines/" \
			"${S}/usr/lib32/openldap/" || die

	ln -s ../share/terminfo "${S}/usr/lib32/terminfo" || die

	# Remove migrated stuff.
	use abi_x86_32 && rm -f $(cat "${FILESDIR}/remove-native-${PVR}")
}

src_install() {
	emul-linux-x86_src_install

	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
}