From 38b7258d086dd5e263c3bbe3880c8c956676bc71 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 26 Jan 2018 15:48:02 +0000 Subject: gentoo resync : 25.01.2018 --- sci-electronics/klayout/Manifest | 4 +- sci-electronics/klayout/klayout-0.25-r2.ebuild | 88 ++++++++++++++++++++++++++ sci-electronics/klayout/klayout-0.25.ebuild | 81 ------------------------ sci-electronics/klayout/klayout-9999.ebuild | 11 +++- 4 files changed, 99 insertions(+), 85 deletions(-) create mode 100644 sci-electronics/klayout/klayout-0.25-r2.ebuild delete mode 100644 sci-electronics/klayout/klayout-0.25.ebuild (limited to 'sci-electronics/klayout') diff --git a/sci-electronics/klayout/Manifest b/sci-electronics/klayout/Manifest index c9c971378cc8..dc97a37cbb74 100644 --- a/sci-electronics/klayout/Manifest +++ b/sci-electronics/klayout/Manifest @@ -5,6 +5,6 @@ AUX klayout-0.25-qt59.patch 4596 BLAKE2B a9b4f0b0da71aaea7af9c09c73ae854a784ff4b 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.ebuild 1590 BLAKE2B 54283a7ab2b7234331a6f3afbcee3a2fe79ac8b0533aa5748da693186740b5f00519df4340166a92bce407e683f0ae82ac13ef95eb4f5af9b4dece8323bfdd3e SHA512 8ae34b3b512346a845dfd2f81268fcfc2be97ccfdc87dbfcb5be4fdc51773cbd029ce5c3c444c3c7a968c428ffffca871660168f481bbe7356b9911808a8209e -EBUILD klayout-9999.ebuild 1515 BLAKE2B 5cb8f131cc90ba87e2f4e02a65e27682fc82b659c3e0ba2c5d4504c2ea9de49ab4f829a66c3b52ef81474d4ddd9b04087d0685f7ff13de690fcf561fc2f9b01c SHA512 1b1279dfb06f8e0c01d13c6d050023339ef6de6ed4872f8f306d2bfc7794a040440f4d905f0e88ac62afd210933d57646bc705129a977b3d768d2db3defd67c4 +EBUILD klayout-0.25-r2.ebuild 1728 BLAKE2B 4a91a90c8baf1e63839210b36b6877345049c8155f990fc2606db67994dc49f218bd28dac4c2ff64dafe02543b8e7bb94ab1d3059c9bcb83402cb64f1f9eb185 SHA512 0c9cd444031b54d481950937f1d28429a8d7fdf4820fe09997ab689a09db9024168adf6ab41e1fa88ac2b0ee6af422ee0b2305a3a4a51dc66dffe907790f446e +EBUILD klayout-9999.ebuild 1653 BLAKE2B dbfe6ee91bc03aeca6a32a626e053be5229febfab4dee2971d70ae330aef6c21854f9a4f9b5b7390ab7cce2187c4488823aee175d5cea2b89fd3dddc07bca380 SHA512 7efcc112a0f8a383deb85b81f80764d6b8796225090ff9cf3d335edbd7234cbb8e6b7474c42f9be119fb3c712a6a3ba49d289648236de0392c242fb8174fd0a8 MISC metadata.xml 380 BLAKE2B 3961dc3b4b0a6f3de5460e01e434f8ba1e4504247aac8cb40553d0752ece4f4be7e9d5fefee9d61e85681631eb200959b341c6aeda60b89c14119f95a40f4aa6 SHA512 92ee6b53a7dfed04d5a2aef510e0f2f0dcc70903258d5d4cb6ee497521cbb41214b7a45000693a0ecb66029767a48988c45b9b7fb78a09dc813710a9283d2f7d diff --git a/sci-electronics/klayout/klayout-0.25-r2.ebuild b/sci-electronics/klayout/klayout-0.25-r2.ebuild new file mode 100644 index 000000000000..7a4e27c201ea --- /dev/null +++ b/sci-electronics/klayout/klayout-0.25-r2.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +RUBY_OPTIONAL=no +USE_RUBY="ruby23" +# note: define maximally ONE implementation here + +PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) + +inherit toolchain-funcs python-single-r1 ruby-ng + +if [[ ${PV} = 9999* ]]; then + EGIT_REPO_URI="https://github.com/klayoutmatthias/${PN}.git" + inherit git-r3 + EGIT_CHECKOUT_DIR=${WORKDIR}/all/${P} +else + SRC_URI="http://www.klayout.org/downloads/source/${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Viewer and editor for GDS and OASIS integrated circuit layouts" +HOMEPAGE="http://www.klayout.de/" +LICENSE="GPL-2" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-qt/designer:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5[widgets] + dev-qt/qtnetwork:5[ssl] + dev-qt/qtprintsupport:5 + dev-qt/qtsql:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + dev-qt/qtxmlpatterns:5 + sys-libs/zlib + ${PYTHON_DEPS} + $(ruby_implementations_depend) +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-qt58.patch" + "${FILESDIR}/${P}-qt59.patch" +) + +pkg_setup() { + python-single-r1_pkg_setup + ruby-ng_pkg_setup +} + +each_ruby_configure() { + tc-export CC CXX AR LD RANLIB + export CFLAGS CXXFLAGS + ./build.sh \ + -expert \ + -dry-run \ + -qmake "/usr/$(get_libdir)/qt5/bin/qmake" \ + -ruby "${RUBY}" \ + -python "${PYTHON}" \ + -build . \ + -bin "${T}/bin" \ + -rpath "/usr/$(get_libdir)/klayout" \ + -option "${MAKEOPTS}" \ + -with-qtbinding \ + -without-64bit-coord \ + -qt5 || die "Configuration failed" +} + +each_ruby_compile() { + emake all +} + +each_ruby_install() { + emake install + + cd "${T}/bin" || die + + dodir "/usr/$(get_libdir)/klayout" + mv lib* "${ED}/usr/$(get_libdir)/klayout/" || die + + dobin * +} diff --git a/sci-electronics/klayout/klayout-0.25.ebuild b/sci-electronics/klayout/klayout-0.25.ebuild deleted file mode 100644 index a819784c86aa..000000000000 --- a/sci-electronics/klayout/klayout-0.25.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -RUBY_OPTIONAL=no -USE_RUBY="ruby22" -# note: define maximally ONE implementation here - -PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) - -inherit eutils multilib toolchain-funcs python-single-r1 ruby-ng - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="https://github.com/klayoutmatthias/${PN}.git" - inherit git-r3 - EGIT_CHECKOUT_DIR=${WORKDIR}/all/${P} -else - SRC_URI="http://www.klayout.org/downloads/source/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Viewer and editor for GDS and OASIS integrated circuit layouts" -HOMEPAGE="http://www.klayout.de/" -LICENSE="GPL-2" -SLOT="0" -IUSE="" - -RDEPEND=" - dev-qt/designer:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - sys-libs/zlib - ${PYTHON_DEPS} - $(ruby_implementations_depend) -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/${P}-qt58.patch" - "${FILESDIR}/${P}-qt59.patch" -) - -pkg_setup() { - python-single-r1_pkg_setup - ruby-ng_pkg_setup -} - -each_ruby_configure() { - tc-export CC CXX AR LD RANLIB - export CFLAGS CXXFLAGS - ./build.sh \ - -expert \ - -dry-run \ - -qmake "/usr/$(get_libdir)/qt5/bin/qmake" \ - -ruby "${RUBY}" \ - -python "${PYTHON}" \ - -build . \ - -bin "${T}/bin" \ - -rpath "/usr/$(get_libdir)/klayout" \ - -option "${MAKEOPTS}" \ - -with-qtbinding \ - -without-64bit-coord \ - -qt5 || die "Configuration failed" -} - -each_ruby_compile() { - emake all -} - -each_ruby_install() { - emake install - - cd "${T}/bin" || die - - dodir "/usr/$(get_libdir)/klayout" - mv lib* "${ED}/usr/$(get_libdir)/klayout/" || die - - dobin * -} diff --git a/sci-electronics/klayout/klayout-9999.ebuild b/sci-electronics/klayout/klayout-9999.ebuild index ad17c9f8d608..ccd9abcc8eef 100644 --- a/sci-electronics/klayout/klayout-9999.ebuild +++ b/sci-electronics/klayout/klayout-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ USE_RUBY="ruby22" PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) -inherit eutils multilib toolchain-funcs python-single-r1 ruby-ng +inherit toolchain-funcs python-single-r1 ruby-ng if [[ ${PV} = 9999* ]]; then EGIT_REPO_URI="https://github.com/klayoutmatthias/${PN}.git" @@ -30,7 +30,14 @@ RDEPEND=" dev-qt/designer:5 dev-qt/qtcore:5 dev-qt/qtgui:5 + dev-qt/qtmultimedia:5[widgets] + dev-qt/qtnetwork:5[ssl] + dev-qt/qtprintsupport:5 + dev-qt/qtsql:5 + dev-qt/qtsvg:5 dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + dev-qt/qtxmlpatterns:5 sys-libs/zlib ${PYTHON_DEPS} $(ruby_implementations_depend) -- cgit v1.2.3