summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2014-04-06 09:14:16 +0000
committerPacho Ramos <pacho@gentoo.org>2014-04-06 09:14:16 +0000
commit6a859e0a77fdece7d6dd3a4f4fe92973c0e03c1b (patch)
treec06ba696a0d84ac22e83815438b202f6ae1c3018 /app-emulation
parentVersion bump, drop old (diff)
downloadgentoo-2-6a859e0a77fdece7d6dd3a4f4fe92973c0e03c1b.tar.gz
gentoo-2-6a859e0a77fdece7d6dd3a4f4fe92973c0e03c1b.tar.bz2
gentoo-2-6a859e0a77fdece7d6dd3a4f4fe92973c0e03c1b.zip
Version bump, drop old
(Portage version: 2.2.8-r1/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/emul-linux-x86-xlibs/ChangeLog10
-rw-r--r--app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20130224.ebuild48
-rw-r--r--app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20140406.ebuild89
3 files changed, 97 insertions, 50 deletions
diff --git a/app-emulation/emul-linux-x86-xlibs/ChangeLog b/app-emulation/emul-linux-x86-xlibs/ChangeLog
index 3098a1cd209b..e20e9af6572d 100644
--- a/app-emulation/emul-linux-x86-xlibs/ChangeLog
+++ b/app-emulation/emul-linux-x86-xlibs/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-emulation/emul-linux-x86-xlibs
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.127 2013/11/22 19:34:49 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/ChangeLog,v 1.128 2014/04/06 09:14:16 pacho Exp $
+
+*emul-linux-x86-xlibs-20140406 (06 Apr 2014)
+
+ 06 Apr 2014; Pacho Ramos <pacho@gentoo.org>
+ +emul-linux-x86-xlibs-20140406.ebuild, -emul-linux-x86-xlibs-20130224.ebuild:
+ Version bump, drop old
22 Nov 2013; Pacho Ramos <pacho@gentoo.org>
emul-linux-x86-xlibs-20131008.ebuild:
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20130224.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20130224.ebuild
deleted file mode 100644
index 9f1a78ef33ea..000000000000
--- a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20130224.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20130224.ebuild,v 1.3 2013/03/16 15:24:19 pacho Exp $
-
-EAPI=5
-inherit emul-linux-x86
-
-LICENSE="FTL GPL-2 MIT"
-
-KEYWORDS="-* amd64"
-IUSE="opengl"
-
-DEPEND=""
-RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
- x11-libs/libX11
- opengl? ( app-emulation/emul-linux-x86-opengl )
-
- !media-libs/fontconfig[abi_x86_32]
- !media-libs/freetype[abi_x86_32]
- !x11-libs/libICE[abi_x86_32]
- !x11-libs/libpciaccess[abi_x86_32]
- !x11-libs/libSM[abi_x86_32]
- !x11-libs/libvdpau[abi_x86_32]
- !x11-libs/libX11[abi_x86_32]
- !x11-libs/libXau[abi_x86_32]
- !x11-libs/libXaw[abi_x86_32]
- !x11-libs/libxcb[abi_x86_32]
- !x11-libs/libXcomposite[abi_x86_32]
- !x11-libs/libXcursor[abi_x86_32]
- !x11-libs/libXdamage[abi_x86_32]
- !x11-libs/libXdmcp[abi_x86_32]
- !x11-libs/libXext[abi_x86_32]
- !x11-libs/libXfixes[abi_x86_32]
- !x11-libs/libXft[abi_x86_32]
- !x11-libs/libXi[abi_x86_32]
- !x11-libs/libXinerama[abi_x86_32]
- !x11-libs/libXmu[abi_x86_32]
- !x11-libs/libXp[abi_x86_32]
- !x11-libs/libXpm[abi_x86_32]
- !x11-libs/libXrandr[abi_x86_32]
- !x11-libs/libXrender[abi_x86_32]
- !x11-libs/libXScrnSaver[abi_x86_32]
- !x11-libs/libXt[abi_x86_32]
- !x11-libs/libXtst[abi_x86_32]
- !x11-libs/libXv[abi_x86_32]
- !x11-libs/libXvMC[abi_x86_32]
- !x11-libs/libXxf86dga[abi_x86_32]
- !x11-libs/libXxf86vm[abi_x86_32]"
diff --git a/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20140406.ebuild b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20140406.ebuild
new file mode 100644
index 000000000000..026385d65f57
--- /dev/null
+++ b/app-emulation/emul-linux-x86-xlibs/emul-linux-x86-xlibs-20140406.ebuild
@@ -0,0 +1,89 @@
+# 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-xlibs/emul-linux-x86-xlibs-20140406.ebuild,v 1.1 2014/04/06 09:14:16 pacho Exp $
+
+EAPI=5
+inherit emul-linux-x86
+
+SRC_URI="!abi_x86_32? ( ${SRC_URI} )"
+LICENSE="!abi_x86_32? ( FTL GPL-2 MIT ) abi_x86_32? ( metapackage )"
+KEYWORDS="-* ~amd64"
+IUSE="abi_x86_32 opengl"
+
+DEPEND=""
+RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
+ x11-libs/libX11
+ opengl? ( app-emulation/emul-linux-x86-opengl )
+
+ !abi_x86_32? (
+ !media-libs/fontconfig[abi_x86_32(-)]
+ !media-libs/freetype[abi_x86_32(-)]
+ !x11-libs/libICE[abi_x86_32(-)]
+ !x11-libs/libpciaccess[abi_x86_32(-)]
+ !x11-libs/libSM[abi_x86_32(-)]
+ !x11-libs/libvdpau[abi_x86_32(-)]
+ !x11-libs/libX11[abi_x86_32(-)]
+ !x11-libs/libXau[abi_x86_32(-)]
+ !x11-libs/libXaw[abi_x86_32(-)]
+ !x11-libs/libxcb[abi_x86_32(-)]
+ !x11-libs/libXcomposite[abi_x86_32(-)]
+ !x11-libs/libXcursor[abi_x86_32(-)]
+ !x11-libs/libXdamage[abi_x86_32(-)]
+ !x11-libs/libXdmcp[abi_x86_32(-)]
+ !x11-libs/libXext[abi_x86_32(-)]
+ !x11-libs/libXfixes[abi_x86_32(-)]
+ !x11-libs/libXft[abi_x86_32(-)]
+ !x11-libs/libXi[abi_x86_32(-)]
+ !x11-libs/libXinerama[abi_x86_32(-)]
+ !x11-libs/libXmu[abi_x86_32(-)]
+ !x11-libs/libXp[abi_x86_32(-)]
+ !x11-libs/libXpm[abi_x86_32(-)]
+ !x11-libs/libXrandr[abi_x86_32(-)]
+ !x11-libs/libXrender[abi_x86_32(-)]
+ !x11-libs/libXScrnSaver[abi_x86_32(-)]
+ !x11-libs/libXt[abi_x86_32(-)]
+ !x11-libs/libXtst[abi_x86_32(-)]
+ !x11-libs/libXv[abi_x86_32(-)]
+ !x11-libs/libXvMC[abi_x86_32(-)]
+ !x11-libs/libXxf86dga[abi_x86_32(-)]
+ !x11-libs/libXxf86vm[abi_x86_32(-)] )
+ abi_x86_32? (
+ media-libs/fontconfig[abi_x86_32(-)]
+ media-libs/freetype[abi_x86_32(-)]
+ x11-libs/libICE[abi_x86_32(-)]
+ x11-libs/libpciaccess[abi_x86_32(-)]
+ x11-libs/libSM[abi_x86_32(-)]
+ x11-libs/libvdpau[abi_x86_32(-)]
+ x11-libs/libX11[abi_x86_32(-)]
+ x11-libs/libXau[abi_x86_32(-)]
+ x11-libs/libXaw[abi_x86_32(-)]
+ x11-libs/libxcb[abi_x86_32(-)]
+ x11-libs/libXcomposite[abi_x86_32(-)]
+ x11-libs/libXcursor[abi_x86_32(-)]
+ x11-libs/libXdamage[abi_x86_32(-)]
+ x11-libs/libXdmcp[abi_x86_32(-)]
+ x11-libs/libXext[abi_x86_32(-)]
+ x11-libs/libXfixes[abi_x86_32(-)]
+ x11-libs/libXft[abi_x86_32(-)]
+ x11-libs/libXi[abi_x86_32(-)]
+ x11-libs/libXinerama[abi_x86_32(-)]
+ x11-libs/libXmu[abi_x86_32(-)]
+ x11-libs/libXp[abi_x86_32(-)]
+ x11-libs/libXpm[abi_x86_32(-)]
+ x11-libs/libXrandr[abi_x86_32(-)]
+ x11-libs/libXrender[abi_x86_32(-)]
+ x11-libs/libXScrnSaver[abi_x86_32(-)]
+ x11-libs/libXt[abi_x86_32(-)]
+ x11-libs/libXtst[abi_x86_32(-)]
+ x11-libs/libXv[abi_x86_32(-)]
+ x11-libs/libXvMC[abi_x86_32(-)]
+ x11-libs/libXxf86dga[abi_x86_32(-)]
+ x11-libs/libXxf86vm[abi_x86_32(-)] )"
+
+src_prepare() {
+ use abi_x86_32 || emul-linux-x86_src_prepare
+}
+
+src_install() {
+ use abi_x86_32 || emul-linux-x86_src_install
+}