Version bump; does not build without ruby anymore

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x7887F787

5 files changed, 26 insertions, 133 deletions

diff --git a/sci-electronics/klayout/ChangeLog b/sci-electronics/klayout/ChangeLog
index 44a3dad52ffa..3ecdeb515b4e 100644
--- a/sci-electronics/klayout/ChangeLog
+++ b/sci-electronics/klayout/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-electronics/klayout
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/klayout/ChangeLog,v 1.11 2012/09/22 22:22:57 dilfridge Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/klayout/ChangeLog,v 1.12 2013/01/02 20:26:48 dilfridge Exp $
+
+*klayout-0.22.4 (02 Jan 2013)
+
+  02 Jan 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  -files/klayout-0.21.10-gcc46.patch, -klayout-0.21.19.ebuild,
+  -klayout-0.22.ebuild, +klayout-0.22.4.ebuild:
+  Version bump; does not build without ruby anymore
 
 *klayout-0.22 (22 Sep 2012)
 
diff --git a/sci-electronics/klayout/Manifest b/sci-electronics/klayout/Manifest
index 4430a277811a..43d9117b3e00 100644
--- a/sci-electronics/klayout/Manifest
+++ b/sci-electronics/klayout/Manifest
@@ -1,32 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX klayout-0.20.2-Makefile.conf.linux-gentoo 875 SHA256 92dd5333f94a18896c252920a364246de5f8e90dd1a78a6b01fe29e7fca3dbcb SHA512 998a3ccc4a030cb363ecfefc6b56a30d4ad73c4b2064d9248a1934d22b9e7ff8206c8d8e27179fb50284c3f2dfdea358d44c70956f3b9bc857db00e7e9ab0ea5 WHIRLPOOL 2f7335f81195b7a44a1f0b6bbfabe2aed1c6c61b5418a09d9f00ecd2f9c82b8c16641ee34f1f5d78ab8056d09452aff1e468251ff4f864d1d7f89cd464192760
 AUX klayout-0.20.2-configureonly.patch 767 SHA256 b2aa5fed607d300f389c10e976343a38f2b2a32b4fcb74d3abd57ffaea165f28 SHA512 6ac3edfadedf7bf8da723eb4927102b4e36eb0bcfa519aef97d2c78dceb23ccdb286d938a425133ab9d97bd9dfa4a28d3a05fb3a85069de4154d2399c17a8f7d WHIRLPOOL ad413086094275973323c8c075d7e88999e0ba7ef8d362cde97473b95a3269b7e6c38eeae91ebd3d214b25d4fbdd7e4fd142f53fa492bd3767591b2face8f20d
-AUX klayout-0.21.10-gcc46.patch 387 SHA256 137998f08a33173822ac6f322a7180451a2166e2cf885573b09ba563f2c7972c SHA512 7e53ffeac34b454021f405c6adb34624b49ed108c30975013644e47fb155ea417f3b2c56cb8ae27b13e12844f440aacc4539d155585706a1abc42b219e0a25a7 WHIRLPOOL 6767293f2ee67deda8f1cacfbc7e6e599e08b13bc0ad37bf7011065781746e426fbbc8f8f94cc6e77b8c8a0f84a28e17bca73fe7c82dc920753e6d557233421f
 AUX klayout-0.21.7-Makefile.conf.linux-gentoo 917 SHA256 ffdecac8e05b7418034755e00d1a201c8bc2f0486f7eac232d2d0899ee3bdb43 SHA512 a00a741dc2e3aab13cbf69ce3f2236543d9d6a57c7f5db16a7ccaef2461fa9a6bba5d76942875d6441f2fd4035cdc23d96d9315ef6638a2b6b58cd37bd9e4918 WHIRLPOOL f5601b70079283a1229844517dda292778f81715811b26d61b53bb3ee5d150973f2eedf3952062feb71ea052f0e73c634ddb9a5147298d8d67d9882fdaa60715
 DIST klayout-0.20.2.tar.gz 1582828 SHA256 a87298bd77e61e2b64245d4fe133d68f579fcb490cc14b4889938e096bf1120f
-DIST klayout-0.21.19.tar.gz 2025980 SHA256 330c7b13635760eeacc8bfbb5c6a9e4e57e0597b89208718882e9d08c2fe0fdb SHA512 61cff5eeaf4057dafe5a5b4c8a6dc212d0c5d63788a3b815e0be462bb3f414c187c5ab8f51f7037fbfada081cda60e00180ab92fff6d0e99b8f85ebf175d158d WHIRLPOOL 7c54ae6d2b0e77307c6313dbf3de02aec7acf58ae490b67340442cb753accfa3d79723f318d56999295b983863dda815ef921fb65daa979f751dace9483e770a
-DIST klayout-0.22.tar.gz 8737858 SHA256 2cebc6e0d56c2aff7581c235611e59572cf87f422b347c70130e193503379690 SHA512 1119d5a12c1b90c540bbb23c3867eec596e88150c208c7b6288dbb88e4df7e0172ae08a48309d4d9a3a4adc661246a65ea76fa04c031f28b31a6e8ceabb2a212 WHIRLPOOL e59e695fd5bd30ba21ccb62e2dab7de6818e45ccf90d5c3d0bd182ed4bf23499a63c8d30dae36d1e3e8deffe36ce205f2741a2bf2309b1617ec6a2fde3f3644c
+DIST klayout-0.22.4.tar.gz 8863032 SHA256 3b10887fc6d23cb6a4a9e1b59707daef11f61cf35bc48fea67a96836b496927b SHA512 c18fc7cd818d1d8168729d77b82ded733782a3a2896663d1b463cd866daa929efc915d9b21818e060bbadb30bd8b48a246bd62016c2187b2c590eb5673ca8d3d WHIRLPOOL 7db4832b44a96989f0b30b6b4f7bd2a00746c0c9b18c87a604b0dbdf520cd6010be26b727e3329a85c32746573df2f8cfb14d7908984aa411d86d2d91c4cea47
 EBUILD klayout-0.20.2.ebuild 1951 SHA256 e1e5226263486cc4ca4749ec8a187911496e95d82fb7037d159114391c2a2781 SHA512 5e756eef7079f16d6b784d1b3b41a5f2b0b500ee563c68341caf83ae4bbf528ce89581fc4c926ed4cc81268161af2d0d88406165bf4319b0108366f153bc60f3 WHIRLPOOL 5e127e83d77958997cff603602aff16bb2ed81a1f91bb7d14d1f15cefdd06269466131862a7d29ae213537de5c1ea1a7ed0b81e08903f42218696870fee70294
-EBUILD klayout-0.21.19.ebuild 1866 SHA256 45826a3eb97a51382538eb91013c442b755c209b3c7736c0d72141c3009470b7 SHA512 5b18b38c26c90e08aa1c89b9ad8727f560e879a0b7eaa78364fe5581c99a2568215d5b62140737c1c3a57d2d65c42a71d3bb40d7a0b063df84a5d6e5881f2975 WHIRLPOOL fddd5e555aec3361d83ea4dc6e69eed39c3b079e38cee389f6f3ecbcac2d496ae4a047114f99fb8200cca9cf23eb1f21a2b23cc8101c54a7f79ef79c0cf56cd3
-EBUILD klayout-0.22.ebuild 1863 SHA256 64b0971f46477595e21ae30b2c705026406ba0f614e3ff71095166d1e247bb79 SHA512 9a7466147b4b204f2c26b008efab74933bcd21c07a1b9c4556f11248126260485a26ae59da871ee13606b0cb3cb79a0538b9306863099754c0e394589e7d4160 WHIRLPOOL c9922a486668c13499a4302a7d17acfcc56abc6389307e2ae35c0369092aaf42bc725df07dd8e5ddc84c71328d594e771129a3438215dbd932568787f6274847
-MISC ChangeLog 2039 SHA256 238362e91ed4fa73d8f3d6f50dfc1ddd525481ef8a688e18bb3c3908fef24b09 SHA512 62d379a6c796d2a6474c713e9927e8142c992d4ff92d640d091a24be872da006520aedda072751bd74ead12cb5e281c9994942f9ec052e0b7394171dae9f0d84 WHIRLPOOL 175c30f4b040dd21efc492402e1bd2bcc96a98d7e8b95ca36f5ff78ca77ba148faaf998459e34957829d1f4dd918411765abe06bdb9de39f1da0ee79be60ff5d
+EBUILD klayout-0.22.4.ebuild 1602 SHA256 cbacde567f5e7103cb5305fb24d648fd8e0bba0035d5f55214ae830416abb7db SHA512 d56f0a60e8c451b47264d92666f5bc36922f180f349a02fb51158a5b827888a8822503e4aafee1601a7aa3f59ff12a2ae1c07895aac7cecda68f48c8b824fe90 WHIRLPOOL 1776c05439d2114bcda1e5a59c9983ad4edc289a277c44dd336e29b72d5885bdd8ae8b3d534ce9870df7e053e069790d925034d5ec6fd9fde8f4ac3ace91392a
+MISC ChangeLog 2291 SHA256 307fbb07631ba2e4afa59fdab82d3e8e7dd3524d3452815882bbd4ef30556a16 SHA512 0b89dc74a47c0a0fbd176a062e570472ff22c695cf51d914463d099669d1152fbf31762fb1e0193ee1f2562a86e286a374cf5460d0c3cecd9cd1f793a4d9c19c WHIRLPOOL a238ac5fae3d8cbe71bcbd8aa7044be8421153b1984df4a8d0621eb31d33c16df36bcc31e647c8586267c6d35664d641ad03b7da6bfb2ad2ba2a865ebdd3f3e7
 MISC metadata.xml 258 SHA256 503c5c542a8646c1a214c9cefe3beaf91b7264de196d3553fb0307c8e9ddcdfe SHA512 63055bc1d5d97b4d2c473d3226e88c165ab974d1da23e1441d297ead298c2370780cbb058596806e5c973831a6f218141cd4e1bda4d377a644944e6b01bfae75 WHIRLPOOL 6ba9b986bcaf06afa19535673f67846b7190e4a2d969ebad13094595697f35a54eee84b8d17c7ebe8964537d3731d1873fe97a519d3cd68e85b49a055bcfbd96
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJQXjsAAAoJENwGBM22xffeu7IP/jF/ndp1wqa04QYzkMe6AuA3
-iFvGD538oiz86ua/9Vfkg0fchcYGQlGdaoGko/6b3BI4FJ0hKxyYKyGFEuDtfdzF
-j8jvyJzOSqjJpfnJUQcQnc+eVwO1Odfz2zBeMCOMRg5m64+aSTtjfJ7uzFdg8ild
-j+u60CeLk4tQBtZy3IAtnWGLu9TKjtvyJJagiRqo9VkwvdzNhswo2D+AaVtHRW/a
-OEP+kMIFQLYExpjP+Mo4Q/FBQUpkx/V8Eq4cMN4YXm6Zcd/w/s+g2nxIRPUzwn9E
-+Q/61B8t8AJ3JTQGR8Jr/TidzS7W7R1aQjo7QkyTOLqFKq4pL9LxVG91cmeYe10z
-FMOjRUhsakYC3p3xGY11SjXxCHxiItKFv9Tn0vGD4Cr2TT1IUPNnK20pUGO90jb4
-KnYcUdJG9b3V7NAB8pMdkY0VJ2L1sp+kUceEvZ8BODf1vgCFDXUqKnvpN7NMwb4M
-sj/VvNdzH+RJYC4rkbbxqWE049B8FM4K7slVYYXHbCPI2/D78eNZHk40pnMxzvxB
-jHrKY9SI85+lWvVq755rR+bj5OgwyWLPxnbHeYUcw34a6uQIoxoCU3OGNai0b7r6
-zfKrjqOcXPFg0DZ9dFYtE9Pkbh5xRz48p4bRaqJusXrzDKQnHYPQtK00IJv4244Q
-+uL0Y23xvQ42KEGA9YAU
-=bjiy
------END PGP SIGNATURE-----
diff --git a/sci-electronics/klayout/files/klayout-0.21.10-gcc46.patch b/sci-electronics/klayout/files/klayout-0.21.10-gcc46.patch
deleted file mode 100644
index 4041af6d6c45..000000000000
--- a/sci-electronics/klayout/files/klayout-0.21.10-gcc46.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN klayout-0.21.10.orig/src/tlStableVector.h klayout-0.21.10/src/tlStableVector.h
---- klayout-0.21.10.orig/src/tlStableVector.h	2011-05-07 20:53:35.000000000 +0200
-+++ klayout-0.21.10/src/tlStableVector.h	2011-05-29 10:34:20.000000000 +0200
-@@ -25,6 +25,7 @@
- #ifndef HDR_tlStableVector
- #define HDR_tlStableVector
- 
-+#include <stddef.h>
- #include <vector>
- #include <iterator>
- 
diff --git a/sci-electronics/klayout/klayout-0.21.19.ebuild b/sci-electronics/klayout/klayout-0.21.19.ebuild
deleted file mode 100644
index 2a3b7095a5b5..000000000000
--- a/sci-electronics/klayout/klayout-0.21.19.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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.19.ebuild,v 1.1 2012/07/22 17:11:19 dilfridge Exp $
-
-EAPI=3
-
-USE_RUBY="ruby18"
-# note: define maximally ONE implementation here
-
-RUBY_OPTIONAL=yes
-
-inherit eutils multilib toolchain-funcs ruby-ng
-
-DESCRIPTION="Viewer and editor for GDS and OASIS integrated circuit layouts"
-HOMEPAGE="http://www.klayout.de/"
-SRC_URI="http://www.klayout.de/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ruby"
-
-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
-}
-
-each_ruby_configure() {
-	local rbflags
-
-	if use ruby ; then
-		rbflags="-rblib $(ruby_get_libruby) -rbinc $(ruby_get_hdrdir)"
-	fi
-
-	./build.sh \
-		-dry-run \
-		-platform linux-gentoo \
-		-bin bin \
-		-qtbin /usr/bin \
-		-qtinc /usr/include/qt4 \
-		-qtlib /usr/$(get_libdir)/qt4 \
-		${rbflags} || die "Configuration failed"
-}
-
-each_ruby_compile() {
-	cd build.linux-gentoo
-	tc-export CC CXX AR LD RANLIB
-	export AR="${AR} -r"
-	emake all || die "Build failed"
-}
-
-each_ruby_install() {
-	cd build.linux-gentoo
-	emake install || die "make install failed"
-
-	cd ..
-	dobin bin/klayout || die
-
-	insinto /usr/share/${PN}/testdata/gds
-	doins testdata/gds/*.gds || die "Installation of gds testdata failed"
-	insinto /usr/share/${PN}/testdata/oasis
-	doins testdata/oasis/*.oas testdata/oasis/*.ot || die "Installation of oasis testdata failed"
-
-	if use ruby; then
-		insinto /usr/share/${PN}
-		doins -r testdata/ruby || die "Installation of ruby testdata failed"
-	fi
-}
diff --git a/sci-electronics/klayout/klayout-0.22.ebuild b/sci-electronics/klayout/klayout-0.22.4.ebuild
index aa7b92450cb2..1f4da6174bdc 100644
--- a/sci-electronics/klayout/klayout-0.22.ebuild
+++ b/sci-electronics/klayout/klayout-0.22.4.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/klayout/klayout-0.22.ebuild,v 1.1 2012/09/22 22:22:57 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/klayout/klayout-0.22.4.ebuild,v 1.1 2013/01/02 20:26:48 dilfridge Exp $
 
-EAPI=3
+EAPI=5
 
 USE_RUBY="ruby18"
 # note: define maximally ONE implementation here
 
-RUBY_OPTIONAL=yes
-
+RUBY_OPTIONAL=no
 inherit eutils multilib toolchain-funcs ruby-ng
 
 DESCRIPTION="Viewer and editor for GDS and OASIS integrated circuit layouts"
@@ -18,11 +17,11 @@ SRC_URI="http://www.klayout.de/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="ruby"
+IUSE=""
 
 RDEPEND="
 	x11-libs/qt-gui:4[qt3support]
-	ruby? ( $(ruby_implementations_depend) )
+	$(ruby_implementations_depend)
 "
 DEPEND="${RDEPEND}"
 
@@ -33,10 +32,7 @@ all_ruby_prepare() {
 
 each_ruby_configure() {
 	local rbflags
-
-	if use ruby ; then
-		rbflags="-rblib $(ruby_get_libruby) -rbinc $(ruby_get_hdrdir)"
-	fi
+	rbflags="-rblib $(ruby_get_libruby) -rbinc $(ruby_get_hdrdir)"
 
 	./build.sh \
 		-dry-run \
@@ -52,23 +48,21 @@ each_ruby_compile() {
 	cd build.linux-gentoo
 	tc-export CC CXX AR LD RANLIB
 	export AR="${AR} -r"
-	emake all || die "Build failed"
+	emake all
 }
 
 each_ruby_install() {
 	cd build.linux-gentoo
-	emake install || die "make install failed"
+	emake install
 
 	cd ..
-	dobin bin/klayout || die
+	dobin bin/klayout
 
 	insinto /usr/share/${PN}/testdata/gds
-	doins testdata/gds/*.gds || die "Installation of gds testdata failed"
+	doins testdata/gds/*.gds
 	insinto /usr/share/${PN}/testdata/oasis
-	doins testdata/oasis/*.oas testdata/oasis/*.ot || die "Installation of oasis testdata failed"
+	doins testdata/oasis/*.oas testdata/oasis/*.ot
 
-	if use ruby; then
-		insinto /usr/share/${PN}
-		doins -r testdata/ruby || die "Installation of ruby testdata failed"
-	fi
+	insinto /usr/share/${PN}
+	doins -r testdata/ruby
 }