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

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

6 files changed, 30 insertions, 96 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/Manifest b/dev-tcltk/itcl/Manifest
index 8ae426017388..7eb691b80487 100644
--- a/dev-tcltk/itcl/Manifest
+++ b/dev-tcltk/itcl/Manifest
@@ -1,10 +1,7 @@
 AUX 3.4_beta1-test.patch 694 SHA256 d6ddda3bd589c2e3597dc1a41bcdf8ba0aa4a74f92408b06b23056251462b87d SHA512 b6a23e47e7a4d8d25a7493fd8ad47f62606d5d3969bf774f21e6c7b1175d2af9aa9413e13313fe27748d705b94fa848261084c03d4e58c63ba54a84863d946ca WHIRLPOOL 2d85b1387d71c191b618f12ccc8562b1afe9cbc6d609db6ca1ee8dbf537233b7531d67beee62f91ad7bb99a3b2ecceec5e1ee70ac37a1e9162f0a1f3e8693a8f
-DIST incrTcl-3.3.1_pre20090417.tar.gz 502592 SHA256 e59301855c7ec4e8e763e8c4c4570ccd36bb27af2dc065a945abe6e8fd4c8776 SHA512 df071bd80f5b21b308a6dadcdb7f0d63041ed47fdd51aece9810b762295af9d93d965f11d0652f52fb7ca5c4d429999eacf93252649aea9476c73b41d6a2ea15 WHIRLPOOL ae0a3a505cde5b7aabc961ce516f292b223880e7854177e0e25e5db4fbd49930269ac1fdb38d09458f48d0aa84a6f71ea34c68644bee9e4c5ce35f4b2a83f584
-DIST itcl3.3.tar.gz 306364 SHA256 7829b5ea39d0ed0eea43a071cd39e7477343d59e1d2ea9c810fa53e257fcb55c SHA512 25e261ec4b1573b0f2dd97beed1ee8aeef2988474ae058f9c56375c4c6f4e16d420220990395c7ebc50d0c55d4157880c3f2d71017599785a38c20a6a280904a WHIRLPOOL 0596d0500c4ea1983dfafac24019a5400a5243cd3ad5b5f6666c4bb73b312d9a88e3bf5d83543856448b8ac454c1df3e035e57abc1898a32e1da933632af64bd
+DIST itcl3.4.1.tar.gz 263316 SHA256 5330832ce72da97610497a58eca904287d0ff91f9ec741a4e4810d5b933c8568 SHA512 288c9b636f1814371bedd33d570a8d46055e136953685a111b76f3b89a6c7aaa1ee9223ceaae1c5ce43198195cb1adc2b178d7c4101d7fd14cb7e756c98bf2b0 WHIRLPOOL c513678bfef5f76b875af68d0bf97fd86b9a9673bb87efbb295dc3faa9a8b011c4c34ed6eddbf648f11b804656e6c99103e8f0ea2c06abc5b1c308b1a5df78cc
 DIST itcl3.4b1.tar.gz 306342 SHA256 dc99fcf6c00b00774dbfb94ccc437ea3e6315a198645b6d2acf8acba8fdb4608 SHA512 230776b5d14b57b63fb4e93f7bb5bc5cfa9532a5dba286cefae02d2c5fa58566cea12d8d62303eaa5797e956d3534acc8a9015c18555f925bb72e32362e7e241 WHIRLPOOL 02b32ba77f6e9eb520929abcb4a1dbc11e782793903da757bf4189788224faf218279380d557ed9ba36c24e8e6cd57a9821c4985153bfa9f7281daa19637a476
-EBUILD itcl-3.3-r1.ebuild 856 SHA256 141885e97cf3ccf536f18a3a982c30044276b621a825e864e675680f39030cfe SHA512 7ce5c6d1a1a7d208cc90d22908067daed7837da2090c0b3ecaa486b772e3f586da3bb1f4515fcb436e29029f2938efe5277349a3176038a8cd703e5da80744c5 WHIRLPOOL bf44e8250f78624ded98bb80f911e85278967989398ce692bb9ddc6f1bbe3331e95496fcdb4c8ec9eeccb9df51438c6617978fe89a992dff836ec42985f7e508
-EBUILD itcl-3.3.1_pre20090417-r1.ebuild 1145 SHA256 d12eaed307accedb4c22da16536b9e0d39872517fe92169814f01f1074de9a6e SHA512 ebd618c62d760df70c9b7267417397688113befd91bffecd6715e6c319773f59e945f405ca5c1ea2fe698a3ab687bb04ec672b5b4a822f4bd7b2ffac410413f5 WHIRLPOOL 127573bcb49ff724abe3469774339473f718b6f2d8ec7b2b97003525722d65b41d3e063ba5f01d208850e23ebb864ecdd2d131f014fba1890b78e176d591f5a4
-EBUILD itcl-3.3.1_pre20090417.ebuild 906 SHA256 138af42d96a27b78657572f2a307c16e8762fd2983b7bb5f541b3d25a177ee70 SHA512 6e7e774f11f726e542b8a8c711f2ce2705eaff369ebe1459880164569012a171f24d9c764d0151243f2fe2c9ec8f97fe1b13fceb58f40e95d3fef9871a18452e WHIRLPOOL cc83653fc944b49e1315625a98b11586cbc8c059c2f1c64722ae8b70ea3988fd513d4423164670b77c189c96f9b0ba43d233bffd949288f64f09ba98c14375e6
+EBUILD itcl-3.4.1.ebuild 1134 SHA256 31b855fd4c5dd2f5bb634af0a39a15e948b41eb088afc5a97d6b828cb22404cd SHA512 59043800340af163c32f9d4b0ce4bb955bbf8c44b1946b11b8296a5d30ed908f785b640c0db8ee8903acac03a25ba58341131f9f1c40374828f8c16f24dc0625 WHIRLPOOL 1f76a3d6bf3021f40d20bc24f2697606fa22e0a6e52a4bfd541915bf1ff63756a69b1838985387a2497a9b8027a6afe635358eea8bfcad159eaaee67f0344ffa
 EBUILD itcl-3.4_beta1.ebuild 1360 SHA256 ce7c8908260832521dc92d78f57a91779bc0e098383d38be1a1e796545c38fd9 SHA512 b945159ac4c37ac07692a9bafbcc783f779eb3d22c523fbaad959c59283f4a9f7b90e63753375fe3635412658e1d068d895847e6071298cee61661c11061e74f WHIRLPOOL 82045f6b1d08c6c2a4d1bf5bbe5761fe5a7abebfe4cd8bbdccd81ed356cbebc5a5ef661677de2b78093e3958298a60d61e892aa837163cbd4ac87466bd07d40c
-MISC ChangeLog 6601 SHA256 950786dd7b7d8fe2b33d0146ec1591edcbc05f0925c4f7e639a6d263f7dc5bea SHA512 afb6eef17a024e000c12c85f78db62c9eeb81d22404209da4de1b6bf38b8fda3d19aa2f107dc15dd7237d4a8c4224bb9f0cdab2627dab67e35e6a796ed8cdaf4 WHIRLPOOL c350fbf04cf1f048c02b4a32ac5d2f5d4d29de63057e3700045a64c6fcf9d3ef2563080c7da0f1354604a663eb21577bfa45cf90818db6f965f7ede55a568a9f
-MISC metadata.xml 158 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290 SHA512 60ffb8f937083ebfa2a70b1a3ac90bd9ca29cae6194ab77341a78c17d44123cedf5bf740611910e9a2f65585d0973e489bb6062471d26d0a5107e1e8b7f267ae WHIRLPOOL ef7a6760bc24a47df7eb857c63984981cf6b92fc52ce6cb4f71d937308dbbb94590841c5870bf0d6d550084f8dbe59707be14e61e3482267c5268c8f7d3a1080
+MISC ChangeLog 6833 SHA256 5136d66cb2aae892aa835c0ec91b22d381e7f3861580e3d746ebad35d51db5a8 SHA512 585d3d84a25e3c2a0f9a3940c856b84e2b5ebe57a356f4dbdb939f64970a431d6b3709615e40e1935967ec9c924adb99c2f453dbdd1955a5a6f1ebd71dbb2890 WHIRLPOOL d656d6b03b7c8294859d9e99efdd95b187be714f75f3c151e9c3be6406c45f4f12cfb72caeeabea8832d4fb6cb1f0f78206c2f647927d5a14fd23a636b070a68
+MISC metadata.xml 159 SHA256 fe5eea9a276e11191a0c8e266e6dc128c3dd73347bb01020814acb0863316029 SHA512 7072291f336a01c6b6b0da289ab72b58c47062f94a06fed23a4982b776b5711df68662a3d8ff3a6954e2699817bda9780e01920056e29164944ead4d0fe815b6 WHIRLPOOL cb245ca2202ce7a680a703d76cf8dcb11e7627fddcc3c0bd9127855263f0e3d48db44511c2257ae793a0cb1d4a7764ffba5ceb992ff1a351d8f8a7ab96307683
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>