Version bump; remove old

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

3 files changed, 30 insertions, 23 deletions

diff --git a/sci-electronics/klayout/ChangeLog b/sci-electronics/klayout/ChangeLog
index 6aba8ffeee19..2c19d5b1a15e 100644
--- a/sci-electronics/klayout/ChangeLog
+++ b/sci-electronics/klayout/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-electronics/klayout
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/klayout/ChangeLog,v 1.8 2011/07/25 22:05:21 dilfridge Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/klayout/ChangeLog,v 1.9 2012/06/11 19:29:04 dilfridge Exp $
+
+*klayout-0.21.12 (11 Jun 2012)
+
+  11 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  -klayout-0.21.10.ebuild, +klayout-0.21.12.ebuild:
+  Version bump; remove old
 
 *klayout-0.21.11 (25 Jul 2011)
 
diff --git a/sci-electronics/klayout/Manifest b/sci-electronics/klayout/Manifest
index 49dcee7c3102..34019e8abdc4 100644
--- a/sci-electronics/klayout/Manifest
+++ b/sci-electronics/klayout/Manifest
@@ -6,27 +6,27 @@ AUX klayout-0.20.2-configureonly.patch 767 RMD160 658e32a3a6349571e43a8872ed4ae4
 AUX klayout-0.21.10-gcc46.patch 387 RMD160 b407e1f027007c566f4f7325806fbe29fa1acdf4 SHA1 1bd84c155aaade44a459c57ab3510015c88df614 SHA256 137998f08a33173822ac6f322a7180451a2166e2cf885573b09ba563f2c7972c
 AUX klayout-0.21.7-Makefile.conf.linux-gentoo 917 RMD160 30db9754d812069de2310532f9a8e5d3928b6141 SHA1 548fda661d02d6ef81aee9444a5d8b76dddc40cb SHA256 ffdecac8e05b7418034755e00d1a201c8bc2f0486f7eac232d2d0899ee3bdb43
 DIST klayout-0.20.2.tar.gz 1582828 RMD160 925152f3173f180bc8611f59f239940bbd852183 SHA1 467af487053878f46662ddb144a44444088fbc8e SHA256 a87298bd77e61e2b64245d4fe133d68f579fcb490cc14b4889938e096bf1120f
-DIST klayout-0.21.10.tar.gz 1973267 RMD160 02fe1332bc61e503dd56a6bda4a262147e5b2ac8 SHA1 20680d00ec37f89445f155c04befc0b40ee6b42d SHA256 b8f4e8960c2458283e65c3d6c791ea98a13617eceabcfad517cc0e6f1c52991e
 DIST klayout-0.21.11.tar.gz 1997595 RMD160 016825ea3e1dcc38462eaaebdd03d97f4984c026 SHA1 31547a5036cc9190860a73cc47d8d9370aada983 SHA256 98d5ea98efa165356ab2edb9c6ab606b8677d6a31ecd2b7770d7fa48294e5177
+DIST klayout-0.21.12.tar.gz 2001159 RMD160 1402710a4264891c9f5cc28b5be7a87f5d467b53 SHA1 aee4e7d2e53944d60da59c3d47a04f6e0a51f43b SHA256 b2976ab91e8a49c211a0b421a493338aaee5e70f01149f911bb366a112c92a2d
 EBUILD klayout-0.20.2.ebuild 1951 RMD160 54d107d53efc4bcfaa21b6f213c0c7cc8278ac12 SHA1 9df3292837085fee59c21f03abbe09fcdf0cd38d SHA256 e1e5226263486cc4ca4749ec8a187911496e95d82fb7037d159114391c2a2781
-EBUILD klayout-0.21.10.ebuild 1861 RMD160 f60c8c870baf40a07eb5992a55e851682c3c0099 SHA1 6483022e7b58901b3e33fed982e312b5e4452585 SHA256 51f228c889e31687f17c425f33b82e8c0046284da302a8c5a194c1035c13db00
 EBUILD klayout-0.21.11.ebuild 1866 RMD160 12a07ce6884506dace2840b516c7cf78c4bbffad SHA1 98d8adc11596575d7ff6c92952ca6a7b564ec2b1 SHA256 832b9f942c89a593af0e2de6012ea990124d60ab740698af6afb029d5027b1cc
-MISC ChangeLog 1551 RMD160 5e1f1c797b4bb156920a66e2483487ec41084567 SHA1 fe40ace1f3e39b9f9e2a8c2ad064637ee7c29d75 SHA256 948a7e40c625e17dcaffdfc36f7df413de8ad9bf0fb523219d623171a54f9e99
+EBUILD klayout-0.21.12.ebuild 1866 RMD160 e54dda1af1d021fb60478ae7c41c05539be46655 SHA1 ab76c2279964772541f662132673859b07122951 SHA256 eada17cb19a9dfb902a9cc65e585f496e9995812071365b34b357cb9e5b49c16
+MISC ChangeLog 1720 RMD160 18231bf2206561c894df5abb293212bd01669b99 SHA1 6af91d04cf3610e26d76447ea4188eb619a626fa SHA256 f04909011051724863ecb37d35418e792c876d1da99d67bb2404dafe9b608cc9
 MISC metadata.xml 258 RMD160 0c68f5fe3ac9ddaed4725fd9f83820846a357666 SHA1 8096efa78c2c95d9a7ac54964591eb25bd6bd112 SHA256 503c5c542a8646c1a214c9cefe3beaf91b7264de196d3553fb0307c8e9ddcdfe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOLe/lAAoJENwGBM22xffeS3AP/j1XCT6s004Ti+szpaYL9Fca
-UGFdYxSdHS8ih8MHh44Vquzhxe77idqyfw+iTENq1u4UdsRvK8g9+Yvw/aMu6nxp
-zMft1ThcQbdfShFZa6FH6bOoQbzNuGdr3t2jutmfFiyF12LYb0eIHjHRlwoX1ODi
-XQ6+5WD/ryGCYteTwY+kJpaiGzcRspnDLZelt7PPcT8E6YaGCHay/xM0o1ll5dib
-P9BWVzme4wBuntw373avBVgnA4accJRS2vjP1pNfe8FhtQd1VObRR1g4rCv1MHIv
-IT8QZME4fBh0PIdeii/WLDvtwTfTdJIOKNEUyALcZaSiErJ+SFxna3D97Hm6ozI9
-28iY7atEChi0E4KjL2FLJ6em2W+lLpKduRqUn9N7DR1X6Q1N8gmybT74VliHk7oU
-YCTxUVzjDhfSFzxtUzeSAG51WvqdqXsJBvInn8g3KYvgp6RQ9F/YT3PkyuyEMidF
-m4n9B/nuRqF9trEQZaJ4fbNuul3VLKuigTHv7UA7wrTTG4BG4mZZS9VVGfpLlycz
-HMvjOY4xvcVvShHozIVOnjiYBl7TzLPRfYX5ZmLltry41HWkNxIr2rl58MYOqQKq
-C0Ccokxm9zyx6mebpSb383aKV400QPWNMK90LD3/4sTpuqkJUhm3lgdGbbHfd+kN
-Tt4Jbn7ghNQDRsuSKeaV
-=xWLe
+iQIcBAEBCgAGBQJP1kdDAAoJENwGBM22xffeFHEQAIOIqcG/BX8SSBSWDst/lzDp
+JbxvLND9MjG4jjiHqIUAMGHN0N2M6a4lCoieYfaOQSHXwld4o4nbkYR8W7kUZFzu
+FM8RqL18J+LdnEMBevGt3dIztntiTz5As7etvwzhs/eOAtwNvAab06/6D5jPYJVS
+NV1zGS2TB9KstzwvxzLSzJsgrWfaYaM23DVhIebnuyNXDFF00pBf/HFawihedzAz
+jERycz10eB6nffGE04lDE4fr+ztuGshesL90Y7JK/w8tBbr39lwtN7KBWI8BvJEY
+2KM1fJoQm3M7xNPLhsJ1UuOGVVFHxZwSnrUOLyK3DTDfVem+WjZKmxtxeWCXOp+L
+2qDSUCmb6aYpR5UsR+QryKckqd+nMwWyohB6ic8J2PxCIUZ0fSWtLd1WBRgTgkf5
+T/D186Dz33NVBxyGWEwUAHBRzO5BbdDyDyPPqxwVZGheIaJMYGNF4v3S1hXO783j
+mgBSSevFpD7s5BFBdk8bs1ugKM1a+pUTrEyIqqiityVTtggm1V+eTIyL5aeyyMtO
+MYiO0m+kO1r7ggGa2vOp+HVmN4CYPLsU2+fPBero6DKSTHOuDfmOt2HCy4N4os6p
+jkKyyvBST55nmy/d06OLK/VAilW+/y6SZilZJ4rBgfbl3Mhq2uua4u28FtxxVTl0
+JvAwTCyuJZbr5rtJJDaH
+=+Pwj
 -----END PGP SIGNATURE-----
diff --git a/sci-electronics/klayout/klayout-0.21.10.ebuild b/sci-electronics/klayout/klayout-0.21.12.ebuild
index b6fd16b9f4d8..adbef6d697bc 100644
--- a/sci-electronics/klayout/klayout-0.21.10.ebuild
+++ b/sci-electronics/klayout/klayout-0.21.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/klayout/klayout-0.21.10.ebuild,v 1.2 2011/05/29 08:44:55 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/klayout/klayout-0.21.12.ebuild,v 1.1 2012/06/11 19:29:04 dilfridge Exp $
 
 EAPI=3
 
@@ -20,14 +20,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="ruby"
 
-RDEPEND="x11-libs/qt-gui:4[qt3support]"
+RDEPEND="
+	x11-libs/qt-gui:4[qt3support]
+	ruby? ( $(ruby_implementations_depend) )
+"
 DEPEND="${RDEPEND}"
 
 all_ruby_prepare() {
 	# now we generate the stub build configuration file for the home-brew build system
 	cp "${FILESDIR}/${PN}-0.21.7-Makefile.conf.linux-gentoo" "${S}/config/Makefile.conf.linux-gentoo" || die
-
-	epatch "${FILESDIR}/${P}-gcc46.patch"
 }
 
 each_ruby_configure() {