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

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 84AD142F)

6 files changed, 31 insertions, 164 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/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() {