commit: 6f98b5322329ec776ad9f3ec153a6f9490f82772 Author: Marek Szuba <marecki <AT> gentoo <DOT> org> AuthorDate: Fri Nov 26 18:56:23 2021 +0000 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> CommitDate: Fri Nov 26 19:00:08 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f98b532
sci-electronics/magic: add 8.3.232, remove 8.0.207 EAPI 8 (yay dosym -r!), Cairo support, new source of MOSIS tech files, support for parallel building, no redundant inherits, no CPP=cpp. Bug: https://bugs.gentoo.org/819120 Closes: https://bugs.gentoo.org/819120 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> sci-electronics/magic/Manifest | 3 +- .../magic/files/magic-8.3.232-libdir.patch | 13 ++++ ...ild.patch => magic-8.3.232-verbose-build.patch} | 16 ++--- sci-electronics/magic/magic-8.0.207.ebuild | 79 -------------------- sci-electronics/magic/magic-8.3.232.ebuild | 84 ++++++++++++++++++++++ 5 files changed, 107 insertions(+), 88 deletions(-) diff --git a/sci-electronics/magic/Manifest b/sci-electronics/magic/Manifest index bd1baafd5999..06e1a5b7843f 100644 --- a/sci-electronics/magic/Manifest +++ b/sci-electronics/magic/Manifest @@ -1,3 +1,4 @@ DIST 2002a.tar.gz 6601961 BLAKE2B e34bc281b3f1bc032ba14954b781c8b0055bb9125c57944a5b5f595f8b22feb455c60f3230cf04f06bc41aa807e909d900e3d3ab746076e2c99dcbbdf51a71df SHA512 cb8e30df77e58eb37f7ada775db8a8411612897b1cdbcb59b0c4bd814fa73c6cb10a5461e27e9eecb0fe452e194ee95fbb02b568b86848e501b9c37cc24de39e DIST magic-7.5.202.tgz 3692294 BLAKE2B 8c484e7771b388df8a5e9df574a522f81b5ae34bfaa0db28f444f31a0f5737094d73d2f5467796df74f9230fe684e9c96b08b11812b5627ee5a1bcc74893a021 SHA512 62be6e781ab51a4129a520b91a35ff5c280e7e9cb825e5d71e4012205dd0b777ca8c2355fb071d7d716977d477bddd44e45ca2810d3f97bb63dfe46c5ad1ba80 -DIST magic-8.0.207.tgz 3893605 BLAKE2B 39309def79e03fd6b116482eec2f200cb2b0d2042add2e2a70b0805bc0bc75654de6a92150167ab755b21c333be917c5fac53a30e9f5ee7915fd662179ce391c SHA512 034387d774f653d6de419d597564e96242b87bf3c478045e5a649f490fe4e5431c983f6667b5900ec9ae283af2775404dfbdcbaf18419f85d7242d492360d32b +DIST magic-8.3.232.tgz 4093446 BLAKE2B 6b4b49c2b1f566b0173bead0e95e381a6632b049545dc3b26572f415ba0df3958bc5c3931b686718136185cf105e437fe70dc1f71a11707ad33afac80ddf8f2f SHA512 755b27b8f263d990ca86b3f043e1b8f8a2de75d72f1baf9c4de3a1d7cde28feecf093d8bf1497f2632327d09ce0ce0b17ccea46bdba01c5b53c52ea0f5cf5fdc +DIST magic-tech-mosis-2002a.tar.gz 6601961 BLAKE2B e34bc281b3f1bc032ba14954b781c8b0055bb9125c57944a5b5f595f8b22feb455c60f3230cf04f06bc41aa807e909d900e3d3ab746076e2c99dcbbdf51a71df SHA512 cb8e30df77e58eb37f7ada775db8a8411612897b1cdbcb59b0c4bd814fa73c6cb10a5461e27e9eecb0fe452e194ee95fbb02b568b86848e501b9c37cc24de39e diff --git a/sci-electronics/magic/files/magic-8.3.232-libdir.patch b/sci-electronics/magic/files/magic-8.3.232-libdir.patch new file mode 100644 index 000000000000..fbfe8557287d --- /dev/null +++ b/sci-electronics/magic/files/magic-8.3.232-libdir.patch @@ -0,0 +1,13 @@ +'lib' is for 32-bit libraries only, thank you very much + +--- a/scripts/defs.mak.in ++++ b/scripts/defs.mak.in +@@ -36,7 +36,7 @@ + # Install targets may be different if dist_prefix is set by configure + INSTALL_BINDIR = @DIST_DIR@/bin + INSTALL_MANDIR = @DIST_DIR@/share/man +-INSTALL_LIBDIR = @DIST_DIR@/lib ++INSTALL_LIBDIR = ${libdir} + INSTALL_SYSDIR = ${INSTALL_LIBDIR}/magic/sys + INSTALL_SCMDIR = ${INSTALL_LIBDIR}/magic/scm + INSTALL_TCLDIR = ${INSTALL_LIBDIR}/magic/tcl diff --git a/sci-electronics/magic/files/magic-7.5.231-verbose-build.patch b/sci-electronics/magic/files/magic-8.3.232-verbose-build.patch similarity index 68% rename from sci-electronics/magic/files/magic-7.5.231-verbose-build.patch rename to sci-electronics/magic/files/magic-8.3.232-verbose-build.patch index 64ad4fd18278..8455d7bb1931 100644 --- a/sci-electronics/magic/files/magic-7.5.231-verbose-build.patch +++ b/sci-electronics/magic/files/magic-8.3.232-verbose-build.patch @@ -1,5 +1,5 @@ ---- magic-7.5.231/Makefile -+++ magic-7.5.231/Makefile +--- a/Makefile ++++ b/Makefile @@ -18,12 +18,10 @@ all: $(ALL_TARGET) @@ -15,19 +15,19 @@ force: clean all -@@ -67,7 +65,7 @@ +@@ -68,7 +66,7 @@ install-magic: - @echo --- installing executable to $(DESTDIR)${BINDIR} - @echo --- installing runtime files to $(DESTDIR)${LIBDIR} + @echo --- installing executable to $(DESTDIR)${INSTALL_BINDIR} + @echo --- installing runtime files to $(DESTDIR)${INSTALL_LIBDIR} - @${MAKE} install-real 2>&1 >> install.log + @${MAKE} install-real install-real: install-dirs for dir in ${INSTALL_CAD_DIRS}; do \ -@@ -86,7 +84,7 @@ +@@ -89,7 +87,7 @@ install-tcl: - @echo --- installing executable to $(DESTDIR)${BINDIR} - @echo --- installing runtime files to $(DESTDIR)${LIBDIR} + @echo --- installing executable to $(DESTDIR)${INSTALL_BINDIR} + @echo --- installing runtime files to $(DESTDIR)${INSTALL_LIBDIR} - @${MAKE} install-tcl-real 2>&1 >> install.log + @${MAKE} install-tcl-real diff --git a/sci-electronics/magic/magic-8.0.207.ebuild b/sci-electronics/magic/magic-8.0.207.ebuild deleted file mode 100644 index 5c62820b86b0..000000000000 --- a/sci-electronics/magic/magic-8.0.207.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit multilib epatch autotools - -DESCRIPTION="The VLSI design CAD tool" -HOMEPAGE="http://www.opencircuitdesign.com/magic/index.html"; -SRC_URI="http://www.opencircuitdesign.com/magic/archive/${P}.tgz \ - ftp://ftp.mosis.edu/pub/sondeen/magic/new/beta/2002a.tar.gz"; - -LICENSE="HPND GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="debug opengl" - -RDEPEND="sys-libs/ncurses:0= - sys-libs/readline:0= - dev-lang/tcl:0= - dev-lang/tk:0= - dev-tcltk/blt - opengl? ( virtual/glu - virtual/opengl )" -DEPEND="${RDEPEND} - app-shells/tcsh" - -src_prepare() { - epatch \ - "${FILESDIR}/${PN}-7.5.231-verbose-build.patch" - - cd scripts || die - eautoreconf - cd .. || die - - sed -i -e "s: -pg : :" tcltk/Makefile || die - - # required for >=autoconf-2.70 (bug #775422) - local ac_aux_file - for ac_aux_file in install-sh config.guess config.sub ; do - ln -s scripts/${ac_aux_file} ${ac_aux_file} || die - done -} - -src_configure() { - # Short-circuit top-level configure script to retain CFLAGS - # fix tcl/tk detection #447868 - cd scripts - CPP="cpp" econf \ - --with-tcl=yes \ - --with-tcllibs="/usr/$(get_libdir)" \ - --with-tklibs="/usr/$(get_libdir)" \ - --disable-modular \ - $(use_enable debug memdebug) \ - $(use_with opengl) -} - -src_compile() { - emake -j1 -} - -src_install() { - emake -j1 DESTDIR="${D}" install - - dodoc README README.Tcl TODO - - # Move docs from libdir to docdir and add symlink. - mv "${D}/usr/$(get_libdir)/magic/doc"/* "${D}/usr/share/doc/${PF}/" || die - rmdir "${D}/usr/$(get_libdir)/magic/doc" || die - dosym "/usr/share/doc/${PF}" "/usr/$(get_libdir)/magic/doc" - - # Move tutorial from libdir to datadir and add symlink. - dodir /usr/share/${PN} - mv "${D}/usr/$(get_libdir)/magic/tutorial" "${D}/usr/share/${PN}/" || die - dosym "/usr/share/${PN}/tutorial" "/usr/$(get_libdir)/magic/tutorial" - - # Install latest MOSIS tech files - cp -pPR "${WORKDIR}"/2002a "${D}"/usr/$(get_libdir)/magic/sys/current || die -} diff --git a/sci-electronics/magic/magic-8.3.232.ebuild b/sci-electronics/magic/magic-8.3.232.ebuild new file mode 100644 index 000000000000..c21980f211ab --- /dev/null +++ b/sci-electronics/magic/magic-8.3.232.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +TECH_MOSIS_VER="2002a" + +DESCRIPTION="The VLSI design CAD tool" +HOMEPAGE="http://www.opencircuitdesign.com/magic/index.html"; +SRC_URI="http://www.opencircuitdesign.com/${PN}/archive/${P}.tgz + http://opencircuitdesign.com/~tim/programs/${PN}/archive/${TECH_MOSIS_VER}.tar.gz \ + -> ${PN}-tech-mosis-${TECH_MOSIS_VER}.tar.gz" + +LICENSE="HPND GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="cairo debug opengl" + +RDEPEND="sys-libs/ncurses:0= + sys-libs/readline:0= + dev-lang/tcl:0= + dev-lang/tk:0= + dev-tcltk/blt + cairo? ( x11-libs/cairo[opengl?] ) + opengl? ( + virtual/glu + virtual/opengl + )" +DEPEND="${RDEPEND}" +BDEPEND="app-shells/tcsh" + +PATCHES=( + "${FILESDIR}"/${PN}-8.3.232-libdir.patch + "${FILESDIR}"/${PN}-8.3.232-verbose-build.patch +) + +DOCS=( README.md README.Tcl TODO ) + +src_prepare() { + default + + pushd scripts &>/dev/null || die + mv configure.in configure.ac || die + popd &>/dev/null || die + + sed -i -e "s: -pg : :" tcltk/Makefile || die + + # required for >=autoconf-2.70 (bug #775422) + local ac_aux_file + for ac_aux_file in install-sh config.guess config.sub ; do + ln -s scripts/${ac_aux_file} ${ac_aux_file} || die + done +} + +src_configure() { + # Short-circuit top-level configure script to retain CFLAGS + # fix tcl/tk detection #447868 + cd scripts || die + econf \ + --with-tcl=yes \ + --with-tcllibs="/usr/$(get_libdir)" \ + --with-tklibs="/usr/$(get_libdir)" \ + --disable-modular \ + $(use_enable debug memdebug) \ + $(use_enable cairo cairo-offscreen) \ + $(use_with opengl) +} + +src_install() { + default + + # Move docs from libdir to docdir and add symlink. + mv "${ED}/usr/$(get_libdir)/magic/doc"/* "${ED}/usr/share/doc/${PF}/" || die + rmdir "${ED}/usr/$(get_libdir)/magic/doc" || die + dosym -r "${EPREFIX}/usr/share/doc/${PF}" "/usr/$(get_libdir)/magic/doc" + + # Move tutorial from libdir to datadir and add symlink. + dodir /usr/share/${PN} + mv "${ED}/usr/$(get_libdir)/magic/tutorial" "${ED}/usr/share/${PN}/" || die + dosym -r "${EPREFIX}/usr/share/${PN}/tutorial" "/usr/$(get_libdir)/magic/tutorial" + + # Install latest MOSIS tech files + cp -pPR "${WORKDIR}"/${TECH_MOSIS_VER} "${ED}"/usr/$(get_libdir)/magic/sys/current || die +}
