Fix build against ruby-1.9 and re-add keywords; remove old

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x84AD142F

7 files changed, 48 insertions, 186 deletions

diff --git a/sci-electronics/klayout/ChangeLog b/sci-electronics/klayout/ChangeLog
index e36b9108c637..1b04fc6c279a 100644
--- a/sci-electronics/klayout/ChangeLog
+++ b/sci-electronics/klayout/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-electronics/klayout
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/klayout/ChangeLog,v 1.17 2013/06/30 11:48:33 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/klayout/ChangeLog,v 1.18 2013/10/13 18:35:55 dilfridge Exp $
+
+  13 Oct 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  -klayout-0.20.2.ebuild, -files/klayout-0.20.2-Makefile.conf.linux-gentoo,
+  -files/klayout-0.20.2-configureonly.patch, klayout-0.22.8.ebuild,
+  +files/klayout-0.22.8-noautoruby.patch:
+  Fix build against ruby-1.9 and re-add keywords; remove old
 
 *klayout-0.22.8 (30 Jun 2013)
 
diff --git a/sci-electronics/klayout/Manifest b/sci-electronics/klayout/Manifest
index d999455195ce..5b283277912b 100644
--- a/sci-electronics/klayout/Manifest
+++ b/sci-electronics/klayout/Manifest
@@ -1,33 +1,28 @@
 -----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.7-Makefile.conf.linux-gentoo 917 SHA256 ffdecac8e05b7418034755e00d1a201c8bc2f0486f7eac232d2d0899ee3bdb43 SHA512 a00a741dc2e3aab13cbf69ce3f2236543d9d6a57c7f5db16a7ccaef2461fa9a6bba5d76942875d6441f2fd4035cdc23d96d9315ef6638a2b6b58cd37bd9e4918 WHIRLPOOL f5601b70079283a1229844517dda292778f81715811b26d61b53bb3ee5d150973f2eedf3952062feb71ea052f0e73c634ddb9a5147298d8d67d9882fdaa60715
-DIST klayout-0.20.2.tar.gz 1582828 SHA256 a87298bd77e61e2b64245d4fe133d68f579fcb490cc14b4889938e096bf1120f
+AUX klayout-0.22.8-noautoruby.patch 663 SHA256 141bdcc513943e93373f1c001f67ccfa724329b351e4276aef239cbafa291818 SHA512 128f8693c2b4d902a67832104b2ca1bd3c8fa248db609a1d2a1db0beb8ceb20af770a4ff9bd3cf27f83db8849abaf4f6615b4424547374a1437470ee8f319bdf WHIRLPOOL ef26e07176e95f55176ba1882ad180d6fd9b13e8d0c9a5e4acb37674cf4b4e33937d91c8762a8b43dbf985102aee146ae19b8cf5aebf88e72e46c04294de5411
 DIST klayout-0.22.4.tar.gz 8863032 SHA256 3b10887fc6d23cb6a4a9e1b59707daef11f61cf35bc48fea67a96836b496927b SHA512 c18fc7cd818d1d8168729d77b82ded733782a3a2896663d1b463cd866daa929efc915d9b21818e060bbadb30bd8b48a246bd62016c2187b2c590eb5673ca8d3d WHIRLPOOL 7db4832b44a96989f0b30b6b4f7bd2a00746c0c9b18c87a604b0dbdf520cd6010be26b727e3329a85c32746573df2f8cfb14d7908984aa411d86d2d91c4cea47
 DIST klayout-0.22.8.tar.gz 8865542 SHA256 a08f10c387fc55270ab1d2e605191b67f7de92a97091b44ead371c6b7526536b SHA512 b597aa81edf80271cf19a987d40d73c3f8490baceb47e968b5c2da501c18f77ee4f5e0bc898d595cb4d5c6c3ae1b167203b56847338c5da9a3e1717ac45510b7 WHIRLPOOL 8877df3874352c685e51847d4ccc069a9d9c75d3ff6036cc59af547908510d316d56ac4db968a0b8f08f9cb35f32e5cf11940582cb505629c0e35b8d7178e758
-EBUILD klayout-0.20.2.ebuild 1948 SHA256 e7acacc75db93a29cf6340a13ad6034a3da5e3f67329759f367175b904363bda SHA512 2822da2f5244673d452f89fc16c9dffc98b144885c7d4cf44859dd5d1d82118e188ce6f7d08e55fb68e7b5d81e71ce9ee28ae5ce97a764c20c9576044805c506 WHIRLPOOL 5f9d34c86a945d0d07bf7072b3f27e21e9cff04864e7d31c6c171db1cb5254f5684b6436a4c7872efb290f5d7bb4929fbc99eb5431702e5e723af8883b0aca44
 EBUILD klayout-0.22.4.ebuild 1596 SHA256 d75b606717565b20681c64f5b715dee34122ca0cb0f1ddc8a0aa2a094f4b6b8d SHA512 b7efcf6bfb6dafcca4a8b5d7d4b448fec896778f0d45a072ce99ab689930d751c45569a2e1566c08309e50b15b6105b942ddec911c45ca116b3ec99e09d11ce0 WHIRLPOOL d84108f7abddb90255def16e86d11bbfea4fdc1d5e86c80d6822eb9a49d6a4d9afd3e02a78fa0edf8b9b4086c43258cb61ecce8161ba13685fd445ba824ed321
-EBUILD klayout-0.22.8.ebuild 1597 SHA256 9bb3e96dfa4e15a82347ae2759486de8b29193be7b499043d1498820644fac14 SHA512 ba2069067078c410be2040b6e23cc161a51ec8d061db49d31d3c5a1405843cbde85ddbab91bd7e84481579f67760703c72475780ccac0e0f724648fa2faa4be7 WHIRLPOOL 27890be967de9cb577a9ec6841eb1b2eb67e708d7d44a230f23ee816c2a0fc774966f8581e3fe94def27694b9607400287b7265521066e99548688ee44aec16c
-MISC ChangeLog 2934 SHA256 4c199ed06b40b4952d26f89382156c7b774719dfd4b2ba8e0027c9a4833f6f34 SHA512 a2af7ff1e85b56fa95cb1e49bdab8a29d5e3f9201e47d2158968e690d37bc4d94041105c8250c08f701474970d15ed459f30dc2a4160313f227a17b1f9cd34bc WHIRLPOOL e5e9afb3c8114e36bf89b6ab2f197e1405c3aaef5e5f39aa2c24a2615c3c282b07edca763c2a672e09ebef0a24435a80c3d61fcdf47fb1882aa25b8a891f0d46
+EBUILD klayout-0.22.8.ebuild 1579 SHA256 ec37458195c56d378ab83f9144286cf9fd4df5a906067f19a9fc1bba854c5be2 SHA512 8da657952b6f02eca853542532c22dd057888b2070f3f67e852f853cfd85fbac31d24ddeb2733ed3e1aee9d0eb4c8e60535f37843fc221e1b6daf6ade4ade073 WHIRLPOOL 9a5171925719af3850477dadb9daacbd67f36d2cc1a24d753d938ea72afdab3b94db28190b037367dc1953473e67e485e6a6c3c23a78e53b4633dcad3ae7757f
+MISC ChangeLog 3239 SHA256 6153449191b2a1a8b060e73dee7312e4d99f9ea273ebfaee3a66d5cdd6f9209a SHA512 085257d27ad16c0b19a7a7ff7ea5510a8557d3ed443f3102ce02ab52d7ade398a5f2e6b39b24f5821624a83af55848d75160bb9451233bf5e82d6df1ab2ca21f WHIRLPOOL 094fd0d02de057d134e5c22dc77de86586d7b5bc05e63e077db6929952adaaddd902ae0c9f46d8163fde2d32191baf7e0185754ec581ae49b45ddadfb8fab757
 MISC metadata.xml 267 SHA256 fc087e649b2ac6ef6978612a05a9bf2a33795e8a55042d145d5291d095bff265 SHA512 cec122bebe6756fef2801c0f00079000d287463c78360d674ce17a638127011860223cd7e427a94e01aa27febb2fbe82b94bd7d5e015d7bd2cd42525539ce510 WHIRLPOOL d4b4b8eaf3b72a88d78ae3b7dd910ef405c33072350efc43e2f9b4703f77bfccbf39ab1deb1b3410c3844c21d8c0581785a21651a91f230e5b442fe1c57ffb05
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJR0BuRXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcEqcP/RFYPV0ds8O5u0kmmh5U0lzw
-CEjLo/8dB9VOlCjN4qV6sQmkCWAda952oRicF45YOJtkVjTEaDJwYzPogLIqMwAs
-2fyDfpMxKWA91e25/+Loq8ywuOhAz9sqSV6iKctwF8+ZRoMLLcmwkFiR3KmrXTe/
-XIEwBvvmEqlTgLitgCDabA2QslF6PTkaaGTtIj86mH//tNd5jLDNXV31aELkBOSw
-jXWu32Cd6o7O1oAtutBcHfYvRBGupteWLvaAkri6bHx5jMRGPJfUYN4kviaiVB2x
-v3ltOUxafWSgFqB2+0jhUqD2pm1cCMT9Ns13lQINTlyfXLJ2vS0Ro8IAtgzkTelu
-mIOict/zAS+BsvHOS3V9lE8YrVwYRPvfxlZZd/ufD8D72WrINBi5DgDks7A7b8bM
-JuVTR2vjk0Zxgm7iI1Y3gOzxZGGNZCZv5cxMcjsFFP5oJRG2Ry5r8r8pY4GEeas6
-7mt2JckekRtBysogIfrVkYqIlz0XQfxbOun1HRfhRsmXO2Ibr/nQDih02lFzNQNN
-CpFNywTJQdPEF74Phsjg2RtQp35FSCirAxHZOSwtLjQ8kQ34s23Lt3vANfIKy6DM
-nxJOfD62ScBAJIOHVwIw7I1GgH6l2QOuYU1+99lV2LSBBXGOfFlxWnFTFfeTD1Ut
-yJPfFKtW7TfWfhghCez/
-=CYcd
+iQIcBAEBCAAGBQJSWuhYAAoJEJS/30SErRQvROkQAJa+NHZ4wDoC6MIcTxiYB5pu
+5NLwzkBLbZ/g7wWqebgr/0ibfJCMVSjcZQ/qNsicIE4qxAIjmj4OW7WKPut4MOSX
+DZVtd1VarN6AvNCra3tYKYO7eDqkheZfF7YNaHR86Bfm1iTSd3S7GlQw/SAPlXTc
+tNsXR+XLRFcgFRAGDf9mtc6pHv9/p9a9fQyAHuGb/NS090Ov2JlhRDeiFdRQrYjp
+WnrVj3mFK6Kc+DzuhXjCT/H0rO6yypA0dIIbCnvw0GNLF57WHac39lIHOlWHQ502
+lIrwAbFk3yd2dezpKSuB91Q0Kd0zj3lzUj0Em2ITTQ7FevVJ4yE27FMcDdWvRzZV
+GBc581C5/XrcVTE12nGtV/hyL93X1SMOHXW4F9s35EjU53P0EvRR4GKWLXrpCbUU
+IGfQ8I9RyqEIpu5lcHnFECAUciaSzwhtv0BIsuifRe6y7If61ggnLtylkDlp0QdY
+TxDSRCRyllfsWDH4+wvmQyoo5MEF4u1KdtVQAwywAw8CK5a0MmvcKZPtO26D4Dcy
+FTTK8EZWLjZUww6aIBpDDYO7K3LCnPbXuBhYvbO7NGtZV/Cmgtq+N0eTYf6F2N9h
+GIh8DllEm4HAOsFLYDd082LGp6bkhdSWlwlOZTBEau1pldi/RC5F61itXxHvIwGt
+hxjSp+61o5Qf8FwzGg0O
+=G98G
 -----END PGP SIGNATURE-----
diff --git a/sci-electronics/klayout/files/klayout-0.20.2-Makefile.conf.linux-gentoo b/sci-electronics/klayout/files/klayout-0.20.2-Makefile.conf.linux-gentoo
deleted file mode 100644
index b22da1857676..000000000000
--- a/sci-electronics/klayout/files/klayout-0.20.2-Makefile.conf.linux-gentoo
+++ /dev/null
@@ -1,42 +0,0 @@
-
-# Configuration file for gentoo-linux
-# Compiler options
-
-CCOPT_DEP=-MM -MG -x c++
-
-CCWARN=-Wall -pedantic -Wno-deprecated -Woverloaded-virtual \
-       -Wsign-promo -Wsynth -Wno-long-long -Wno-strict-aliasing
-
-CCOPT=-c -x c++ $(CXXFLAGS) -o
-CCOPT_SO=-fPIC $(CCOPT)
-
-INC=-I$(TOP_SOURCE) -I$(SOURCE) -I. -I$(QTINCLUDE)
-
-DEFS=-DQT_THREAD_SUPPORT -DQT3_SUPPORT
-
-# Linker options
-
-LOPT=-Wl,-E ${LDFLAGS} -o
-LOPT_SO=-shared -fPIC -o
-
-LIBS=-L$(QTLIB) -lQtGui -lQtCore -lQtXml -lrt -lstdc++ -lcrypt
-
-LINK=$(CXX)
-
-# The details for the install target (needed since 0.19.2)
-
-.PHONY: install
-install:
-	mkdir -p $(INSTALL_BINDIR)
-	cp main/$(EXEC_NAME) $(INSTALL_BINDIR)
-	for bin in $(OTHER_BIN) ; \
-	do \
-	  cp main/$$bin $(INSTALL_BINDIR) ; \
-	done
-	for plugin in $(PLUGINS) ; \
-	do \
-	  cp $$plugin/*.so $(INSTALL_BINDIR) ; \
-	done
-	chmod 755 $(INSTALL_BINDIR) $(INSTALL_BINDIR)/*
-
-
diff --git a/sci-electronics/klayout/files/klayout-0.20.2-configureonly.patch b/sci-electronics/klayout/files/klayout-0.20.2-configureonly.patch
deleted file mode 100644
index 74c2e78167c4..000000000000
--- a/sci-electronics/klayout/files/klayout-0.20.2-configureonly.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- klayout-0.18.1/build.sh	2009-08-02 15:17:12.000000000 -0400
-+++ klayout-0.18.1/build.sh.new	2009-09-18 16:15:47.000000000 -0400
-@@ -237,34 +237,3 @@
- echo "Building plugins: $PLUGINS"
- echo ""
- 
--# -- Running build  --
--
--echo "Running build .."
--echo "$MAKE_PRG"
--cd $BUILD
--$MAKE_PRG $MAKE_OPT all || exit 1
--echo ""
--
--cd $CURR_DIR
--
--# -- Installing binaries  --
--
--echo "Installing binaries .."
--cd $BUILD
--$MAKE_PRG install
--cd $CURR_DIR
--echo "Build done."
--
--if [ $WIN_CYGWIN = 0 ]; then
--  echo ""
--  echo "Final binary is ready in $BIN/$EXEC_NAME."
--  echo "To run it, you may need to add the following to your LD_LIBRARY_PATH:"
--  echo "$QTLIB"
--  
--  LD_LIBRARY_PATH=$QTLIB:$LD_LIBRARY_PATH
--  $BIN/$EXEC_NAME -v
--  $BIN/$EXEC_NAME -h
--fi
--
--exit 0
--
diff --git a/sci-electronics/klayout/files/klayout-0.22.8-noautoruby.patch b/sci-electronics/klayout/files/klayout-0.22.8-noautoruby.patch
new file mode 100644
index 000000000000..fe96fb9572f6
--- /dev/null
+++ b/sci-electronics/klayout/files/klayout-0.22.8-noautoruby.patch
@@ -0,0 +1,18 @@
+diff -ruN klayout-0.22.8.orig/build.sh klayout-0.22.8/build.sh
+--- klayout-0.22.8.orig/build.sh	2013-06-22 00:43:11.000000000 +0200
++++ klayout-0.22.8/build.sh	2013-10-13 20:13:36.493108910 +0200
+@@ -62,10 +62,10 @@
+ RUBYINCLUDE2="not-used"
+ RUBYLIBFILE=""
+ 
+-RUBY=""
+-if [ "`ruby1.9 -v`" != "" ]; then RUBY="ruby1.9"; fi
+-if [ "`ruby1.8 -v`" != "" ]; then RUBY="ruby1.8"; fi
+-if [ "`ruby -v`" != "" ]; then RUBY="ruby"; fi
++#RUBY=""
++#if [ "`ruby1.9 -v`" != "" ]; then RUBY="ruby1.9"; fi
++#if [ "`ruby1.8 -v`" != "" ]; then RUBY="ruby1.8"; fi
++#if [ "`ruby -v`" != "" ]; then RUBY="ruby"; fi
+ if [ "$RUBY" != "" ]; then
+ 
+   echo "Found ruby interpreter: $RUBY"
diff --git a/sci-electronics/klayout/klayout-0.20.2.ebuild b/sci-electronics/klayout/klayout-0.20.2.ebuild
deleted file mode 100644
index 38a4e6722161..000000000000
--- a/sci-electronics/klayout/klayout-0.20.2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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.20.2.ebuild,v 1.4 2013/03/02 23:19:22 hwoarang Exp $
-
-EAPI="2"
-
-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="dev-qt/qtgui:4[qt3support]"
-DEPEND="${RDEPEND}"
-
-all_ruby_prepare() {
-	epatch "${FILESDIR}/${P}-configureonly.patch"
-
-	# now we generate the stub build configuration file for the home-brew build system
-	cp "${FILESDIR}/${P}-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 \
-		-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 \
-		bin/strm2gds \
-		bin/strm2oas \
-		bin/strmclip \
-		bin/strmcmp || die "Installation of binaries failed"
-
-	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.8.ebuild b/sci-electronics/klayout/klayout-0.22.8.ebuild
index 5655de7d9d57..fe4edfbd4e1c 100644
--- a/sci-electronics/klayout/klayout-0.22.8.ebuild
+++ b/sci-electronics/klayout/klayout-0.22.8.ebuild
@@ -1,6 +1,6 @@
 # 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.8.ebuild,v 1.1 2013/06/30 11:48:33 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/klayout/klayout-0.22.8.ebuild,v 1.2 2013/10/13 18:35:55 dilfridge Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="http://178.77.72.242/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
@@ -28,20 +28,19 @@ 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}/${PN}-0.22.8-noautoruby.patch"
 }
 
 each_ruby_configure() {
-	local rbflags
-	rbflags="-rblib $(ruby_get_libruby) -rbinc $(ruby_get_hdrdir)"
-
+	export RUBY
 	./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"
+		-qtlib /usr/$(get_libdir)/qt4 || die "Configuration failed"
 }
 
 each_ruby_compile() {