Version bump, sorting file locations and LDFLAGS. Fixes bugs 299476 and 337425.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 136 insertions, 3 deletions

diff --git a/sci-electronics/magic/ChangeLog b/sci-electronics/magic/ChangeLog
index 8ad83b67b5ef..507442105863 100644
--- a/sci-electronics/magic/ChangeLog
+++ b/sci-electronics/magic/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-electronics/magic
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/ChangeLog,v 1.56 2009/09/27 14:53:44 nixnut Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/ChangeLog,v 1.57 2010/09/20 18:20:44 dilfridge Exp $
+
+*magic-7.5.202 (20 Sep 2010)
+
+  20 Sep 2010; Andreas K. Huettel <dilfridge@gentoo.org>
+  +magic-7.5.202.ebuild:
+  Version bump, moving aux files back to LIBDIR and docs manually to the doc
+  dir. Beat it into accepting LDFLAGS, improve tutorial file location. Fixes
+  bug 299476 and bug 337425.
 
   27 Sep 2009; nixnut <nixnut@gentoo.org> magic-7.4.46-r1.ebuild:
   ppc stable #281411
diff --git a/sci-electronics/magic/Manifest b/sci-electronics/magic/Manifest
index eac33558fb60..640acafbd5ac 100644
--- a/sci-electronics/magic/Manifest
+++ b/sci-electronics/magic/Manifest
@@ -1,10 +1,33 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX magic-ldflags.patch 1767 RMD160 b3e9d9a2e314ec3f920fa4bf26ffa38a5468c0f0 SHA1 a18cc71b387f052d5739e44953d1f4b467588c7a SHA256 0fc244bd6e25c45297ab2293f482e93af3fac97a32aa6864777eb204e1f36c09
 DIST 2002a.tar.gz 6601961 RMD160 3eb7e61999b032dc47bddc3398543f4d4cde3adf SHA1 908160476c9cddcedfb8a73f78f67f2c66480cc2 SHA256 8b47889fcbcd36b1cdc2e51fc0aeb8c17b7780f559b01ca1209f9ed5f8c38d19
 DIST magic-7.4.46.tgz 3605986 RMD160 695623481c4c9d4437bd30c629a6c8bac91f6ad6 SHA1 95a344c6b4ff54466f0a7521a322d5f8da1a430f SHA256 55f377500a861b12d21483b002c72a7a5fb9b35885f7dc858ee98f4a1e191cac
 DIST magic-7.5.127.tgz 3674974 RMD160 f741008a16dca5fa282527e7c4c5a512d0d8033a SHA1 f1a25e805d91fbb279ffa9ca11a72016edda71f5 SHA256 fa19563ec011e25b1a1655a6ceda47dc8ad6898dbf68448fe17bc51427a8f578
 DIST magic-7.5.129.tgz 3674551 RMD160 25e6e1e46069667a3ca50b333d8b09a3d1dfd980 SHA1 501ed7f4ef849ee9caece8715b562f9b539822c2 SHA256 81bca3223ddf7251d73a38692e7a4f4758076c65a2fa1e3825c6bd8cce491041
+DIST magic-7.5.202.tgz 3692294 RMD160 99ae0bae03d131a4ed87a1059e92706f0a7f20d8 SHA1 baf03cff89d9c60c9fc9b23e40a085db78f1ff4b SHA256 975cb3962c8a97e3caae83c5de309bf09e623a829bd36983e82d28104067d99c
 EBUILD magic-7.4.46-r1.ebuild 1381 RMD160 c3e0a719f134a679aca1046ebb8d1528baf788ac SHA1 e66bb40def3f22391adefad628b88655197abe34 SHA256 d9d600c5cb30c2caa7524951e2fa473ed4c6e56306830a72e65fbce8a26cbab8
 EBUILD magic-7.4.46.ebuild 1230 RMD160 f09c49b4dd27e433b2b32b756e5143ea648719ab SHA1 5c2c4ddc324e507db395ecc8c42ad18bbd43d8a1 SHA256 6772fdba04e210fa5760709a7c4278a671c02466f31b60abda84b415b7df6e1d
 EBUILD magic-7.5.127.ebuild 1169 RMD160 27d29d2fcae9b5d77062433aa5f6d8445afa5a53 SHA1 c05426f44c21c872c916a705c19c128437f951b1 SHA256 c674ea9034db6a97376c9b005e09e29f301ea466140cb97b03a79085b39deb19
 EBUILD magic-7.5.129.ebuild 1169 RMD160 efcbdb2305cc1f534d033c07d0ae4d10c64c925c SHA1 6f69a3dc9bd07740513e903e8a8b19e1c4e9fba4 SHA256 eb4d021bf18eb32db362742557c6d7b69780fa51ba102af0db9ff7c2418389bc
-MISC ChangeLog 9312 RMD160 12f73b3da9f9e751a96ac3421ab6d2ba72b2318d SHA1 b4cf7db7003f871f2fc3e08b907b6fbce7194097 SHA256 5b8ebe8cf2af29b16567076db5823a02a55fb6b2d6203d481e3eda335b8e0118
+EBUILD magic-7.5.202.ebuild 1724 RMD160 27eee26639ea17048c69059c1ac6b4a171265b33 SHA1 fe247f42760cd9bf42fe122014ac89175a3883a0 SHA256 ea6639bf99c58babb30f4655f4b01852ea76cd4db16a3b346bf5b4526358240d
+MISC ChangeLog 9611 RMD160 68e1b93410f3ebe2cb375fb909d206a0efb69db6 SHA1 aa89f21fc13405f0b376ad7acf913414b77a004d SHA256 3f4ba2fd5157eb0d7e89f85e6858443c31609dcad79bb0b72000cd231cb7302a
 MISC metadata.xml 900 RMD160 2eadae625fcf32b2b3c16cc5dea80123066b943c SHA1 015acb62eb2b6ba91c08ae1954a5bddef8d547d4 SHA256 a53b73f34be6d5dff3316ac95d407f45b7272a4934420b21cf4ca2ea81b153da
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQIcBAEBAgAGBQJMl6X8AAoJENwGBM22xffe2BYP/igQiBBCTevVQ8VQN2WgJ31b
+6kllVELZPpXTYEx9PjVlIf7g2W0DTUd+bZwuFrGi2E5POYLo+peKaWRgcVru1+Rk
+oAOC0pK0bW3V9ARVHLUbU5VSeZM5Z6DsVDk6lPer8c0HKJjpb0w4hiu+oIAUbgtD
+/d2DTlV4kx4NBfHo0yUTUi4hd4VcrTHOMw7Sx/tGnSfQG9BWeArZyXnJUntgTszk
+YCLUkjg1tBtAdP44N5jh8jz5b1CwBiMoUjyyLg+X6EhfnPImYuLzbaQTi+UoJRZH
+oHz0hvK5qMKLZhqKC3fzxsb8A4tz1+ee/q2kykq/wct6GmB6wtDzgCEOY4CkNkwo
+IIAcLkfBDtQ/LCT6IL/h5dSVuIfW5I2UlvRVsvTUwRn4XYk9yP8IsiOyi52qpyNA
+Vn3pa+L811e3SAmHldZgs1kMvth/OAygMy89LRZwnSgZmUpu0l9wj0bzRwPHyPhl
+WoSfjQrqQasQUhPzu2SW2zUAEqqDJ4OXGlqC2CLRX7IOAFe2NDwr53i4K0cPtpmA
+hJP9DVuMiLtGcGnoBdbjL0OUEqQhMGCCsWAg7gOvbjGV4QdyOLvZ/1hUvo63/llA
+9iLnY8fl2cCEp3jbhrp8cMHRGBUMLuaPmSvtKa31pQR6BJnNPaC/xyLVWSMAU2y3
+BRuHqT6Mm830uaB78ZF8
+=LxYs
+-----END PGP SIGNATURE-----
diff --git a/sci-electronics/magic/files/magic-ldflags.patch b/sci-electronics/magic/files/magic-ldflags.patch
new file mode 100644
index 000000000000..60d5891beee0
--- /dev/null
+++ b/sci-electronics/magic/files/magic-ldflags.patch
@@ -0,0 +1,40 @@
+diff -r -u magic-7.5.202.orig/scripts/configure.in magic-7.5.202/scripts/configure.in
+--- magic-7.5.202.orig/scripts/configure.in	2010-03-08 14:33:07.000000000 +0100
++++ magic-7.5.202/scripts/configure.in	2010-07-02 22:15:50.814199319 +0200
+@@ -1350,7 +1350,6 @@
+       if test "x${loader_run_path}" != "x" ; then
+         LD_RUN_PATH="${LD_RUN_PATH} -Wl,-rpath,${loader_run_path}"
+       fi
+-      LDFLAGS=""
+       EXTRA_LIB_SPECS="-ldl"
+       ;;
+ 
+diff -r -u magic-7.5.202.orig/scripts/defs.mak.in magic-7.5.202/scripts/defs.mak.in
+--- magic-7.5.202.orig/scripts/defs.mak.in	2010-03-08 14:33:07.000000000 +0100
++++ magic-7.5.202/scripts/defs.mak.in	2010-07-02 22:15:50.814199319 +0200
+@@ -53,7 +53,7 @@
+ M4		       = @M4@
+ RANLIB                 = @RANLIB@
+ SHDLIB_EXT             = @SHDLIB_EXT@
+-LDDL_FLAGS             = @LDDL_FLAGS@
++LDDL_FLAGS             = ${LDFLAGS} @LDDL_FLAGS@
+ LD_RUN_PATH	       = @LD_RUN_PATH@
+ LIB_SPECS	       = @LIB_SPECS@
+ WISH_EXE	       = @WISH_EXE@
+diff -r -u magic-7.5.202.orig/tcltk/Makefile magic-7.5.202/tcltk/Makefile
+--- magic-7.5.202.orig/tcltk/Makefile	2009-05-29 15:54:55.000000000 +0200
++++ magic-7.5.202/tcltk/Makefile	2010-07-02 22:16:30.916202298 +0200
+@@ -41,11 +41,11 @@
+ 	(cd $(DESTDIR)${TCLDIR}; chmod 0755 tkcon.tcl tkshell.tcl)
+ 
+ magicexec: magicexec.c
+-	${CC} ${CFLAGS} -pg ${CPPFLAGS} ${DFLAGS} magicexec.c -o magicexec \
++	${CC} ${CFLAGS} -pg ${CPPFLAGS} ${DFLAGS} ${LDFLAGS} magicexec.c -o magicexec \
+ 		${LD_RUN_PATH} ${LIBS} ${LIB_SPECS}
+ 
+ magicdnull: magicdnull.c
+-	${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} magicdnull.c -o magicdnull \
++	${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} ${LDFLAGS} magicdnull.c -o magicdnull \
+ 		${LD_RUN_PATH} ${LIBS} ${LIB_SPECS}
+ 
+ magic.tcl: magic.tcl.in ${MAGICDIR}/defs.mak
diff --git a/sci-electronics/magic/magic-7.5.202.ebuild b/sci-electronics/magic/magic-7.5.202.ebuild
new file mode 100644
index 000000000000..a96268b43452
--- /dev/null
+++ b/sci-electronics/magic/magic-7.5.202.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/magic-7.5.202.ebuild,v 1.1 2010/09/20 18:20:44 dilfridge Exp $
+
+EAPI=2
+
+inherit multilib eutils 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="as-is GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="sys-libs/ncurses
+	sys-libs/readline
+	dev-lang/tcl
+	dev-lang/tk
+	dev-tcltk/blt"
+DEPEND="${RDEPEND}
+	app-shells/tcsh"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-ldflags.patch"
+	cd scripts
+	eautoreconf
+	cd ..
+	sed -i -e "s: -pg : :" tcltk/Makefile || die "tcltk patch failed"
+}
+
+src_configure() {
+	# Short-circuit top-level configure script to retain CFLAGS
+	cd scripts
+	CPP="cpp" econf
+}
+
+src_compile() {
+	emake -j1 || die "Compilation failed"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die
+
+	dodoc README README.Tcl TODO || die
+
+	# 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" || die
+
+	# Move tutorial from libdir to datadir and add symlink.
+	dodir /usr/share/${PN} || die
+	mv "${D}/usr/$(get_libdir)/magic/tutorial" "${D}/usr/share/${PN}/" || die
+	dosym "/usr/share/${PN}/tutorial" "/usr/$(get_libdir)/magic/tutorial" || die
+
+	# Install latest MOSIS tech files
+	cp -pPR "${WORKDIR}"/2002a "${D}"/usr/$(get_libdir)/magic/sys/current || die
+}