gentoo resync : 23.03.2018

6 files changed, 2 insertions, 155 deletions

diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 684ea1aaef7b..5fa66d208aec 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/klayout/Manifest b/sci-electronics/klayout/Manifest
index dc97a37cbb74..baea82bcf450 100644
--- a/sci-electronics/klayout/Manifest
+++ b/sci-electronics/klayout/Manifest
@@ -1,10 +1,6 @@
-AUX klayout-0.23.10-Makefile.conf.linux-gentoo 1014 BLAKE2B 821c690599cfd94310579cbea50dca466dc07e2e91e390284dd5390cb10a0c3fb61c7b01d30db7bc32dcbfaa522bed99287d803b8c2b86ab26b18b21a39d6ee2 SHA512 4317565d0da30a8e0a0fe4573cfce68bb2ffb45cc92b63ce98361ec73d4e350a807700f0d3ed0f600a609e975e7b0c840dd32c2e7194e8cf44a0f0d1a5276faa
-AUX klayout-0.24.9-c++11-no-throw-in-destuctor.patch 1180 BLAKE2B 5a417027e1f480fd686525670e82c7b23bbc6dae4427cc3e90940ead8ecbb627aea9d9dc265c7ddc3cb1f6f3364e3a2338a68363da095465509f2cf08d26cf34 SHA512 cc18dc64109f770e930c9ed65b8429cef21796f8ba4389be4facda8aba284709cc41281b7bf3de7f8422d3480454ef08f08ae20a1b07697bdf4f201f12ef723e
 AUX klayout-0.25-qt58.patch 1343 BLAKE2B 6bc9deab4f4afa48944628bcbc80f6d5e62ea3f17695fff788650b42771fde8ddddc63a4fe67359795060f63eb6e771c979b081b99e4ea35fe0653234f711162 SHA512 67027d740badea3b603b1813c005074e1fba3253dea28876d9f15b57fe5c8683c7cb2df507d9e93059d52e8da6160edb76fcf702d1b48e43dab0202c94369596
 AUX klayout-0.25-qt59.patch 4596 BLAKE2B a9b4f0b0da71aaea7af9c09c73ae854a784ff4b269f5b999ecc39168b308645bbc67c4b214e430cee1dd8d8999469c39007f036df25eb79bb1e4ab30c4855098 SHA512 b0969a5eafe650b0190d6a9807acf8c2bbe2669dcf080f898dbd8c6851d3cae5a9a9c1a7175ac14542de7c91a0fa08960390daa196cdf282f36c122cd2289c5f
-DIST klayout-0.24.10.tar.gz 11262007 BLAKE2B 85e8d325a56672e6ba328f5ebf793f3c977542ed857621e504983a77e7762d795bbde0f572fb0017328bdb5c11e453f0cd9decedf3629f8ff0f2a6a25daf28c2 SHA512 0043b91e2dae9321299c217697c93af27bc7d795209bdf95248eee3690b97728854f9f82cc95f77f05a2cfbcae6a716ae594fe2485e04ed0a3f5d950abc0a31b
 DIST klayout-0.25.tar.gz 16461165 BLAKE2B 321d5c03b49b922b051407767f72135d0ff7e3fb0fe5dd237e27ce6c42d2b847f0bc4d96ae551c51b6581c0d39eb71f7053c8814dcb7afdfd027a24af9d553fd SHA512 0c05b0786e7e1dbf8035cbb3888eff776c0b96a4fcf2ebbc3065fe43340ae020b6713c2e1d2e7ab5caaf64d7ec84bea9d691ba6c0aea88e93c957530d3d4d114
-EBUILD klayout-0.24.10.ebuild 1548 BLAKE2B cdee87248344f2405b9d3679765857758b0ceabde12a143f6aaf39049575b90615e23915188f2ccad463633eb7527351378c5a485488202ba5d08070f6e6e358 SHA512 f22b8010cf6ff28217fa218ab24c6e44dd41e1828eb098fa8522e28e0d492528234cfd40468d1355b5c29af41962ac692c09a8b3393b99b3c0f667480914194f
-EBUILD klayout-0.25-r2.ebuild 1728 BLAKE2B 4a91a90c8baf1e63839210b36b6877345049c8155f990fc2606db67994dc49f218bd28dac4c2ff64dafe02543b8e7bb94ab1d3059c9bcb83402cb64f1f9eb185 SHA512 0c9cd444031b54d481950937f1d28429a8d7fdf4820fe09997ab689a09db9024168adf6ab41e1fa88ac2b0ee6af422ee0b2305a3a4a51dc66dffe907790f446e
+EBUILD klayout-0.25-r2.ebuild 1727 BLAKE2B b982b0a9b89965c2aabc8d29333826cea57511e86dff322bee5514def962f903c0e36d3c1f900a7d677c90e0e1aa0b57738de442e0e96e82e636f5e745044a24 SHA512 f05b919c2f6b2587402ac7ccdfe4853a21d9917c25263d6f216143a479adb01ec1c4341573cc6995c5498660c96438251d201e68f3425cae4de3b4a0a7607132
 EBUILD klayout-9999.ebuild 1653 BLAKE2B dbfe6ee91bc03aeca6a32a626e053be5229febfab4dee2971d70ae330aef6c21854f9a4f9b5b7390ab7cce2187c4488823aee175d5cea2b89fd3dddc07bca380 SHA512 7efcc112a0f8a383deb85b81f80764d6b8796225090ff9cf3d335edbd7234cbb8e6b7474c42f9be119fb3c712a6a3ba49d289648236de0392c242fb8174fd0a8
 MISC metadata.xml 380 BLAKE2B 3961dc3b4b0a6f3de5460e01e434f8ba1e4504247aac8cb40553d0752ece4f4be7e9d5fefee9d61e85681631eb200959b341c6aeda60b89c14119f95a40f4aa6 SHA512 92ee6b53a7dfed04d5a2aef510e0f2f0dcc70903258d5d4cb6ee497521cbb41214b7a45000693a0ecb66029767a48988c45b9b7fb78a09dc813710a9283d2f7d
diff --git a/sci-electronics/klayout/files/klayout-0.23.10-Makefile.conf.linux-gentoo b/sci-electronics/klayout/files/klayout-0.23.10-Makefile.conf.linux-gentoo
deleted file mode 100644
index d51b60a31db9..000000000000
--- a/sci-electronics/klayout/files/klayout-0.23.10-Makefile.conf.linux-gentoo
+++ /dev/null
@@ -1,45 +0,0 @@
-
-# Configuration file for 
-# gcc, Linux, 64bit
-# release build
-
-# Compiler options
-
-# Compiler general
-INC=-I$(TOP_SOURCE) -I$(SOURCE) -I. -I$(QTINCLUDE) 
-DEFS=-DQT_THREAD_SUPPORT -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII
-
-# C++
-CXXOPT_DEP=-MM -MG 
-CXXWARN=-Wall -pedantic -Wno-deprecated -Woverloaded-virtual \
-       -Wsign-promo -Wsynth -Wno-long-long -Wno-strict-aliasing
-CXXOPT=-c $(CXXFLAGS) -o
-CXXOPT_SO=-fPIC $(CXXOPT) 
-
-# C
-CCOPT_DEP=-MM -MG 
-CCWARN=
-CCOPT=-c $(CFLAGS) -o
-CCOPT_SO=-fPIC $(CCOPT) 
-
-# Linker
-LINK=$(CXX)
-LOPT=-Wl,-E ${LDFLAGS} -o
-LOPT_SO=-shared -fPIC $(LOPT) 
-
-LIBS=-L$(QTLIB) -lQtGui -lQtCore -lQtXml -lQtNetwork -lQtSql -lQtDesigner -lrt -lstdc++ -lcrypt -ldl -lz -lpthread
-
-.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.24.9-c++11-no-throw-in-destuctor.patch b/sci-electronics/klayout/files/klayout-0.24.9-c++11-no-throw-in-destuctor.patch
deleted file mode 100644
index 4cb6473d58c5..000000000000
--- a/sci-electronics/klayout/files/klayout-0.24.9-c++11-no-throw-in-destuctor.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-# Fixes "error: throw will always call terminate() [-Werror=terminate]". Gentoo bug 612978.
-
---- a/src/tlAssert.h.old
-+++ b/src/tlAssert.h
-@@ -27,6 +27,16 @@
- 
- #include "config.h"
- 
-+// For >=C++11, mark assertion_failed() with attribute [[noreturn]] and call std::terminate().
-+// Or else, throw int(0) to tell the compiler that the assertion will not return.
-+#if __cplusplus < 201103L
-+#define ATTRIB_ASSERT KLAYOUT_DLL
-+#define END_ASSERT throw int(0)
-+#else
-+#define ATTRIB_ASSERT [[noreturn]] KLAYOUT_DLL
-+#define END_ASSERT std::terminate()
-+#endif
-+ 
- namespace tl
- {
- 
-@@ -34,10 +44,10 @@
-  *  @brief The corresponding assert macro
-  */
- 
--KLAYOUT_DLL void assertion_failed (const char *filename, unsigned int line, const char *condition);
-+ATTRIB_ASSERT void assertion_failed (const char *filename, unsigned int line, const char *condition);
- 
- //  the throw int(0) instruction will tell the compiler that the assertion will not return
--#define tl_assert(COND) if (!(COND)) { tl::assertion_failed (__FILE__, __LINE__, #COND); throw int(0); }
-+#define tl_assert(COND) if (!(COND)) { tl::assertion_failed (__FILE__, __LINE__, #COND); END_ASSERT; }
- 
- } // namespace tl
- 
diff --git a/sci-electronics/klayout/klayout-0.24.10.ebuild b/sci-electronics/klayout/klayout-0.24.10.ebuild
deleted file mode 100644
index f4dfd05c1ec8..000000000000
--- a/sci-electronics/klayout/klayout-0.24.10.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22"
-# note: define maximally ONE implementation here
-
-RUBY_OPTIONAL=no
-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.org/downloads/source/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/designer:4
-	dev-qt/qtgui:4[qt3support]
-	sys-libs/zlib
-	$(ruby_implementations_depend)
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.24.9-c++11-no-throw-in-destuctor.patch
-)
-
-all_ruby_prepare() {
-	# now we generate the stub build configuration file for the home-brew build system
-	cp "${FILESDIR}/${PN}-0.23.10-Makefile.conf.linux-gentoo" "${S}/config/Makefile.conf.linux-gentoo" || die
-}
-
-each_ruby_configure() {
-	./build.sh \
-		-dry-run \
-		-platform linux-gentoo \
-		-bin bin \
-		-ruby ${RUBY} \
-		-qtbin "/usr/$(get_libdir)/qt4/bin" \
-		-qtinc /usr/include/qt4 \
-		-qtlib "/usr/$(get_libdir)/qt4" || die "Configuration failed"
-}
-
-each_ruby_compile() {
-	cd build.linux-gentoo
-	tc-export CC CXX AR LD RANLIB
-	export AR="${AR} -r"
-	emake all
-}
-
-each_ruby_install() {
-	cd build.linux-gentoo
-	emake install
-
-	cd ..
-	dobin bin/klayout
-
-	insinto /usr/share/${PN}/testdata/gds
-	doins testdata/gds/*.gds
-	insinto /usr/share/${PN}/testdata/oasis
-	doins testdata/oasis/*.oas testdata/oasis/*.ot
-
-	insinto /usr/share/${PN}
-	doins -r testdata/ruby
-}
diff --git a/sci-electronics/klayout/klayout-0.25-r2.ebuild b/sci-electronics/klayout/klayout-0.25-r2.ebuild
index 7a4e27c201ea..5c49aa2da65c 100644
--- a/sci-electronics/klayout/klayout-0.25-r2.ebuild
+++ b/sci-electronics/klayout/klayout-0.25-r2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_CHECKOUT_DIR=${WORKDIR}/all/${P}
 else
 	SRC_URI="http://www.klayout.org/downloads/source/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Viewer and editor for GDS and OASIS integrated circuit layouts"