Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-electronics/klayout/files/
Date: Wed, 01 Feb 2017 22:42:03
Message-Id: 1485988843.83c998928d5743cb0a4c2a15d279bcc086588bd9.soap@gentoo
1 commit: 83c998928d5743cb0a4c2a15d279bcc086588bd9
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Tue Jan 31 17:44:17 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 1 22:40:43 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83c99892
7
8 sci-electronics/klayout: remove unused patch/file
9
10 Closes: https://github.com/gentoo/gentoo/pull/3740
11
12 .../klayout-0.21.7-Makefile.conf.linux-gentoo | 43 ----------------------
13 .../klayout/files/klayout-0.22.8-noautoruby.patch | 18 ---------
14 2 files changed, 61 deletions(-)
15
16 diff --git a/sci-electronics/klayout/files/klayout-0.21.7-Makefile.conf.linux-gentoo b/sci-electronics/klayout/files/klayout-0.21.7-Makefile.conf.linux-gentoo
17 deleted file mode 100644
18 index 32d75df..00000000
19 --- a/sci-electronics/klayout/files/klayout-0.21.7-Makefile.conf.linux-gentoo
20 +++ /dev/null
21 @@ -1,43 +0,0 @@
22 -
23 -# Configuration file for gentoo-linux
24 -# Compiler options
25 -
26 -# Compiler general
27 -INC=-I$(TOP_SOURCE) -I$(SOURCE) -I. -I$(QTINCLUDE)
28 -DEFS=-DQT_THREAD_SUPPORT -DQT3_SUPPORT
29 -
30 -# C++
31 -CXXOPT_DEP=-MM -MG
32 -CXXWARN=-Wall -pedantic -Wno-deprecated -Woverloaded-virtual \
33 - -Wsign-promo -Wsynth -Wno-long-long -Wno-strict-aliasing
34 -CXXOPT=-c $(CXXFLAGS) -o
35 -CXXOPT_SO=-fPIC $(CXXOPT)
36 -
37 -# C
38 -CCOPT_DEP=-MM -MG
39 -CCWARN=
40 -CCOPT=-c $(CFLAGS) -o
41 -CCOPT_SO=-fPIC $(CCOPT)
42 -
43 -# Linker
44 -LINK=$(CXX)
45 -LOPT=-Wl,-E ${LDFLAGS} -o
46 -LOPT_SO=-shared -fPIC $(LOPT) -o
47 -
48 -LIBS=-L$(QTLIB) -lQtGui -lQtCore -lQtXml -lrt -lstdc++ -lcrypt -ldl -lz
49 -
50 -.PHONY: install
51 -install:
52 - mkdir -p $(INSTALL_BINDIR)
53 - cp main/$(EXEC_NAME) $(INSTALL_BINDIR)
54 - for bin in $(OTHER_BIN) ; \
55 - do \
56 - cp main/$$bin $(INSTALL_BINDIR) ; \
57 - done
58 - for plugin in $(PLUGINS) ; \
59 - do \
60 - cp $$plugin/*.so $(INSTALL_BINDIR) ; \
61 - done
62 - chmod 755 $(INSTALL_BINDIR) $(INSTALL_BINDIR)/*
63 -
64 -
65
66 diff --git a/sci-electronics/klayout/files/klayout-0.22.8-noautoruby.patch b/sci-electronics/klayout/files/klayout-0.22.8-noautoruby.patch
67 deleted file mode 100644
68 index fe96fb9..00000000
69 --- a/sci-electronics/klayout/files/klayout-0.22.8-noautoruby.patch
70 +++ /dev/null
71 @@ -1,18 +0,0 @@
72 -diff -ruN klayout-0.22.8.orig/build.sh klayout-0.22.8/build.sh
73 ---- klayout-0.22.8.orig/build.sh 2013-06-22 00:43:11.000000000 +0200
74 -+++ klayout-0.22.8/build.sh 2013-10-13 20:13:36.493108910 +0200
75 -@@ -62,10 +62,10 @@
76 - RUBYINCLUDE2="not-used"
77 - RUBYLIBFILE=""
78 -
79 --RUBY=""
80 --if [ "`ruby1.9 -v`" != "" ]; then RUBY="ruby1.9"; fi
81 --if [ "`ruby1.8 -v`" != "" ]; then RUBY="ruby1.8"; fi
82 --if [ "`ruby -v`" != "" ]; then RUBY="ruby"; fi
83 -+#RUBY=""
84 -+#if [ "`ruby1.9 -v`" != "" ]; then RUBY="ruby1.9"; fi
85 -+#if [ "`ruby1.8 -v`" != "" ]; then RUBY="ruby1.8"; fi
86 -+#if [ "`ruby -v`" != "" ]; then RUBY="ruby"; fi
87 - if [ "$RUBY" != "" ]; then
88 -
89 - echo "Found ruby interpreter: $RUBY"