[sci-electronics/magic] Make it use LDFLAGS, improve tutorial file location

(Portage version: 2.1.8.3/git/Linux x86_64)
 (Signed Manifest commit)

4 files changed, 71 insertions, 17 deletions

diff --git a/sci-electronics/magic/ChangeLog b/sci-electronics/magic/ChangeLog
index 1ca9e4cd8..b2242bc4e 100644
--- a/sci-electronics/magic/ChangeLog
+++ b/sci-electronics/magic/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 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 $
 
+  02 Jul 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
+  magic-7.5.202.ebuild, +files/magic-ldflags.patch:
+  Beat it into accepting LDFLAGS, improve tutorial file location
+
 *magic-7.5.202 (01 Jul 2010)
 
   01 Jul 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
diff --git a/sci-electronics/magic/Manifest b/sci-electronics/magic/Manifest
index a45c28c1b..5f6d651d5 100644
--- a/sci-electronics/magic/Manifest
+++ b/sci-electronics/magic/Manifest
@@ -1,29 +1,30 @@
 -----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.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.5.129.ebuild 1169 RMD160 efcbdb2305cc1f534d033c07d0ae4d10c64c925c SHA1 6f69a3dc9bd07740513e903e8a8b19e1c4e9fba4 SHA256 eb4d021bf18eb32db362742557c6d7b69780fa51ba102af0db9ff7c2418389bc
-EBUILD magic-7.5.202.ebuild 1285 RMD160 90efdd67379833ad22b3a42307db5fe0262abda7 SHA1 6f80c97333575dc3824b0e255283ea66e12c9227 SHA256 3b4a0a30917061b13edb1aae44890704194dfd09b30614ffdb0b3044a259686c
-MISC ChangeLog 9662 RMD160 a72f5f8fc72fc7bb0d893d1763a9d40afda0fd3e SHA1 b166e111557c03dc91df5e50a0ccb4d0f5397b94 SHA256 cab9bb9fc87bb4aeb5183f5289c8b9bbac509a8d42157a4b3f9397e4757c517c
+EBUILD magic-7.5.202.ebuild 1617 RMD160 b39326b368f18def98ebf342352733ac81ff7d33 SHA1 6b403f14850bc7a3ca57943ae434e1e58bdc8fa9 SHA256 42f05bbe50082c0f0fbf1483511a86b9255f5dc9da1b17b10dc19e22cb0915df
+MISC ChangeLog 9846 RMD160 1fd0c45aba420a48ab42a6968c72551df69f0316 SHA1 ec2ea619e43f1b45c21f01aadb82d8deb1647886 SHA256 85a0b8d91e531104c4c0c0231e8ba040659044e6a6becab00bca683a0f10f25e
 MISC metadata.xml 900 RMD160 2eadae625fcf32b2b3c16cc5dea80123066b943c SHA1 015acb62eb2b6ba91c08ae1954a5bddef8d547d4 SHA256 a53b73f34be6d5dff3316ac95d407f45b7272a4934420b21cf4ca2ea81b153da
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iQIcBAEBAgAGBQJMLQ2cAAoJENwGBM22xffeLzIP/Awb2KoDUzb0+0mMKEukhTwJ
-rkh64dG7Z/5BVQBsKx6QhoV/+HJRgXz0uXNB4LCtbvHWUVP62KZF5k8wDGgcMIFA
-46SqHfxU0wW6yIPzVZuojV7+CC6UrrcXr4q4uTuaJ/9mGthCyqf/JBFJGeSQX0A1
-EQcS5lRVW/Z+PXGLCKgkay63JSnGVYNALXhbAIBBqDmRnAKjjxhowW3di7Wxvv8r
-p/g7KjIdEisEnqneJUu9J86Wvni5fCBk6ZOLSDFSwnTQxE0IWONUqrxuIulFxqt9
-tiUco2lN5rUqjDC4nxrx34xZ1V9jDk1/LKziGWTApNkFwWDuB9o4rduOLEAMzhrD
-fbqw8zEJolUvYceEk2t1zJbAAduUuTntgsslbL9zc5L3y3hCZYZBzgZKz664J39z
-MT0XXFruJSRadz8Kmwt109Wu5ELUdLO7yUwoOEDIxkZ5/yl3i5U0iLZNSsCfAjnV
-0pVVWgydbOB1OjDPxzZR7sI8ZR4Yccy/lxDOrE15+smYo0xZkumoq6h0bS+EtDQZ
-GPvhL6n2hXpdl5/Yzh53C20V2HGdB3/8F8y7R5n3mJU11M80CjcgDoCQ5q7ir37Z
-d0X6AxgUGBRyHPQHSBFtzfWuBMH7l5JIC2MPIH7PT30btS2NAkdmiQH0PV4PO5nK
-wcA+YdFLHbYbLla6+HjD
-=vYyt
+iQIcBAEBAgAGBQJMLkpxAAoJENwGBM22xffeTSkP/A6cQsfAfJHZfRtCIa7Jn2wJ
+dc9/2KM3SspG3ytU6JL0pbjgiD/m1nq8qqmDLwZmPEjwBaMqgOmkxLRjnBO799GK
+y33fJ8i07cPjGTWVMMRkIGdbqdVki2s77GJjhy8orCqzNdaiQ6oVxPCse382hwdu
+QvX7AoiU3yQpILIIDSqhe9pSLHAzy8cVLZVhocNFXUF+gcN02AwQ7cyy01DbQBuv
+T1HztXzjHtsuElN2+Trcd5pfqtKre5ek3dOtSDy+svvcfprXzlzNNv2VmmFDpOcH
+yAAH24dLQroTQ5VS25b5UseQNIlLi0X+Vk4wFrPlPOMMJgLOlTaYoZp2kk/DQlcF
+n4VE7sPDZTDubyzSrmVkmBvsDGarKy7waPq/+ZY6fA6k/9sgkJ7X7QDDeX71YF0R
+SsRZ1h4kHJUZTCOpF7lDY1bD0Gx/aVLQEQfoTSMBbnfcH9CYPjGD9EssAmxHyb/k
+vAjPKERil1XeOaor1T3FsEIqauLw+VP4dAYq9GzoFtYxXzyvbmn90v2lTeHU3GCV
+qVjbyats218BuACZy005RWnDRzD5MbsRcoVZA2QgGIoc0GHG+IcOiOsaQeEUVEMP
+kfs3Tk2b+CY/wQdkXdXSA47X3pKpnd95h9+uFAa41u2znADZ/qwr4c5wjTWw1mw0
+imXGihGNb5qaz0H4o54k
+=Ejh8
 -----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 000000000..60d5891be
--- /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
index ea405cef8..95a8c0736 100644
--- a/sci-electronics/magic/magic-7.5.202.ebuild
+++ b/sci-electronics/magic/magic-7.5.202.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=2
 
-inherit multilib
+inherit multilib eutils autotools
 
 DESCRIPTION="The VLSI design CAD tool."
 HOMEPAGE="http://www.opencircuitdesign.com/magic/index.html"
@@ -25,6 +25,10 @@ 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"
 }
 
@@ -43,11 +47,16 @@ src_install() {
 
 	dodoc README README.Tcl TODO || die
 
-	# Move docs from LIBDIR to DATADIR and add symlink.
+	# 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
 }