Re-add forgotten gtk+ 1.2 and ignore execstack problem

(Portage version: 2.1.1-r1)
 (Signed Manifest commit)

3 files changed, 15 insertions, 50 deletions

diff --git a/app-emulation/emul-linux-x86-gtklibs/Manifest b/app-emulation/emul-linux-x86-gtklibs/Manifest
index 9e2789253501..abead9f367e2 100644
--- a/app-emulation/emul-linux-x86-gtklibs/Manifest
+++ b/app-emulation/emul-linux-x86-gtklibs/Manifest
@@ -5,13 +5,13 @@ AUX 50emul-linux-x86-gtklibs 14 RMD160 bfec6865ba08ad120cfb30218b31b50120a55931
 MD5 c5be4cc3b169ef841633df1d37e28a64 files/50emul-linux-x86-gtklibs 14
 RMD160 bfec6865ba08ad120cfb30218b31b50120a55931 files/50emul-linux-x86-gtklibs 14
 SHA256 82ec78c260f9f7c1a0bd0ad98dd2cf70bc1d09cc57bfb43e7d690999f7a4e7aa files/50emul-linux-x86-gtklibs 14
-DIST emul-linux-x86-gtklibs-2.10.6.tar.bz2 2580004 RMD160 0f91d9ab88be34f8b759234d23e6a8ce7b03e613 SHA1 c849fda28cc673ffc2e52cb7be21a1aaaadeaeb4 SHA256 b90e087864289d931c9d7f450c2afc6810d8dd6cd0016a73547dd8d0b9d1473c
+DIST emul-linux-x86-gtklibs-2.10.6.1.tar.bz2 3095168 RMD160 fffb4fbb57b2991df2f97373775a8911e4907c69 SHA1 390dbefb437060b3c169b25caf2951a1b008c6a5 SHA256 2dde27d8232ec9b1890df271bbb8b76be7fe02395e697402ce48549db3929273
 DIST emul-linux-x86-gtklibs-2.3.tar.bz2 2690115 RMD160 d5a16f34cd9f8c3fd9b4b9ca069ebd4fbeaa970d SHA256 10b896194a0d1a35fec449620351a02cd333951c0c8bf35432d9217639198f10
 DIST emul-linux-x86-gtklibs-2.8.8.tar.bz2 2892105 RMD160 7bddf9725383e69519e4c70cd24750a9a806ae4f SHA1 15ab80b48fbb3e7b12ebba5fb85bef9abe4c17d5 SHA256 f48bfe53cb064e68cebb48920d8d54df7e215c6b860ec34cd56b4a27f2047b90
-EBUILD emul-linux-x86-gtklibs-2.10.6.ebuild 994 RMD160 4cb616cc0ce482d9cc1269e230dd1cabaf65409f SHA1 c4c14968ccce1613324349c676bcb5bc7cf6e964 SHA256 e961c37b26e72551cb17b680d44521e5597018df778540284b27f59567410a88
-MD5 787524615a941be32a2cdd24b2164acf emul-linux-x86-gtklibs-2.10.6.ebuild 994
-RMD160 4cb616cc0ce482d9cc1269e230dd1cabaf65409f emul-linux-x86-gtklibs-2.10.6.ebuild 994
-SHA256 e961c37b26e72551cb17b680d44521e5597018df778540284b27f59567410a88 emul-linux-x86-gtklibs-2.10.6.ebuild 994
+EBUILD emul-linux-x86-gtklibs-2.10.6.1.ebuild 1119 RMD160 1269c24373416080b9dc6e6af7aa352482391812 SHA1 ee28a6215e4c2bdd39561abd55cc872e04533f01 SHA256 fc13454cd265bfd6f7d565aeec555c2aec87b8d5ba2ccc0b7ea757a3189394c8
+MD5 f25d1722b6325d77b7325a8b218d9aeb emul-linux-x86-gtklibs-2.10.6.1.ebuild 1119
+RMD160 1269c24373416080b9dc6e6af7aa352482391812 emul-linux-x86-gtklibs-2.10.6.1.ebuild 1119
+SHA256 fc13454cd265bfd6f7d565aeec555c2aec87b8d5ba2ccc0b7ea757a3189394c8 emul-linux-x86-gtklibs-2.10.6.1.ebuild 1119
 EBUILD emul-linux-x86-gtklibs-2.3.ebuild 717 RMD160 d9792c9f4fcf571f2d4629d76f6e90ab825149a3 SHA1 c759659063e3437b8a8b247e82d68e61f36694d3 SHA256 e3d4c8639166c3ac4d8608a6df378e18ddb1eb7c7fbe46f26a917ce726b65c77
 MD5 90c3b7bf6adad67e1aa764d6125413dc emul-linux-x86-gtklibs-2.3.ebuild 717
 RMD160 d9792c9f4fcf571f2d4629d76f6e90ab825149a3 emul-linux-x86-gtklibs-2.3.ebuild 717
@@ -20,17 +20,17 @@ EBUILD emul-linux-x86-gtklibs-2.8.8.ebuild 915 RMD160 5627617607b56d0513f3f6fe48
 MD5 5e9a1256a46832edbed281cfe43ccf3e emul-linux-x86-gtklibs-2.8.8.ebuild 915
 RMD160 5627617607b56d0513f3f6fe488b672f37168e41 emul-linux-x86-gtklibs-2.8.8.ebuild 915
 SHA256 f476dd92fff23a484f8f56cdb0217dc4f476832b8a86307809a3172935e7181d emul-linux-x86-gtklibs-2.8.8.ebuild 915
-MISC ChangeLog 4793 RMD160 55dcfcdc3ab35b49da0d07992236467632f3f4b0 SHA1 e3a8b0fb7e1e01e1e962a8d126166acdf5005a06 SHA256 97e91506ce85dfbc003f6613677ec2b95f383b38424de96b1fea3c683f625093
-MD5 aad0022c92bbe1bfa3883d218e9dbc76 ChangeLog 4793
-RMD160 55dcfcdc3ab35b49da0d07992236467632f3f4b0 ChangeLog 4793
-SHA256 97e91506ce85dfbc003f6613677ec2b95f383b38424de96b1fea3c683f625093 ChangeLog 4793
+MISC ChangeLog 5033 RMD160 1394fbfbfbd2389af5945cd629b04383b76c2b7d SHA1 9aa21a85c52b78c553b0171c707f239f1c108e08 SHA256 4c6919c1925b2a863c9875043dd348db9bfe12b7d63194638c989c135d3d35d9
+MD5 27eb16d9cebf6ee510320ffb66e73663 ChangeLog 5033
+RMD160 1394fbfbfbd2389af5945cd629b04383b76c2b7d ChangeLog 5033
+SHA256 4c6919c1925b2a863c9875043dd348db9bfe12b7d63194638c989c135d3d35d9 ChangeLog 5033
 MISC metadata.xml 290 RMD160 29c2eafcf00e4b115ba5ae455218ee6eebda67ae SHA1 281918720fd1d692578d6419193b1027a1014b6a SHA256 8f04703141bc8cd55a0e56bf7593f657a891ed4796e71e3d6e8770c7ea098c30
 MD5 5e8c61d551dad88488a66992865ba737 metadata.xml 290
 RMD160 29c2eafcf00e4b115ba5ae455218ee6eebda67ae metadata.xml 290
 SHA256 8f04703141bc8cd55a0e56bf7593f657a891ed4796e71e3d6e8770c7ea098c30 metadata.xml 290
-MD5 89ebd21e5ae99a0917fcef09d58897c3 files/digest-emul-linux-x86-gtklibs-2.10.6 295
-RMD160 d85b4f41c4bda98e0c3f0a7cbc4cc55e4bd1558e files/digest-emul-linux-x86-gtklibs-2.10.6 295
-SHA256 d0485c2be868d0f0d7a002f8225bd5f2cd8481490fd33548d3a71a6a7d922212 files/digest-emul-linux-x86-gtklibs-2.10.6 295
+MD5 0a31bf1c0bb4e61ab91d9ec88bdf27c7 files/digest-emul-linux-x86-gtklibs-2.10.6.1 301
+RMD160 b7e392f18bb0d97bc8280e7164af2e0ae8bdfd2c files/digest-emul-linux-x86-gtklibs-2.10.6.1 301
+SHA256 67a35ef11cf01136690aeeaff6b481f0ae9140499dd2a175d0c4a1faf3b4476b files/digest-emul-linux-x86-gtklibs-2.10.6.1 301
 MD5 dde1c39ebe5ff5a04df275249673c985 files/digest-emul-linux-x86-gtklibs-2.3 286
 RMD160 45c147ccbbb6c8015f12cfcf03827f1da70e1fc6 files/digest-emul-linux-x86-gtklibs-2.3 286
 SHA256 ad464c8cc5d24fab736338b88a1028c9f4260cfe16d50b9c45e78e190d15ce06 files/digest-emul-linux-x86-gtklibs-2.3 286
@@ -40,7 +40,7 @@ SHA256 ca07ffba3c41994c96fae1596ef72e23718e5b5e4042acea834ddf76aa7ec754 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFVYgOmOfEJZHYOKcRAgLPAJ0XfDyZ8NASvgj/DtozE7JMMz1DPgCgjh5W
-UwYpIr2GD4BodLYaO7yxi4Q=
-=LInd
+iD8DBQFFVjkYmOfEJZHYOKcRAoS/AJ9zUG9oCgz5bh16BYFyTerkqBsgCwCffaCf
+DAxTnUuXzOpAddfrWNaas98=
+=F70L
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-2.10.6.ebuild b/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-2.10.6.ebuild
deleted file mode 100644
index c53cebc1e31f..000000000000
--- a/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-2.10.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-2.10.6.ebuild,v 1.1 2006/11/11 08:21:26 tester Exp $
-
-DESCRIPTION="Gtk+ 1/2 for emulation of 32bit x86 on amd64"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-		http://dev.gentoo.org/~tester/dist/emul/${P}.tar.bz2"
-HOMEPAGE="http://www.gentoo.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="-* ~amd64"
-IUSE="qt3"
-
-S="${WORKDIR}"
-
-RDEPEND=">=app-emulation/emul-linux-x86-xlibs-2.0
-	>=app-emulation/emul-linux-x86-baselibs-2.5.3
-	x11-libs/pango
-	>=x11-libs/gtk+-2.10
-	>=x11-themes/gtk-engines-2.8
-	qt3? ( >=app-emulation/emul-linux-x86-qtlibs-3.4.4 )"
-
-RESTRICT="nostrip"
-
-src_install() {
-	# Avoid dep on qtlibs if qt support not required
-	use !qt3 && rm -f "${WORKDIR}/emul/linux/x86/usr/lib/gtk-2.0/2.4.0/engines/libqtengine.so"
-
-	cp -RPvf ${WORKDIR}/* ${D}/
-	doenvd ${FILESDIR}/50emul-linux-x86-gtklibs
-}
diff --git a/app-emulation/emul-linux-x86-gtklibs/files/digest-emul-linux-x86-gtklibs-2.10.6 b/app-emulation/emul-linux-x86-gtklibs/files/digest-emul-linux-x86-gtklibs-2.10.6
deleted file mode 100644
index f56f9aa8e9e6..000000000000
--- a/app-emulation/emul-linux-x86-gtklibs/files/digest-emul-linux-x86-gtklibs-2.10.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2caa06ec72b83bdf2d34f5c0a58c017b emul-linux-x86-gtklibs-2.10.6.tar.bz2 2580004
-RMD160 0f91d9ab88be34f8b759234d23e6a8ce7b03e613 emul-linux-x86-gtklibs-2.10.6.tar.bz2 2580004
-SHA256 b90e087864289d931c9d7f450c2afc6810d8dd6cd0016a73547dd8d0b9d1473c emul-linux-x86-gtklibs-2.10.6.tar.bz2 2580004