Removed old, streamlined others

Package-Manager: portage-2.2.0_alpha15/cvs/Linux x86_64

7 files changed, 40 insertions, 291 deletions

diff --git a/dev-tcltk/blt/ChangeLog b/dev-tcltk/blt/ChangeLog
index f7c625d88ed5..0e809ec77053 100644
--- a/dev-tcltk/blt/ChangeLog
+++ b/dev-tcltk/blt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-tcltk/blt
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/ChangeLog,v 1.35 2010/04/08 10:18:22 jlec Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/ChangeLog,v 1.36 2011/01/16 19:30:10 jlec Exp $
+
+  16 Jan 2011; Justin Lecher <jlec@gentoo.org> -blt-2.4z-r1.ebuild,
+  blt-2.4z-r5.ebuild, -blt-2.4z-r6.ebuild, -blt-2.4z-r7.ebuild,
+  blt-2.4z-r8.ebuild:
+  Removed old, streamlined others
 
 *blt-2.4z-r8 (08 Apr 2010)
 
diff --git a/dev-tcltk/blt/Manifest b/dev-tcltk/blt/Manifest
index b5fb7e7ecd75..810982fdc468 100644
--- a/dev-tcltk/blt/Manifest
+++ b/dev-tcltk/blt/Manifest
@@ -9,19 +9,15 @@ AUX blt-2.4z-tcl8.5-fixpkgruntime.patch 1976 RMD160 ec7999c78fe95bdfff2785c125d4
 AUX blt2.4z-64bit.patch 891 RMD160 f2bc82f9a98d632480fc678af7a94fdf8899810d SHA1 22624ed8ba4b002212f5f2bf3adb5ac80c923439 SHA256 a0a3da1016eea86279d1648f4390b38083484582bdb5b7e460435408000ca2f5
 AUX blt2.4z-install.diff 1057 RMD160 4531572aa1177ab362d522964a8f62d6401ff237 SHA1 47b65e77e663cf95282612216a2fb4c8d8dda725 SHA256 6849139557c2846c332c4d81b04c03872933adfef0fa8432d6b757cfd02774c8
 AUX pkgIndex.tcl 146 RMD160 fdb0f974b517685ba1f207b11eea1f3a4c4f2f14 SHA1 c005d612949e1a70a34fa83098d1a36bf51a912c SHA256 79ff9c41afa3157d6f180dce21ddf82f5a55ed24a274eea0eeef511ec2f2659d
-DIST BLT2.4z.tar.gz 2200973 RMD160 d54d9fdb6c61391c191afab4701716d18a3d928b SHA1 29f719aa762f1762dbf4a3b0e60dc5356118ba2f SHA256 6de705eccf2ec676b4071b74ec9e211c590477fadf6f05566cfd8ed6a03c60da
 DIST blt2.4z-8.5.2.tar.gz 2326234 RMD160 1012e0a21a9b45957d6482e55e21b9e54e3f1db2 SHA1 217986ef73dfbb9f64d4af7da0248e28ee2f6cab SHA256 e4e60628f79e1899175b51a3398133131fac52021b9b9019b4483525c48d6d16
-EBUILD blt-2.4z-r1.ebuild 1546 RMD160 fbe03e761a4805d08b09134fc99fe1841ce4ae4e SHA1 6f102bd18477c337311b0b295223d57d2b4b9de6 SHA256 b86793214d4c68ccbf47157907102a36c1280b38323fc42b2b2bd1a3290e792e
-EBUILD blt-2.4z-r5.ebuild 2019 RMD160 3c4621ed1444563a5230d93bbaacf9ce996142a1 SHA1 2125adf5c0a69ecaff278dad225af8d4d2b4de70 SHA256 50c7cbb9a84c13ba123372af8bf7ecdfe2b960a3ed7ff6b89b8679555af1a2d4
-EBUILD blt-2.4z-r6.ebuild 2927 RMD160 4891fa495042809d0439ebe7f56939f105990ead SHA1 0ffaa8becfbffeef615a81f5b341391c8e914c3b SHA256 e2050eb7017efc14a0a1c082a789ae9182a4dac2dd32dc7dc678988cb0b44935
-EBUILD blt-2.4z-r7.ebuild 3108 RMD160 cf5f64fd794027caac7a39fde7dbc3024ca93595 SHA1 5ef78d2187cc1fe55acc1b8fc4397f1782d34ba5 SHA256 d0cfc0f380eece2a045bd7e41f5164214823aca024180d06e602220192d529e9
-EBUILD blt-2.4z-r8.ebuild 3150 RMD160 9602921b25167e8d6e76b7ddcad2660458806ed2 SHA1 74ae86c61e04adf95c183b876fdee48cb6a8e667 SHA256 ae91da45aaa3d3046429fe2ed95f37271613f5cf812ba98f14fa89b2391caa8b
-MISC ChangeLog 4969 RMD160 223e74e559e43fae1ee90d7c4f135748827e0d75 SHA1 4de8ae2e8ef99c96b7c0019ac5eae3a0ce9731b9 SHA256 d68ac586b9d65d4e56a8391ecade3838dd0e092f27597f943bb506a82ac51f11
+EBUILD blt-2.4z-r5.ebuild 1966 RMD160 7ed0217cc4ce38f735f3fb8a564155a9bc2c8553 SHA1 a73af55d1e4d367300e7c3e99dac184d2e707483 SHA256 8c04d2477688d863a8ca23c928993163f6a52d57ed817267efd3298a1ebe24f4
+EBUILD blt-2.4z-r8.ebuild 3093 RMD160 8d47aab8a58c0460f5e8702fcb0425a4f6dabd1b SHA1 e256168df296e320bdf22f521860678ef44c7bdf SHA256 9c160bd4e3b9a32b1d16f5cffa4e460bceb0e6c446169d2da58cfe430a02bf21
+MISC ChangeLog 5158 RMD160 5f24e973836374765a38daaefccd2eb394d2ea6c SHA1 ae0831d39d36a6c03159d103c5d93a68acc4e3be SHA256 ee9f5fe859bf6b7a3ceefd6f75116de8db2d9314f44814ed4dd638b399da0443
 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAku9rXQACgkQgAnW8HDreRb5rwCfZMeJofkCDcGXKdBrsJNqil+O
-8LsAoK7jwgi955St+nS2fx6vNSrvIbQ7
-=Zd76
+iEYEARECAAYFAk0zR0cACgkQgAnW8HDreRaLiACfW0jS2PbcXV3oqPpEQKJEhvxn
+HOoAn0up5sP353/t8s6/U21oTq2W2NLx
+=aWpc
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/blt/blt-2.4z-r1.ebuild b/dev-tcltk/blt/blt-2.4z-r1.ebuild
deleted file mode 100644
index e43909e2a9b0..000000000000
--- a/dev-tcltk/blt/blt-2.4z-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r1.ebuild,v 1.9 2008/02/17 04:19:39 tgall Exp $
-
-inherit eutils flag-o-matic
-
-SRC_URI="mirror://sourceforge/blt/BLT2.4z.tar.gz"
-HOMEPAGE="http://blt.sf.net"
-DESCRIPTION="BLT is an extension to the Tk toolkit adding new widgets, geometry managers, and miscellaneous commands."
-DEPEND=">=dev-lang/tk-8.0"
-IUSE=""
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-
-S="${WORKDIR}/${PN}${PV}"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/blt2.4z-install.diff
-
-	# From blt-2.4z-6mdk.src.rpm
-	epatch "${FILESDIR}"/blt2.4z-64bit.patch
-
-	# Set the correct libdir
-	sed -i -e "s:\(^libdir=\${exec_prefix}/\)lib:\1$(get_libdir):" \
-		"${S}"/configure || die "sed failed"
-}
-
-src_compile() {
-	# bug 167934
-	append-flags -fPIC
-
-	cd "${S}"
-	./configure --host=${CHOST} \
-				--prefix=/usr \
-				--libdir=/usr/$(get_libdir) \
-				--mandir=/usr/share/man \
-				--infodir=/usr/share/info \
-				--with-x \
-				--with-tcl=/usr/$(get_libdir) || die "./configure failed"
-
-	emake -j1 CFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	dodir /usr/bin \
-		/usr/lib/blt2.4/demos/bitmaps \
-		/usr/share/man/mann \
-		/usr/include \
-			|| die "dodir failed"
-	emake -j1 INSTALL_ROOT="${D}" install || die "make install failed"
-
-	dodoc NEWS PROBLEMS README
-	for f in `ls "${D}"/usr/share/man/mann` ; do
-		mv "${D}"/usr/share/man/mann/${f} "${D}"/usr/share/man/mann/${f/.n/.nblt}
-	done
-}
diff --git a/dev-tcltk/blt/blt-2.4z-r5.ebuild b/dev-tcltk/blt/blt-2.4z-r5.ebuild
index 678ec79cef70..e5855cc76eb7 100644
--- a/dev-tcltk/blt/blt-2.4z-r5.ebuild
+++ b/dev-tcltk/blt/blt-2.4z-r5.ebuild
@@ -1,21 +1,23 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r5.ebuild,v 1.7 2009/09/22 11:55:33 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r5.ebuild,v 1.8 2011/01/16 19:30:10 jlec Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
 MY_V_SUFFIX="-8.5.2"
-HOMEPAGE="http://blt.sourceforge.net/
-http://jos.decoster.googlepages.com/bltfortk8.5.2"
+HOMEPAGE="
+	http://blt.sourceforge.net/
+	http://jos.decoster.googlepages.com/bltfortk8.5.2"
 SRC_URI="http://jos.decoster.googlepages.com/${PN}${PV}${MY_V_SUFFIX}.tar.gz"
-DESCRIPTION="BLT is an extension to the Tk toolkit adding new widgets, geometry managers, and misc commands."
+DESCRIPTION="Extension to Tk, adding new widgets, geometry managers, and misc commands"
 
 IUSE=""
 SLOT="0"
 LICENSE="BSD"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
 
-DEPEND=">=dev-lang/tk-8.0
+DEPEND="
+	dev-lang/tk
 	x11-libs/libX11"
 RDEPEND="${DEPEND}"
 
@@ -44,7 +46,7 @@ src_compile() {
 	# bug 167934
 	append-flags -fPIC
 
-	econf --with-blt=/usr/$(get_libdir) || die "./configure failed"
+	econf --with-blt=/usr/$(get_libdir)
 	# parallel borks
 	emake -j1 || die "emake failed"
 }
diff --git a/dev-tcltk/blt/blt-2.4z-r6.ebuild b/dev-tcltk/blt/blt-2.4z-r6.ebuild
deleted file mode 100644
index e99d585d70b6..000000000000
--- a/dev-tcltk/blt/blt-2.4z-r6.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r6.ebuild,v 1.1 2010/03/06 12:16:07 jlec Exp $
-
-EAPI="3"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-MY_V_SUFFIX="-8.5.2"
-HOMEPAGE="http://blt.sourceforge.net/
-http://jos.decoster.googlepages.com/bltfortk8.5.2"
-SRC_URI="http://jos.decoster.googlepages.com/${PN}${PV}${MY_V_SUFFIX}.tar.gz"
-DESCRIPTION="BLT is an extension to the Tk toolkit adding new widgets, geometry managers, and misc commands."
-
-IUSE="jpeg X"
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	>=dev-lang/tk-8.0
-	jpeg? ( media-libs/jpeg:0 )
-	X? ( x11-libs/libX11 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}${PV}${MY_V_SUFFIX}"
-
-src_prepare() {
-	epatch "${FILESDIR}/blt-2.4z-r4-fix-makefile.patch"
-	epatch "${FILESDIR}/blt-2.4z-r4-fix-makefile2.patch"
-	# From blt-2.4z-6mdk.src.rpm
-	epatch "${FILESDIR}"/blt2.4z-64bit.patch
-
-	#epatch "${FILESDIR}"/blt-2.4z-tcl8.5-fix.patch
-	epatch "${FILESDIR}"/blt-2.4z-tcl8.5-fixpkgruntime.patch
-
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-
-	# Set the correct libdir
-	sed -i -e "s:\(^libdir=\${exec_prefix}/\)lib:\1$(get_libdir):" \
-		configure* || die "sed configure* failed"
-	sed -i -e "/^scriptdir =/s:lib:$(get_libdir):" \
-		Makefile.in demos/Makefile.in || die "sed Makefile.in failed"
-}
-
-src_configure() {
-	# bug 167934
-	append-flags -fPIC
-
-	econf \
-		--x-includes="${EPREFIX}"/usr/include \
-		--x-libraries="${EPREFIX}"/usr/$(get_libdir) \
-		--with-blt="${EPREFIX}"/usr/$(get_libdir) \
-		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
-		--with-tk="${EPREFIX}"/usr/$(get_libdir) \
-		--with-tclincls="${EPREFIX}"/usr/include \
-		--with-tkincls="${EPREFIX}"/usr/include \
-		--with-tcllibs="${EPREFIX}"/usr/$(get_libdir) \
-		--with-tklibs="${EPREFIX}"/usr/$(get_libdir) \
-		--with-cc="$(tc-getCC)" \
-		--with-cflags="${CFLAGS}" \
-		$(use_enable jpeg) \
-		$(use_with X x) \
-		|| die "./configure failed"
-
-}
-
-src_compile() {
-	# parallel borks
-	emake -j1 LDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	sed \
-		-e "s:../src/bltwish:${EPREFIX}/usr/bin/bltwish:g" \
-		-e "s:../bltwish:${EPREFIX}/usr/bin/bltwish:g" \
-		-e "s:/usr/local/bin/bltwish:${EPREFIX}/usr/bin/bltwish:g" \
-		-e "s:/usr/local/bin/tclsh:${EPREFIX}/usr/bin/tclsh:g" \
-		-i demos/{,scripts/}*.tcl || die
-
-	dodir /usr/bin \
-		/usr/$(get_libdir)/blt2.4/demos/bitmaps \
-		/usr/share/man/mann \
-		/usr/include \
-			|| die "dodir failed"
-	emake -j1 INSTALL_ROOT="${D}" install || die "make install failed"
-
-	dodoc NEWS PROBLEMS README
-	dohtml html/*.html
-	for f in `ls "${ED}"/usr/share/man/mann` ; do
-		mv "${ED}"/usr/share/man/mann/${f} "${ED}"/usr/share/man/mann/${f/.n/.nblt}
-	done
-
-	# bug 259338 - dev-tcltk/blt-2.4z-r4 provides empty pkgIndex.tcl
-	cp "${FILESDIR}"/pkgIndex.tcl "${ED}"/usr/$(get_libdir)/blt2.4/pkgIndex.tcl
-}
diff --git a/dev-tcltk/blt/blt-2.4z-r7.ebuild b/dev-tcltk/blt/blt-2.4z-r7.ebuild
deleted file mode 100644
index d97f98521187..000000000000
--- a/dev-tcltk/blt/blt-2.4z-r7.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r7.ebuild,v 1.1 2010/03/21 20:05:21 jlec Exp $
-
-EAPI="3"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-MY_V_SUFFIX="-8.5.2"
-HOMEPAGE="http://blt.sourceforge.net/
-http://jos.decoster.googlepages.com/bltfortk8.5.2"
-SRC_URI="http://jos.decoster.googlepages.com/${PN}${PV}${MY_V_SUFFIX}.tar.gz"
-DESCRIPTION="BLT is an extension to the Tk toolkit adding new widgets, geometry managers, and misc commands."
-
-IUSE="jpeg X"
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	>=dev-lang/tk-8.0
-	jpeg? ( media-libs/jpeg:0 )
-	X? ( x11-libs/libX11 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}${PV}${MY_V_SUFFIX}"
-
-src_prepare() {
-	epatch "${FILESDIR}/blt-2.4z-r4-fix-makefile.patch"
-	epatch "${FILESDIR}/blt-2.4z-r4-fix-makefile2.patch"
-	# From blt-2.4z-6mdk.src.rpm
-	epatch "${FILESDIR}"/blt2.4z-64bit.patch
-
-	#epatch "${FILESDIR}"/blt-2.4z-tcl8.5-fix.patch
-	epatch "${FILESDIR}"/blt-2.4z-tcl8.5-fixpkgruntime.patch
-
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-
-	# Set the correct libdir
-	sed -i -e "s:\(^libdir=\${exec_prefix}/\)lib:\1$(get_libdir):" \
-		configure* || die "sed configure* failed"
-	sed -i -e "/^scriptdir =/s:lib:$(get_libdir):" \
-		Makefile.in demos/Makefile.in || die "sed Makefile.in failed"
-}
-
-src_configure() {
-	# bug 167934
-	append-flags -fPIC
-
-	econf \
-		--x-includes="${EPREFIX}"/usr/include \
-		--x-libraries="${EPREFIX}"/usr/$(get_libdir) \
-		--with-blt="${EPREFIX}"/usr/$(get_libdir) \
-		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
-		--with-tk="${EPREFIX}"/usr/$(get_libdir) \
-		--with-tclincls="${EPREFIX}"/usr/include \
-		--with-tkincls="${EPREFIX}"/usr/include \
-		--with-tcllibs="${EPREFIX}"/usr/$(get_libdir) \
-		--with-tklibs="${EPREFIX}"/usr/$(get_libdir) \
-		--with-cc="$(tc-getCC)" \
-		--with-cflags="${CFLAGS}" \
-		$(use_enable jpeg) \
-		$(use_with X x) \
-		|| die "./configure failed"
-
-}
-
-src_compile() {
-	# parallel borks
-	emake -j1 LDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	sed \
-		-e "s:../src/bltwish:${EPREFIX}/usr/bin/bltwish:g" \
-		-e "s:../bltwish:${EPREFIX}/usr/bin/bltwish:g" \
-		-e "s:/usr/local/bin/bltwish:${EPREFIX}/usr/bin/bltwish:g" \
-		-e "s:/usr/local/bin/tclsh:${EPREFIX}/usr/bin/tclsh:g" \
-		-i demos/{,scripts/}*.tcl || die
-
-	dodir /usr/bin \
-		/usr/$(get_libdir)/blt2.4/demos/bitmaps \
-		/usr/share/man/mann \
-		/usr/include \
-			|| die "dodir failed"
-	emake -j1 INSTALL_ROOT="${D}" install || die "make install failed"
-
-	dodoc NEWS PROBLEMS README
-	dohtml html/*.html
-	for f in `ls "${ED}"/usr/share/man/mann` ; do
-		mv "${ED}"/usr/share/man/mann/${f} "${ED}"/usr/share/man/mann/${f/.n/.nblt}
-	done
-
-	# bug 259338 - dev-tcltk/blt-2.4z-r4 provides empty pkgIndex.tcl
-	cp "${FILESDIR}"/pkgIndex.tcl "${ED}"/usr/$(get_libdir)/blt2.4/pkgIndex.tcl
-
-	# fix for linking against shared lib with -lBLT or -lBLTlite
-	dosym libBLT24.so /usr/$(get_libdir)/libBLT.so || die
-	dosym libBLTlite24.so /usr/$(get_libdir)/libBLTlite.so || die
-}
diff --git a/dev-tcltk/blt/blt-2.4z-r8.ebuild b/dev-tcltk/blt/blt-2.4z-r8.ebuild
index 48fc97b02ee0..455307b8a155 100644
--- a/dev-tcltk/blt/blt-2.4z-r8.ebuild
+++ b/dev-tcltk/blt/blt-2.4z-r8.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r8.ebuild,v 1.1 2010/04/08 10:18:22 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r8.ebuild,v 1.2 2011/01/16 19:30:10 jlec Exp $
 
 EAPI="3"
 
 inherit eutils flag-o-matic toolchain-funcs
 
 MY_V_SUFFIX="-8.5.2"
-HOMEPAGE="http://blt.sourceforge.net/
-http://jos.decoster.googlepages.com/bltfortk8.5.2"
+HOMEPAGE="
+	http://blt.sourceforge.net/
+	http://jos.decoster.googlepages.com/bltfortk8.5.2"
 SRC_URI="http://jos.decoster.googlepages.com/${PN}${PV}${MY_V_SUFFIX}.tar.gz"
-DESCRIPTION="BLT is an extension to the Tk toolkit adding new widgets, geometry managers, and misc commands."
+DESCRIPTION="Extension to Tk, adding new widgets, geometry managers, and misc commands"
 
 IUSE="jpeg X"
 SLOT="0"
@@ -18,7 +19,7 @@ LICENSE="BSD"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
-	>=dev-lang/tk-8.0
+	dev-lang/tk
 	jpeg? ( media-libs/jpeg:0 )
 	X? ( x11-libs/libX11 )"
 RDEPEND="${DEPEND}"
@@ -50,20 +51,19 @@ src_configure() {
 	append-flags -fPIC
 
 	econf \
-		--x-includes="${EPREFIX}"/usr/include \
-		--x-libraries="${EPREFIX}"/usr/$(get_libdir) \
-		--with-blt="${EPREFIX}"/usr/$(get_libdir) \
-		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
-		--with-tk="${EPREFIX}"/usr/$(get_libdir) \
-		--with-tclincls="${EPREFIX}"/usr/include \
-		--with-tkincls="${EPREFIX}"/usr/include \
-		--with-tcllibs="${EPREFIX}"/usr/$(get_libdir) \
-		--with-tklibs="${EPREFIX}"/usr/$(get_libdir) \
+		--x-includes="${EPREFIX}/usr/include" \
+		--x-libraries="${EPREFIX}/usr/$(get_libdir)" \
+		--with-blt="${EPREFIX}/usr/$(get_libdir)" \
+		--with-tcl="${EPREFIX}/usr/$(get_libdir)" \
+		--with-tk="${EPREFIX}/usr/$(get_libdir)" \
+		--with-tclincls="${EPREFIX}/usr/include" \
+		--with-tkincls="${EPREFIX}/usr/include" \
+		--with-tcllibs="${EPREFIX}/usr/$(get_libdir)" \
+		--with-tklibs="${EPREFIX}/usr/$(get_libdir)" \
 		--with-cc="$(tc-getCC)" \
 		--with-cflags="${CFLAGS}" \
 		$(use_enable jpeg) \
-		$(use_with X x) \
-		|| die "./configure failed"
+		$(use_with X x)
 
 }