From 70828054f257f10192dc1297cb1927e952f44557 Mon Sep 17 00:00:00 2001 From: Andreas Hüttel Date: Wed, 2 Dec 2009 23:19:28 +0000 Subject: sci-electronics/klayout: Version bump. svn path=/sunrise/; revision=9642 --- sci-electronics/klayout/ChangeLog | 7 ++ sci-electronics/klayout/Manifest | 10 +-- .../klayout-0.18.2-Makefile.conf.linux-gentoo | 24 ------- .../files/klayout-0.18.2-configureonly.patch | 37 ---------- .../klayout-0.19.1-Makefile.conf.linux-gentoo | 24 +++++++ .../files/klayout-0.19.1-configureonly.patch | 37 ++++++++++ sci-electronics/klayout/klayout-0.18.2.ebuild | 82 ---------------------- sci-electronics/klayout/klayout-0.19.1.ebuild | 82 ++++++++++++++++++++++ 8 files changed, 155 insertions(+), 148 deletions(-) delete mode 100644 sci-electronics/klayout/files/klayout-0.18.2-Makefile.conf.linux-gentoo delete mode 100644 sci-electronics/klayout/files/klayout-0.18.2-configureonly.patch create mode 100644 sci-electronics/klayout/files/klayout-0.19.1-Makefile.conf.linux-gentoo create mode 100644 sci-electronics/klayout/files/klayout-0.19.1-configureonly.patch delete mode 100644 sci-electronics/klayout/klayout-0.18.2.ebuild create mode 100644 sci-electronics/klayout/klayout-0.19.1.ebuild (limited to 'sci-electronics') diff --git a/sci-electronics/klayout/ChangeLog b/sci-electronics/klayout/ChangeLog index c2ac165b0..dc4286bb9 100644 --- a/sci-electronics/klayout/ChangeLog +++ b/sci-electronics/klayout/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 02 Dec 2009; Andreas K. Huettel (dilfridge) + -klayout-0.18.2.ebuild, -files/klayout-0.18.2-Makefile.conf.linux-gentoo, + -files/klayout-0.18.2-configureonly.patch, +klayout-0.19.1.ebuild, + +files/klayout-0.19.1-Makefile.conf.linux-gentoo, + +files/klayout-0.19.1-configureonly.patch: + Version bump. + 07 Nov 2009; Andreas K. Huettel (dilfridge) -klayout-0.18.1.ebuild, -files/klayout-0.18.1-Makefile.conf.linux-gentoo, -files/klayout-0.18.1-configureonly.patch, +klayout-0.18.2.ebuild, diff --git a/sci-electronics/klayout/Manifest b/sci-electronics/klayout/Manifest index a3cb458e1..f766d67e8 100644 --- a/sci-electronics/klayout/Manifest +++ b/sci-electronics/klayout/Manifest @@ -1,6 +1,6 @@ -AUX klayout-0.18.2-Makefile.conf.linux-gentoo 495 RMD160 a0beeffdb8250fd0c10430cd7c5aa710fe04209b SHA1 2fa5f3955442e3e9b5b2c48ffe464e70951aa7f6 SHA256 11b8a120c01c21356810261ea5da86c4a3c5a4a31d819ff886083b4341c75430 -AUX klayout-0.18.2-configureonly.patch 767 RMD160 658e32a3a6349571e43a8872ed4ae434c40ad556 SHA1 de03b3d17aa6d54ac5daa1e6c2dc7d10ed53e573 SHA256 b2aa5fed607d300f389c10e976343a38f2b2a32b4fcb74d3abd57ffaea165f28 -DIST klayout-0.18.2.tar.gz 1288425 RMD160 fb514719e1f2820fcb44cbc6a31efa9a8dc70143 SHA1 546925820265ca529b2b642382a6ae7d58e35165 SHA256 18ef5e6fe35bc2b754b4d4159ff7dd3064afb79c3b1ed96182b0a2973f2d90fc -EBUILD klayout-0.18.2.ebuild 2002 RMD160 06334815fde1c1f00fb7976bc684f11dd3980248 SHA1 2741ceaff247a7cfc99f3594a5d324d8750349ce SHA256 e383496a07e18102cf9d019c7917313c418455d5aba0ca650d500e51bc781c59 -MISC ChangeLog 790 RMD160 6409d3d8409fabb60d776f283720de9a03b4ffd0 SHA1 5d564fde292addb30aea9362130ef9aaa5ee617b SHA256 a4ca846ededfade8b66516ae13194789cc29528ce3d211175d80403ba5bd0dcf +AUX klayout-0.19.1-Makefile.conf.linux-gentoo 495 RMD160 a0beeffdb8250fd0c10430cd7c5aa710fe04209b SHA1 2fa5f3955442e3e9b5b2c48ffe464e70951aa7f6 SHA256 11b8a120c01c21356810261ea5da86c4a3c5a4a31d819ff886083b4341c75430 +AUX klayout-0.19.1-configureonly.patch 767 RMD160 658e32a3a6349571e43a8872ed4ae434c40ad556 SHA1 de03b3d17aa6d54ac5daa1e6c2dc7d10ed53e573 SHA256 b2aa5fed607d300f389c10e976343a38f2b2a32b4fcb74d3abd57ffaea165f28 +DIST klayout-0.19.1.tar.gz 1424173 RMD160 be8d8b100420b9e2dcb2f9e0e160002ed73fbe0c SHA1 de4a8a6e3569a65b25377c9d68b12058accb22f9 SHA256 25883c4d8a2aa8e44f9e091f7f65182f4944844285b01d0e573276d245c5bade +EBUILD klayout-0.19.1.ebuild 2002 RMD160 06334815fde1c1f00fb7976bc684f11dd3980248 SHA1 2741ceaff247a7cfc99f3594a5d324d8750349ce SHA256 e383496a07e18102cf9d019c7917313c418455d5aba0ca650d500e51bc781c59 +MISC ChangeLog 1115 RMD160 3b08184718e6f6e18d6f4431a2dd6d3e0dd629ed SHA1 0afd23ddff71930ff4e94564709c3d9ccb50470d SHA256 7a3d7d8d0823fc71c360bbc87b53848b6a57309bfd5bf0299d3834e8230736f8 MISC metadata.xml 171 RMD160 ed284df01c230fc7990a6b5888b39166d23f29ba SHA1 f3d64a69044b710e23fb874b3ee4cd338858c8b4 SHA256 a7b30fbacd0e4c312c07a3efac112a3794c81d134442d8104325734d03425adf diff --git a/sci-electronics/klayout/files/klayout-0.18.2-Makefile.conf.linux-gentoo b/sci-electronics/klayout/files/klayout-0.18.2-Makefile.conf.linux-gentoo deleted file mode 100644 index 136c54b04..000000000 --- a/sci-electronics/klayout/files/klayout-0.18.2-Makefile.conf.linux-gentoo +++ /dev/null @@ -1,24 +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 -o -LOPT_SO=-shared -fPIC -o - -LIBS=-L$(QTLIB) -lQtGui -lQtCore -lQtXml -lrt -lstdc++ -lcrypt - -LINK=$(CXX) diff --git a/sci-electronics/klayout/files/klayout-0.18.2-configureonly.patch b/sci-electronics/klayout/files/klayout-0.18.2-configureonly.patch deleted file mode 100644 index 74c2e7816..000000000 --- a/sci-electronics/klayout/files/klayout-0.18.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.19.1-Makefile.conf.linux-gentoo b/sci-electronics/klayout/files/klayout-0.19.1-Makefile.conf.linux-gentoo new file mode 100644 index 000000000..136c54b04 --- /dev/null +++ b/sci-electronics/klayout/files/klayout-0.19.1-Makefile.conf.linux-gentoo @@ -0,0 +1,24 @@ + +# 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 -o +LOPT_SO=-shared -fPIC -o + +LIBS=-L$(QTLIB) -lQtGui -lQtCore -lQtXml -lrt -lstdc++ -lcrypt + +LINK=$(CXX) diff --git a/sci-electronics/klayout/files/klayout-0.19.1-configureonly.patch b/sci-electronics/klayout/files/klayout-0.19.1-configureonly.patch new file mode 100644 index 000000000..74c2e7816 --- /dev/null +++ b/sci-electronics/klayout/files/klayout-0.19.1-configureonly.patch @@ -0,0 +1,37 @@ +--- 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/klayout-0.18.2.ebuild b/sci-electronics/klayout/klayout-0.18.2.ebuild deleted file mode 100644 index e6854925d..000000000 --- a/sci-electronics/klayout/klayout-0.18.2.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -inherit eutils multilib toolchain-funcs - -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="x11-libs/qt-gui:4[qt3support] - ruby? ( dev-lang/ruby )" - -DEPEND="${RDEPEND}" - -src_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 -} - -src_configure() { - local rbinc rblib rbflags - - if use ruby ; then - - # get the location of the ruby.h header file - rbinc=$(ruby -rrbconfig -e "puts Config::CONFIG['archdir'] || Config::CONFIG['rubyhdrdir']") - - # get the filename of libruby.so - rblib=$(ruby -rrbconfig -e "puts Config::CONFIG['LIBRUBY']") - - rbflags="-rblib /usr/$(get_libdir)/${rblib} -rbinc ${rbinc}" - - fi - - ./build.sh \ - -platform linux-gentoo \ - -bin bin \ - -qtbin /usr/bin \ - -qtinc /usr/include/qt4 \ - -qtlib /usr/$(get_libdir)/qt4 \ - ${rbflags} || die "Configuration failed" -} - -src_compile() { - cd build.linux-gentoo - tc-export CC CXX AR LD RANLIB - export AR="${AR} -r" - emake || die "Build failed" -} - -src_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.19.1.ebuild b/sci-electronics/klayout/klayout-0.19.1.ebuild new file mode 100644 index 000000000..e6854925d --- /dev/null +++ b/sci-electronics/klayout/klayout-0.19.1.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +inherit eutils multilib toolchain-funcs + +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="x11-libs/qt-gui:4[qt3support] + ruby? ( dev-lang/ruby )" + +DEPEND="${RDEPEND}" + +src_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 +} + +src_configure() { + local rbinc rblib rbflags + + if use ruby ; then + + # get the location of the ruby.h header file + rbinc=$(ruby -rrbconfig -e "puts Config::CONFIG['archdir'] || Config::CONFIG['rubyhdrdir']") + + # get the filename of libruby.so + rblib=$(ruby -rrbconfig -e "puts Config::CONFIG['LIBRUBY']") + + rbflags="-rblib /usr/$(get_libdir)/${rblib} -rbinc ${rbinc}" + + fi + + ./build.sh \ + -platform linux-gentoo \ + -bin bin \ + -qtbin /usr/bin \ + -qtinc /usr/include/qt4 \ + -qtlib /usr/$(get_libdir)/qt4 \ + ${rbflags} || die "Configuration failed" +} + +src_compile() { + cd build.linux-gentoo + tc-export CC CXX AR LD RANLIB + export AR="${AR} -r" + emake || die "Build failed" +} + +src_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 +} -- cgit v1.2.3-65-gdbad