dev-tcltk/itcl: Version BUmp, #433014; drop old

(Portage version: 2.2.0_alpha135/cvs/Linux x86_64)

5 files changed, 26 insertions, 89 deletions

diff --git a/dev-tcltk/itcl/ChangeLog b/dev-tcltk/itcl/ChangeLog
index ad9c3a0cb899..821addb30c79 100644
--- a/dev-tcltk/itcl/ChangeLog
+++ b/dev-tcltk/itcl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-tcltk/itcl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/itcl/ChangeLog,v 1.55 2012/06/07 20:40:52 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/itcl/ChangeLog,v 1.56 2012/10/07 18:04:26 jlec Exp $
+
+*itcl-3.4.1 (07 Oct 2012)
+
+  07 Oct 2012; Justin Lecher <jlec@gentoo.org> -itcl-3.3-r1.ebuild,
+  -itcl-3.3.1_pre20090417.ebuild, -itcl-3.3.1_pre20090417-r1.ebuild,
+  +itcl-3.4.1.ebuild, metadata.xml:
+  Version BUmp, #433014; drop old
 
   07 Jun 2012; Zac Medico <zmedico@gentoo.org> itcl-3.3.1_pre20090417-r1.ebuild:
   inherit multilib for get_libdir
diff --git a/dev-tcltk/itcl/itcl-3.3-r1.ebuild b/dev-tcltk/itcl/itcl-3.3-r1.ebuild
deleted file mode 100644
index 805b76e4dc3f..000000000000
--- a/dev-tcltk/itcl/itcl-3.3-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/itcl/itcl-3.3-r1.ebuild,v 1.7 2011/04/18 06:20:41 jlec Exp $
-
-inherit eutils
-
-MY_P="${PN}${PV}"
-DESCRIPTION="Object Oriented Enhancements for Tcl/Tk"
-HOMEPAGE="http://incrtcl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/incrtcl/${MY_P}.tar.gz"
-
-IUSE=""
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
-
-DEPEND="dev-lang/tcl"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i -e "s/relid'/relid/" configure tclconfig/tcl.m4 || die
-}
-
-src_compile() {
-	econf
-	emake CFLAGS_DEFAULT="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc CHANGES ChangeLog INCOMPATIBLE README TODO
-}
diff --git a/dev-tcltk/itcl/itcl-3.3.1_pre20090417.ebuild b/dev-tcltk/itcl/itcl-3.3.1_pre20090417.ebuild
deleted file mode 100644
index 93cd95e537cd..000000000000
--- a/dev-tcltk/itcl/itcl-3.3.1_pre20090417.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/itcl/itcl-3.3.1_pre20090417.ebuild,v 1.8 2011/04/18 06:20:41 jlec Exp $
-
-inherit eutils multilib versionator
-
-MY_PN="incrTcl"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Object Oriented Enhancements for Tcl/Tk"
-HOMEPAGE="http://incrtcl.sourceforge.net/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-
-IUSE=""
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
-
-DEPEND="dev-lang/tcl"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}/${PN}"
-
-src_compile() {
-	econf
-	emake CFLAGS_DEFAULT="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc ../{CHANGES,ChangeLog,INCOMPATIBLE,README,TODO}
-	cat >> "${T}"/34${PN} <<- EOF
-	LDPATH="/usr/$(get_libdir)/${PN}3.4/"
-	EOF
-	doenvd "${T}"/34${PN} || die
-}
diff --git a/dev-tcltk/itcl/itcl-3.3.1_pre20090417-r1.ebuild b/dev-tcltk/itcl/itcl-3.4.1.ebuild
index d6ae86f30efc..d7d10ae66583 100644
--- a/dev-tcltk/itcl/itcl-3.3.1_pre20090417-r1.ebuild
+++ b/dev-tcltk/itcl/itcl-3.4.1.ebuild
@@ -1,26 +1,26 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/itcl/itcl-3.3.1_pre20090417-r1.ebuild,v 1.3 2012/06/07 20:40:52 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/itcl/itcl-3.4.1.ebuild,v 1.1 2012/10/07 18:04:26 jlec Exp $
 
-EAPI="3"
+EAPI=4
 
-inherit eutils multilib
+inherit eutils multilib versionator
+
+MY_P="${PN}${PV/_beta/b}"
 
-MY_PN="incrTcl"
-MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Object Oriented Enhancements for Tcl/Tk"
 HOMEPAGE="http://incrtcl.sourceforge.net/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/incrtcl/%5BIncr%20Tcl_Tk%5D-source/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
 
-IUSE=""
 SLOT="0"
 LICENSE="BSD"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
 
-DEPEND="dev-lang/tcl"
-RDEPEND="${DEPEND}"
+RDEPEND="dev-lang/tcl"
+DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/${MY_PN}/${PN}"
+S="${WORKDIR}/${PN}${PV}"
 
 src_compile() {
 	# adjust install_name on darwin
@@ -30,14 +30,16 @@ src_compile() {
 			"${S}"/Makefile || die 'sed failed'
 	fi
 
-	emake CFLAGS_DEFAULT="${CFLAGS}" || die "emake failed"
+	sed 's:-pipe::g' -i Makefile || die
+
+	emake CFLAGS_DEFAULT="${CFLAGS}"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc ../{CHANGES,ChangeLog,INCOMPATIBLE,README,TODO}
+	default
+
 	cat >> "${T}"/34${PN} <<- EOF
-	LDPATH="${EPREFIX}/usr/$(get_libdir)/${PN}3.4/"
+	LDPATH="${EPREFIX}/usr/$(get_libdir)/${PN}$(get_version_component_range 1-2)/"
 	EOF
-	doenvd "${T}"/34${PN} || die
+	doenvd "${T}"/34${PN}
 }
diff --git a/dev-tcltk/itcl/metadata.xml b/dev-tcltk/itcl/metadata.xml
index d9408d8ab078..815cc916f2b6 100644
--- a/dev-tcltk/itcl/metadata.xml
+++ b/dev-tcltk/itcl/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tcltk</herd>
+	<herd>tcltk</herd>
 </pkgmetadata>