gentoo resync : 05.12.2021

6 files changed, 112 insertions, 92 deletions

diff --git a/sci-electronics/magic/Manifest b/sci-electronics/magic/Manifest
index 0badac8976f4..d5faf6bceec7 100644
--- a/sci-electronics/magic/Manifest
+++ b/sci-electronics/magic/Manifest
@@ -1,10 +1,12 @@
 AUX magic-7.5.202-include.patch 430 BLAKE2B c3b1837db33d05af3d258f1c514187c78ee63815731998f51729da4266af0cddbf4bb8615189965451d6bb8044c932c72672b065087c84cadca5f50cfe79b09c SHA512 0ff649589b65ac608586a425ca5d2b72e8608d513dae51be7b6e8fd5a2af494b2d186025777af2389358a3be6bd86efee312b4b1c3829d1eb3e9c28bef557e2f
 AUX magic-7.5.202-install.patch 566 BLAKE2B db98035eea33960714f14825ce6c3512e6570e3961ff5173a3f83b5fbd21dae429f53864f933a1665478479a101fece51a4d2c8a6e6cdc54a21fb2e9a045ad1b SHA512 332882e4557d0b5fc9fd4d681edc74e501578a5e1d00c144b5d656b8f95a5c6497cff3a6b620305cde032f9628ae169ea478927820ea085dfb52507f5de7722d
-AUX magic-7.5.231-verbose-build.patch 1033 BLAKE2B 60ddb821cf09c0bd89c800b12da10c57277df6bfe5dd6735d45336b468fce1d7e788ceda19e751c792d71118fbd3b4d757b94f4244f9c6f89f2ef83dcdae4bb0 SHA512 8c3344d157c70525c32a84d3779e100b9e382713132f0828a1e0f4f5c75f1b1bee87e7784d301e0750912bfb4669467b9a2189302e9b8c8f7c74772cfe282636
+AUX magic-8.3.232-libdir.patch 525 BLAKE2B 5b85f02031d18299ae098b5ff45163d1c6d16f6bbd09996df6c669571ea82820175356c41b308f5055af874effa946f91baae90c43212e8e7adf40800799c8c3 SHA512 9b7018e05ab50db82996df57891642dfe4f00b74edd8f942912f750be91017a7d204fd0bf2271cee8082cfef9c903bdb4d8606979f6b2ef201b9d7ab1cdc523a
+AUX magic-8.3.232-verbose-build.patch 1041 BLAKE2B 80ab96d751ff2294e6d82f75e997ecc1ccc00588eae3a6c0d63d49a134567eae864f3a42c46c6a6e0f6b1a53473df30afefbc9a7e48385a4ea9b780523ee0ca0 SHA512 19f3b6c371efccebadb6fa85f479ec4fa32fb7a4e11af58630e7265f19f598fdfb6c0008cf500de601246a6316ccf173f96dafdcca28bbef4e09658989d67a3a
 AUX magic-ldflags.patch 1767 BLAKE2B 644e2cd816f1763103612376c095bd00b375a129136937842a0fec068d9651e001f31aa7f5575ae999087c7376b8d35cf3d224cb0ac34e124d8f308a6996f5e1 SHA512 ba61218111b7484bb6e60f37a3bbf5696afc887766d8de0ae0e33f9dc18023ee7eecf4b6c7012376afbfb2d3caa0e0421e03b0abee0ad1b2d9032ce80c65e355
 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
-EBUILD magic-7.5.202-r1.ebuild 1903 BLAKE2B e523f4d002c84ce8a3f9a1f350d908a783a55c689685657d92432e5c0a346745c0bf297927a9c4e6e3da0b4a50ace7c8b883664e90d116d7404eea9617feeaca SHA512 2762333c3c1a0e584c0ede583dccc883fde2db05c185a71b779b27b500f547e1bba42ab1fc92e46fd6af4d11e4fdddc075653b16ef100c4a21e6a1ae5a21f25f
-EBUILD magic-8.0.207.ebuild 2009 BLAKE2B 313b25b462e163036511b6d87619436c509683bbc0b2b0df282c9a9556d7b5102b1d3a4e7f0e4ab29231f9cdfa6fff63353b22ca9cdc39cfbcc3de00cb680147 SHA512 e9f0ec364c7bcd4f3412a0fa77682f268bda5f33077c84c227f981b05547e3d60c44fad12581d268e6ea9b78a483a1ddd140b45536f1a0515b1691ca2b97e8d6
+DIST magic-8.3.232.tgz 4093446 BLAKE2B 6b4b49c2b1f566b0173bead0e95e381a6632b049545dc3b26572f415ba0df3958bc5c3931b686718136185cf105e437fe70dc1f71a11707ad33afac80ddf8f2f SHA512 755b27b8f263d990ca86b3f043e1b8f8a2de75d72f1baf9c4de3a1d7cde28feecf093d8bf1497f2632327d09ce0ce0b17ccea46bdba01c5b53c52ea0f5cf5fdc
+DIST magic-tech-mosis-2002a.tar.gz 6601961 BLAKE2B e34bc281b3f1bc032ba14954b781c8b0055bb9125c57944a5b5f595f8b22feb455c60f3230cf04f06bc41aa807e909d900e3d3ab746076e2c99dcbbdf51a71df SHA512 cb8e30df77e58eb37f7ada775db8a8411612897b1cdbcb59b0c4bd814fa73c6cb10a5461e27e9eecb0fe452e194ee95fbb02b568b86848e501b9c37cc24de39e
+EBUILD magic-7.5.202-r1.ebuild 1904 BLAKE2B ba6f98925316ffdf962dc7db364ca7afd0b676fcf42da1f7c48a9804bcc5fca456abfd5139c1560053da89046b61223dca630cb74cd62b80daf98c5eb3e08529 SHA512 57532b68f40e4f01d6c21b9ddfc51fa9241eac988d43caf65f75a63a0ca5686760e0e4291ee2150edc4f4dcb84cf0b7a7c922e8b825e8f0b219a099789bc4ffc
+EBUILD magic-8.3.232.ebuild 2255 BLAKE2B e3d5cc8df92a6f61decd1387717efbc3eeb67b4eb5265707fc03cfe84ce4163b52dbb8aa31097390dfda2cb355957ae932abc6b01b4b72b12559f09b7ba8b196 SHA512 22946269f2fe9b18850a95756a399f590b121b14179c04fb37f0d209009589e6087c6a7a04ca0748e1d848d68ec04acfda1e930fe373966b2d903ad4855973d7
 MISC metadata.xml 1381 BLAKE2B 7f9458b2f3e6c1f511b1f5a0f8f31e58114e29216eaf3927a6570f16bfab24fb357a82b432414a28a16fde8f02a00fafa5b5d915681a68c621b11202dbfc3d32 SHA512 b9cd12c6e4704bde2aa963880e9321fd64239b7f9333a7daa74be6707001ed18ac61bc48dc8f85cfeac9a427e07a3bcfe07607662d206d0f5d75753e333d2632
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
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-7.5.202-r1.ebuild b/sci-electronics/magic/magic-7.5.202-r1.ebuild
index 40a3643a1ebb..d0de7f316712 100644
--- a/sci-electronics/magic/magic-7.5.202-r1.ebuild
+++ b/sci-electronics/magic/magic-7.5.202-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.opencircuitdesign.com/magic/archive/${P}.tgz \
 
 LICENSE="HPND GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="sys-libs/ncurses:0=
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
+}