Version bump, verbose build log (bug 466808)

Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

6 files changed, 86 insertions, 85 deletions

diff --git a/sci-electronics/magic/ChangeLog b/sci-electronics/magic/ChangeLog
index 7f24caca0959..8ecd030dedca 100644
--- a/sci-electronics/magic/ChangeLog
+++ b/sci-electronics/magic/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-electronics/magic
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/ChangeLog,v 1.71 2013/05/15 09:18:02 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/ChangeLog,v 1.72 2013/05/15 11:51:11 xmw Exp $
+
+  15 May 2013; Michael Weber <xmw@gentoo.org>
+  +files/magic-7.5.231-ldflags.patch, +files/magic-7.5.231-verbose-build.patch,
+  -magic-7.5.230.ebuild, magic-7.5.231.ebuild:
+  Version bump, verbose build log (bug 466808)
 
 *magic-7.5.231 (15 May 2013)
 
diff --git a/sci-electronics/magic/Manifest b/sci-electronics/magic/Manifest
index 52b76229c68a..3b6ade7e1ef9 100644
--- a/sci-electronics/magic/Manifest
+++ b/sci-electronics/magic/Manifest
@@ -4,27 +4,27 @@ Hash: SHA256
 AUX magic-7.5.202-include.patch 430 SHA256 a4d98e36678e5cdfdd8682b84f5eff782efe4f529b0d2972b8cfdabf5f9d8466 SHA512 0ff649589b65ac608586a425ca5d2b72e8608d513dae51be7b6e8fd5a2af494b2d186025777af2389358a3be6bd86efee312b4b1c3829d1eb3e9c28bef557e2f WHIRLPOOL 2b738613bea594b096b7d4258e74fcbb50ced9f552c4ece0584365319181978f0034bebe5f7975a97b8842f957dc7ad91c6ca9883c1d1960f020527e0ce1fd8d
 AUX magic-7.5.202-install.patch 566 SHA256 421ab4e98e8377d04c2cc5a07cfeac3ef52dc904c1c4dad488f85e7e5baf72b4 SHA512 332882e4557d0b5fc9fd4d681edc74e501578a5e1d00c144b5d656b8f95a5c6497cff3a6b620305cde032f9628ae169ea478927820ea085dfb52507f5de7722d WHIRLPOOL 439a4eb7eb0c62f928ddd6c389bdd57f308a8315e6862c0073b9fea31a710afc9c170675ce4c5e150313e31cf5da1cbb2669b4e715cdf144c570daa028e8d16a
 AUX magic-7.5.231-blt-test.patch 336 SHA256 0137fa26f7851844077434d406fa5edd0c7a3e0add45d278ff7e962a678ad4ec SHA512 25afff2529e61bc8df436c876e8a8de0b397ce3eff34c1885881bc93a15256fbe36f9aeaaa3f16271afb74027ef91513b57567963a4cf4908e1657722ec46547 WHIRLPOOL 435f75cb35ce8faab0328659285006fde51a1bb5e6c1ffdf6312bec11ef1e70201e8a82cb7e2937dfda6e3ce76fb376cfff2bc1c7c6c0d345049ab57affb4650
+AUX magic-7.5.231-ldflags.patch 426 SHA256 ac132da5c7f30f88c6094c25a6ff4e9fa9c75abfbe4c308c8c83b3bf8debd4d4 SHA512 a9239b27738a2bf74df680997ed2e40cf9b84d930e97450add7e9ca508d27437273592e6ef15d0367a726719abe8c88032394ac1c73333a038cd0a0fac505b1d WHIRLPOOL e65e3a440e3fa436094879a34e591939f585646f88a25ecceae6fcbd45e416afd7084bc366980cef3a1c89bd22c9ecc4d1ba9b7e6b0c9a982d3a258b5f9a0b10
+AUX magic-7.5.231-verbose-build.patch 1033 SHA256 8bdc071d82b9ad9ac597702c5d876b761bce8bceaa5e57d212e34d4d31954495 SHA512 8c3344d157c70525c32a84d3779e100b9e382713132f0828a1e0f4f5c75f1b1bee87e7784d301e0750912bfb4669467b9a2189302e9b8c8f7c74772cfe282636 WHIRLPOOL e27f8869a8f5c1f9212689c5982a567bb7bb6d7de92f559826882ad61a8e0d1c276041963da763285f1f23d5427bfc3b5757037da787eac7116b4b9d64876970
 AUX magic-8.0.109-ldflags.patch 1045 SHA256 ef73a525bfee39da9c6535873eb6f1c23aa60721e7c1b20ade85c9c9d4c8e4c6 SHA512 0a2c7b24112d3bae46c4ea1c110b42712faa16d3ceb63aa68589946e337e65e67fd862191fb17dd76638a5a18a201f49dc1be38134851a3914dda3a9bd792aea WHIRLPOOL 59713a15ff3e7bbf92a55670cb9d3f633a448b4e7b06d873f85b5e6efc101543ed91537fb454eae15d7882c6b0af0caec6335e71292aacd32cc3dbf02deb0ee2
 AUX magic-8.0.131-sed.patch 511 SHA256 bd2d1f3f2523501cf0aed3b26bf859b0798b0a59404227e4c9813cda9b5cda68 SHA512 360fb648ca656dddbb45153879f1ff6c65e2bbcd21c4994beaa4eb574c286f2d5b2ffd9066da74767ca4dea79f8b06ba055cfd2b9a3bbd6ddb32c583b1165873 WHIRLPOOL 700d48526bd6440126a44a3ae79c57134aa4387989c9c2c6273fc4752a28b327d97aff366a6386c221f9c627a0e655953c6aacaab7cf16e6383918a5a5dea6dc
 AUX magic-ldflags.patch 1767 SHA256 0fc244bd6e25c45297ab2293f482e93af3fac97a32aa6864777eb204e1f36c09 SHA512 ba61218111b7484bb6e60f37a3bbf5696afc887766d8de0ae0e33f9dc18023ee7eecf4b6c7012376afbfb2d3caa0e0421e03b0abee0ad1b2d9032ce80c65e355 WHIRLPOOL f150f0b12d2c2712d35f5763bddbf95439f1d307fd55c92126f84a93460b49ff137f75ec95bad4a4348df5c0bc3d3e474240f8ff62e0c238f04f94887200e8c3
 DIST 2002a.tar.gz 6601961 SHA256 8b47889fcbcd36b1cdc2e51fc0aeb8c17b7780f559b01ca1209f9ed5f8c38d19 SHA512 cb8e30df77e58eb37f7ada775db8a8411612897b1cdbcb59b0c4bd814fa73c6cb10a5461e27e9eecb0fe452e194ee95fbb02b568b86848e501b9c37cc24de39e WHIRLPOOL f3cadaaaa48e4603115cd9c34e51a5beb51cc8cdbec3bf4352750c91476943eb182c9bc3865f8a7adfe115012320af7d8132d5d279ea61618f3a713f08cff0c6
 DIST magic-7.4.46.tgz 3605986 SHA256 55f377500a861b12d21483b002c72a7a5fb9b35885f7dc858ee98f4a1e191cac SHA512 fc0b3fb85c0eede189c953be3d0f984fcdbe4cf7ad45e8f89e79c5073427ed3ab44477364fddadf2e2ecefc0d8c170967e76c026f769e74d5325433ce337f255 WHIRLPOOL 62c746db847cbdb0e613c232dbe7f0e4b6de7182af8aa56d8f92fd3f821ea02cee178469bb68f9c623e53dafe66490cc078aa5db970a9dc9922a32268647d8f4
 DIST magic-7.5.202.tgz 3692294 SHA256 975cb3962c8a97e3caae83c5de309bf09e623a829bd36983e82d28104067d99c SHA512 62be6e781ab51a4129a520b91a35ff5c280e7e9cb825e5d71e4012205dd0b777ca8c2355fb071d7d716977d477bddd44e45ca2810d3f97bb63dfe46c5ad1ba80 WHIRLPOOL 5deea41d84752b5706c505c9f33f0c7ab9c020a905f3d399279d9e0b423963cae59c17b73b86994bd04163ca2891eb6137ebc9a62bda3786c8d2e0da4f1a974c
-DIST magic-7.5.230.tgz 3751109 SHA256 6ad55001a5d2fc0233d7ee4039bc1aa4e8ba3ec860ef16bebc2b8c6bdbab52e6 SHA512 cd93ed2974beb17c4e1c61a4426f7ee1d2aafe82a2ecc7568e2964f25353dde092bde59c8b65dac79fc083cc2612838ebcf134a8e4156ec43b4184533b6da10b WHIRLPOOL cb57953b555752e04eebfe55767dc2d604b67e111fa8f1d241fb6febe8688f57a671c36b59b6635b5edb6534c2b022e402de9a81a5397c31529c05343ea8049b
 DIST magic-7.5.231.tgz 3751133 SHA256 48331d4ecfaf0239c746cc0e6f249187c57e751540c48b2c933afcd35430bf29 SHA512 ff1aa170c0fdbeb78aca7328370f40fde1a7276dd77e1b4d4d53f121b38ffecdc8b0d860dc92c1dfeccd1dd7685ee6079aa19984757025fc743ae1a88ed0aace WHIRLPOOL b1a6e0a80235ba0ef4d794436ce29a8cd42d15de48ab8a67e75cb5efcf4c316ce1b1099f1cb5f009eab831082166b80172afd152f7901aa34a5a471fc366edbe
 DIST magic-8.0.131.tgz 3888760 SHA256 e6059b8e53a90720b8fdcbd2099f2f37c0155d6552bf7063ffac82d0b1fd65b0 SHA512 dc921b4ec8d43b33df453343f0f8dcafcbe3cbf43822e61e98b2c598a20ed297b4107ee770708c6ca553d049d96c1841e6e3108859faad23d07a0f9605ac8b51 WHIRLPOOL 4b345dbc5029a2df0fd0e870892eeb397bd76f11d5dcae24f902a196a37287aecadecd4eae42a7eb3ecc34f6783c13c3422488d716663fa89e75e556a2d82b39
 EBUILD magic-7.4.46-r1.ebuild 1348 SHA256 b8b574308e2b761b494abcc940fdfb01bf976c74cdbb5485eb10f49ddb554015 SHA512 f08f28b2cc35c4be5e39a2189f78380616cfd5225fd7dc1a8373d5eea1c7780eb6f91c2f975de102e6a21ba7baf77c4ce565a4efc9360aa0bc21cf76c4639b2f WHIRLPOOL a458b32fb59d533c1b1e4fd3367e1208556cd0dc152825c0b2ba7f31943d531b8202b28a55ded7780c79ceab5907eb1176e451ee4e08f6640d8de9a9ff92a754
 EBUILD magic-7.5.202-r1.ebuild 1827 SHA256 94f56ee0331ff8f5d67fc638a086ab917aad7ef8ab1733a695bbcbd88ea67c95 SHA512 7c5ba93cbf4d3d113f08d3e8e62f853e5c0b8df73469281a4ae15eed2a4569a9469226ca6f86c73d789596df1bfb50bdee1f2cccec20994363e2ca2016549092 WHIRLPOOL 90f2ca96a640062da906506a46734c9754732d6ec54ae853c383fb3f046e38bdac8c638d75e0615bebeeef9db3ff8a4e4686e282b69055811424f53a8f4627f3
 EBUILD magic-7.5.202.ebuild 1715 SHA256 a8e64a2c2b3ec4d09122a6a070fa0a5186afa1036ca4dd058266af5dd58069ee SHA512 3dc2b6aee04a590e22415e3051aa1b91c27e4cf9a506834d34ad8078861c10172e82f798a39133d747715c74f6f949cfdcf23f28e875a5cb25c7cced1f7ccaf1 WHIRLPOOL 2d10cb24a82ee17864118a1c6b12848784f544de63a1cb37733b847cc4ff89b5156dea47f61655ce550f7e106cc86cdb4e567eb9fa87b63c83ef39870567ad05
-EBUILD magic-7.5.230.ebuild 1896 SHA256 2176fe609c73000726fd482fb193550efa681138dfe2fc1ba04440630f5ab97d SHA512 deee6f44cf34151ad53e21488607c32472213808a96c28590e3ea7e800314566d64591b970bbf041addc85368c1b7f92b95cc3b7dde2c2664ed76e6013c86d09 WHIRLPOOL aa00d19f99ec71e3e12b54246adbcbf2b90d3358085cdc29d00f6ed91f60cae178059c23f8a091cdd2b518ec3e061473d776a57612e45a89041a1be1c27c2e26
-EBUILD magic-7.5.231.ebuild 1746 SHA256 94ab5178d816781ad402c97edf02f9b498c4c6f7ffb6378081f2e6860496d692 SHA512 ed15c32de9bbdfd872b9b0e89b2766df08948bb10860bb7c492bc7303cb2c1a9746ffc67375d37642f8f9c71d392c2dc169cc7bc014f5e051d57a4e5d91287d9 WHIRLPOOL c94946fb6f5916e8135348881b6dd6fb1df1fc7442483f2269876030988417a64c8a975668bec576cc3d587d521372006436031cbb6cb83e848529ad3bb2cd69
+EBUILD magic-7.5.231.ebuild 2037 SHA256 f73d31c6bd5cd9f574d8fb11bbb226018a0705ab8686f168152b52435d701f0c SHA512 56443794cd3d8e3aac4e2094a594602a35fc6d6dd2e53d1d9f388c350aa7445e726b227cab7c7159f31646e54d8dbc939ff51f77764399a49bcf403d78cae7f6 WHIRLPOOL 06c3dc05c70432af9af94cd385f64af0e7fd51973ab613a14666babfbc5464fe0f46fb3696579c7332d13531d9640ccd2f8e0f1decd3387aab4d177d13d98467
 EBUILD magic-8.0.131.ebuild 1841 SHA256 aa4cd9368258633f2ecefe30a42982c8e6c53d601d2c4a1edaa349c19a7f19bb SHA512 abbe81bc1847db6fb31bddfe8484f142ac8fae1b6c56c620e47a82fdfca3785b8cefbab967f67813ed90298db411e54f284d0ce55a792f46802ef8cf3e84b95c WHIRLPOOL 5dae6255b395b49a2b4914c4bbf3899f26f4c10457e2caa55766c8cfd70f313b574080c476d83af5b4d3e475037a374bd50ff9cca14f3496a0ed5f939707de49
-MISC ChangeLog 12197 SHA256 19d6f72286bd72f2c7acada27db031e1fd2828945981fa996740ed8437e6f23b SHA512 5211bbb959b7f284e6df9033e80b18d627d2b614e6b05c393c838c62483aa678b392b9e3caf688bf8bfc3169a771b966ed472f1f2ee072e76825059c7edca913 WHIRLPOOL ac2fbad1b197ffe1a3b576eea48a5a1d41523d82afd883e3a294f67522b3ee0501aebd333df65544adce23f75052ae65cdd83934ccdae9f98f7e78100323ea61
+MISC ChangeLog 12418 SHA256 3e780b9c2fdbd36e4e9bf0571a55c3767e086b1a07dd671c164463631a761e12 SHA512 6869b4d792d8748f837e7c53798ed0c8999f04496dcb93e161857a669652da3692c12f6a942c02dc2521202071bff843f11d1ef2fcb7273e1e78b6f06f57aaf6 WHIRLPOOL 44118a7b65c9ff2485ddc5efaa4cc82222ca8a1821a1c913ac0650d8d0339bd57affe3bc72781244cb675cc4e8afb26877e41645ab7154cd06ebbfa7b487a8dd
 MISC metadata.xml 1253 SHA256 97dac63520952a6074ac0a894e36afe38a06711bdcd31912314f6bdd73bf393d SHA512 5449349f54ba0dae6000f7a2b5a641d450f7fa41ed74621acc1dd7d971b236bdf2be02e4a5ea98141edb71750b964823e519dfec9732e915a972fdc7c053f1b9 WHIRLPOOL 4020583a1bac11ac72c82ab34e6225873d8709655317356e95337738d52a6ba9c7cf8b661c6bb1d0b912cf714ebc92feeb831f7edcb6b1e482ffe85e2d01a110
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF0EAREIAAYFAlGTUtAACgkQknrdDGLu8JD+pwD/Ulq4ywyozgDPJIPYpt1SW8zv
-xk3sewdl6IcP/56AUIAA92KRoMkZLFkUFnVktw9ywOwhO4boy46yS3ROswTeHXM=
-=XaXC
+iF4EAREIAAYFAlGTdrMACgkQknrdDGLu8JAS5AD/U456lrbPYtvI+h0P+cFSNzjk
+eMMd8PckqY56Zin/FMQA/iJ79p5oslBJVshm6EO6gN8YpSz20d6UO7ZtkquSI6TJ
+=xLPQ
 -----END PGP SIGNATURE-----
diff --git a/sci-electronics/magic/files/magic-7.5.231-ldflags.patch b/sci-electronics/magic/files/magic-7.5.231-ldflags.patch
new file mode 100644
index 000000000000..32555d66f81e
--- /dev/null
+++ b/sci-electronics/magic/files/magic-7.5.231-ldflags.patch
@@ -0,0 +1,16 @@
+--- magic-7.5.231/scripts/configure.in
++++ magic-7.5.231/scripts/configure.in
+@@ -1428,11 +1428,11 @@
+       ;;
+ 
+     *-linux*)
+-      LDDL_FLAGS='-shared -Wl,-soname,$@'
++      LDDL_FLAGS+=' -shared -Wl,-soname,$@'
+       if test "x${loader_run_path}" != "x" ; then
+         LD_RUN_PATH="${LD_RUN_PATH} -Wl,-rpath,${loader_run_path}"
+       fi
+-      LDFLAGS=""
++      LDFLAGS+=" "
+       EXTRA_LIB_SPECS="-ldl"
+       ;;
+ 
diff --git a/sci-electronics/magic/files/magic-7.5.231-verbose-build.patch b/sci-electronics/magic/files/magic-7.5.231-verbose-build.patch
new file mode 100644
index 000000000000..64ad4fd18278
--- /dev/null
+++ b/sci-electronics/magic/files/magic-7.5.231-verbose-build.patch
@@ -0,0 +1,35 @@
+--- magic-7.5.231/Makefile
++++ magic-7.5.231/Makefile
+@@ -18,12 +18,10 @@
+ all:	$(ALL_TARGET)
+ 
+ standard:
+-	@echo --- errors and warnings logged in file make.log
+-	@${MAKE} mains 2>&1 | tee -a make.log | egrep -i "(.c:|Stop.|---)"
++	@${MAKE} mains
+ 
+ tcl:
+-	@echo --- errors and warnings logged in file make.log
+-	@${MAKE} tcllibrary 2>&1 | tee -a make.log | egrep -i "(.c:|Stop.|---)"
++	@${MAKE} tcllibrary
+ 
+ force: clean all
+ 
+@@ -67,7 +65,7 @@
+ install-magic:
+ 	@echo --- installing executable to $(DESTDIR)${BINDIR}
+ 	@echo --- installing runtime files to $(DESTDIR)${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 @@
+ install-tcl:
+ 	@echo --- installing executable to $(DESTDIR)${BINDIR}
+ 	@echo --- installing runtime files to $(DESTDIR)${LIBDIR}
+-	@${MAKE} install-tcl-real 2>&1 >> install.log
++	@${MAKE} install-tcl-real
+ 
+ install-tcl-real: install-tcl-dirs
+ 	for dir in ${INSTALL_CAD_DIRS} ${PROGRAMS}; do \
diff --git a/sci-electronics/magic/magic-7.5.230.ebuild b/sci-electronics/magic/magic-7.5.230.ebuild
deleted file mode 100644
index 4fb98a77f189..000000000000
--- a/sci-electronics/magic/magic-7.5.230.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/magic-7.5.230.ebuild,v 1.3 2013/05/15 09:18:02 xmw Exp $
-
-EAPI=5
-
-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="HPND 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"
-	epatch "${FILESDIR}/${PN}-7.5.202-install.patch" #422687
-	epatch "${FILESDIR}/${PN}-7.5.202-include.patch"
-	epatch "${FILESDIR}"/${PN}-7.5.231-blt-test.patch
-	cd scripts
-	eautoreconf
-	cd ..
-	sed -i -e "s: -pg : :" tcltk/Makefile || die
-}
-
-src_configure() {
-	# Short-circuit top-level configure script to retain CFLAGS
-	# fix tcl/tk detection #447868
-	cd scripts
-	CPP="cpp" econf --with-tcllibs="/usr/$(get_libdir)" --with-tklibs="/usr/$(get_libdir)"
-}
-
-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-7.5.231.ebuild b/sci-electronics/magic/magic-7.5.231.ebuild
index e6b21dbfa12b..2735f7022981 100644
--- a/sci-electronics/magic/magic-7.5.231.ebuild
+++ b/sci-electronics/magic/magic-7.5.231.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/magic-7.5.231.ebuild,v 1.1 2013/05/15 09:18:02 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/magic/magic-7.5.231.ebuild,v 1.2 2013/05/15 11:51:11 xmw Exp $
 
 EAPI=5
 
@@ -14,21 +14,30 @@ SRC_URI="http://www.opencircuitdesign.com/magic/archive/${P}.tgz \
 LICENSE="HPND GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
+IUSE="debug opengl"
 
 RDEPEND="sys-libs/ncurses
 	sys-libs/readline
 	dev-lang/tcl
 	dev-lang/tk
-	dev-tcltk/blt"
+	dev-tcltk/blt
+	opengl? ( virtual/opengl )"
 DEPEND="${RDEPEND}
 	app-shells/tcsh"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-7.5.231-blt-test.patch
-	cd scripts
+	einfo remove bundled readline-4.3
+	rm -r readline || die
+
+	epatch \
+		"${FILESDIR}"/${PN}-7.5.231-blt-test.patch \
+		"${FILESDIR}"/${PN}-7.5.231-ldflags.patch \
+		"${FILESDIR}"/${PN}-7.5.231-verbose-build.patch
+
+	cd scripts || die
 	eautoreconf
-	cd ..
+	cd .. || die
+
 	sed -i -e "s: -pg : :" tcltk/Makefile || die
 }
 
@@ -36,11 +45,13 @@ src_configure() {
 	# Short-circuit top-level configure script to retain CFLAGS
 	# fix tcl/tk detection #447868
 	cd scripts
-	CPP="cpp" econf --with-tcllibs="/usr/$(get_libdir)" --with-tklibs="/usr/$(get_libdir)"
-}
-
-src_compile() {
-	emake -j1
+	CPP="cpp" econf \
+		--with-tcl=yes \
+		--with-tcllibs="/usr/$(get_libdir)" \
+		--with-tklibs="/usr/$(get_libdir)" \
+		--enable-modular \
+		$(use_enable debug memdebug) \
+		$(use_with opengl)
 }
 
 src_install() {