Fix tcl/tk slotting; Bump to EAPI=5

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

6 files changed, 120 insertions, 27 deletions

diff --git a/dev-tcltk/tcl3d/ChangeLog b/dev-tcltk/tcl3d/ChangeLog
index 67fa9f208c49..7d172f054b3d 100644
--- a/dev-tcltk/tcl3d/ChangeLog
+++ b/dev-tcltk/tcl3d/ChangeLog
@@ -1,10 +1,12 @@
 # ChangeLog for dev-tcltk/tcl3d
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcl3d/ChangeLog,v 1.1 2009/05/10 13:17:04 mescalinum Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcl3d/ChangeLog,v 1.2 2015/03/20 10:49:28 jlec Exp $
+
+  20 Mar 2015; Justin Lecher <jlec@gentoo.org> tcl3d-0.4.0.ebuild:
+  Fix tcl/tk slotting; Bump to EAPI=5
 
 *tcl3d-0.4.0 (10 May 2009)
 
   10 May 2009; Federico Ferri <mescalinum@gentoo.org> +metadata.xml,
   +tcl3d-0.4.0.ebuild:
   first ebuild for tcl3d
-
diff --git a/dev-tcltk/tcl3d/Manifest b/dev-tcltk/tcl3d/Manifest
index a3f9ac3d226b..5bd15d34a7b6 100644
--- a/dev-tcltk/tcl3d/Manifest
+++ b/dev-tcltk/tcl3d/Manifest
@@ -1,4 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST tcl3d-src-0.4.0.zip 1501305 SHA256 f98bee3c2ca0189780125b683481949e1499018ee56ad1d21b4e3e594e058496 SHA512 a8a525693bc45e9fb9e2167e2121d300ff60534f2bced33bb068a1075cfd8e8281dd97bd7fb432b9d6a95cdb37fc3da03c82dd1ee20e368fb8ac249ea54c30a5 WHIRLPOOL cbc1982df7a28b93249ff7877d0376b06b64261bb33f3df8c64b2c80600684529605b9eeff6f593c2e9f7c64c253066b226f0a0dae9cee21bec980f6782c7777
-EBUILD tcl3d-0.4.0.ebuild 1468 SHA256 444d8043f12a9a913bf352fc1b57f8eb93b43c854e8f512a7697563f3fab6647 SHA512 80756eae804cb314f2a91caed1cdc8819dcb612fd8ffa2e4d7f38e78b8b0a238fff03ca7059f2d85eb5cfa29eb8e34d68ed5052f702b3662aec8fcfa5e19ab40 WHIRLPOOL 25570fac3e35eca5cb1f7432bb0c6f155236b56f560e943fbde0aa2a6091590a024074f9f9b8ece6da7f51f120d64a90d62ddd4ce72d0a3304a8a3c145a08e4a
-MISC ChangeLog 353 SHA256 300ef743edfa882e7d4a28c18172b2baf45fc44b55294d70f606b67dfd81d656 SHA512 b4ad323f60a42f600cfe4274f5894706d213eb1cb0a8388475e28853e8cf377fcf518b998f97149b79ee75aa98f196c23130fb644a208bd68c90539fbc9f29c6 WHIRLPOOL 388deb08ba1e6a298f3f38955268d20f63c46e40def6b06472ac2c24c3a34c25de191bd6f32774fdb90218fd443e96680bbc30827fe7c460f5f3592cb67bb95e
+EBUILD tcl3d-0.4.0.ebuild 1422 SHA256 7c43cd73368b8fc05435738543fd8dcf05c37bd1917f14b0f07110950d190480 SHA512 37d5f65fa6a35fbec926b2b7ef21bc5b00f00779d8bc727872c4c5b8d39e99123edc84ebb71762af9ec3770ec094361203088bf3867cb2db7c28e6d3aef7a293 WHIRLPOOL 32dbaec04b60814eb70539549a39c24919a78566bf3ff4156c9b2e07f0a97830e383abaf2d8f80e06f0a813907506596687df1cd71251e999d8513b168298bae
+MISC ChangeLog 452 SHA256 e47ff3e9b3d79f880d71917d69e9f4d3e236a48de5fa8f586c2ee0867d675bdc SHA512 3099403172178ddb49fa978a0c564287486b85ee41ce1a7f2b2702af01192665d883f1d526b8c8caa88513c4a7c7c5c7ec128d803a641ccf31092aefb1d6fac7 WHIRLPOOL 8e8505d5d46b3de80d9185f70def25b7726593c843b8ea657d5bcd0497e874f35774fa5910742b04616da1d21f2b23056a3fe378cdcd2798c57144dc3744b54f
 MISC metadata.xml 973 SHA256 d19c700ca330cb05b6176d1a60cc59bb4d10fe56c671404cdbccceadbeface67 SHA512 651648b39f5ed8bf1ac8599795d9434f3923903be589bdb5d9f9145cd786afafedc4ff11321da52476c92ecd6241c3ba940142391d0a83fef34ea043b4c41eda WHIRLPOOL 528a3b152713726a3ec1ef1fd072ba774620b85eea5661e01689243e91cf489082b16bd4b7931a79e2e1c7b0933de31b4c39f8597220f3e43857888a03acd114
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVC/s5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir4JcP/2bZQmNIhBmApRVYkGma9PIz
+PG/pCPyGsbkcZBnnUxGssQkcfJ8QgLA0UK4Zx1iAb94fGtevjbML/FxxKyf72Y3Z
+hHj/rd4eCObcXiu51TrroLAZ3DbfMK+HQL8Gttrnub+TJwGG8nxFiRGFEm0VXO58
+TrU7On73anznOD5f2HciiNohZedMlJVZHUiD2gcI6pFYFhBMd/o/inqmMrPlpYPZ
+bz+i4tYbEqqoDs1l/kM7OVkUjmpvroVI6kAseEUoK4dQUT+Mkq3THInyVytIPfLR
+oMWoHwDpqDDu1m96o7XQb3uDYhtNX4XxBUvxIG8DH69BNyd3lnogUy/mHSqm90Qs
+SXxYrwsHG8/5U7tKxCYGRPxIN/DNTAAVcGKiVVlHYGMWAzm8+B6KjE8ECw6EJpBO
+yCxFSrPwmSwOV6FWIJmI1YnGYm7c4ClaaIpTSDKSBvWzM3H/aaua3X/Xle21mOaZ
+bajL3g8QJ5lUoLtIhuBAQCNr6tOIOCVsGMh1g5+A4MpIREzayZbnTFdhVl5xuyde
+Kr4mJK3OFPxA78N6aN+Oxyl902UiNNrTF1Yi2krM5J4TSyzXbvNO7LiVWk9XWcHT
+TpsaRe9KgkRTLeDX/7cVR+yTU08ixDu6G12jxW6Hsfd3TA8gBXRx2FhYPwwJAcYZ
+bfssNdPQcS/LYD6KWhZ0
+=G3D4
+-----END PGP SIGNATURE-----
diff --git a/dev-tcltk/tcl3d/tcl3d-0.4.0.ebuild b/dev-tcltk/tcl3d/tcl3d-0.4.0.ebuild
index 7dbf176a16b5..ad07a7c2f770 100644
--- a/dev-tcltk/tcl3d/tcl3d-0.4.0.ebuild
+++ b/dev-tcltk/tcl3d/tcl3d-0.4.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcl3d/tcl3d-0.4.0.ebuild,v 1.1 2009/05/10 13:17:04 mescalinum Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tcl3d/tcl3d-0.4.0.ebuild,v 1.2 2015/03/20 10:49:28 jlec Exp $
 
-EAPI="2"
+EAPI=5
 
-inherit flag-o-matic toolchain-funcs
+inherit flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="Tcl bindings to OpenGL and other 3D libraries"
 HOMEPAGE="http://www.tcl3d.org"
@@ -15,12 +15,14 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="debug"
 
-RDEPEND="virtual/opengl
-	dev-lang/tk
-	dev-lang/tcl
+RDEPEND="
+	dev-games/ode
+	dev-lang/tk:0=
+	dev-lang/tcl:0=
 	media-libs/libsdl
 	media-libs/ftgl
-	dev-games/ode"
+	virtual/opengl
+"
 DEPEND="${RDEPEND}
 	>=dev-lang/swig-1.3.19"
 
@@ -32,27 +34,24 @@ src_prepare() {
 	sed -i \
 		-e 's:^\(TCLMAJOR\) *=\(.*\)$:\1 = '${TCL_VERSION[0]}':' \
 		-e 's:^\(TCLMINOR\) *=\(.*\)$:\1 = '${TCL_VERSION[1]}':' \
-		config_Linux*
+		config_Linux* || die
 
 	# fix libSDL link
 	sed -i \
 		-e 's:-lSDL-1\.2:-lSDL:g' \
-		tcl3dSDL/Makefile
+		tcl3dSDL/Makefile || die
 }
 
 src_compile() {
 	append-flags -mieee-fp -ffloat-store -fPIC
-	if use debug; then
-		append-flags -g
-		filter-flags -O?
-	else
-		append-flags -DNDEBUG
-	fi
-	gmake INSTDIR="/usr" OPT="${CFLAGS}" CC="$(tc-getCC) -c" \
+	use debug || append-flags -DNDEBUG
+
+	emake \
+		INSTDIR="/usr" OPT="${CFLAGS}" CC="$(tc-getCC) -c" \
 		CXX="$(tc-getCXX) -c" LD="$(tc-getLD)" \
-		WRAP_FTGL=1 WRAP_SDL=1 WRAP_GL2PS=0 WRAP_ODE=1 || die "gmake failed"
+		WRAP_FTGL=1 WRAP_SDL=1 WRAP_GL2PS=0 WRAP_ODE=1
 }
 
 src_install() {
-	gmake INSTDIR="${D}/usr" DESTDIR="${D}" install || die "gmake install failed"
+	emake INSTDIR="${D}/usr" DESTDIR="${D}" INSTLIB="${D}/usr$(get_libdir)" install
 }
diff --git a/dev-tcltk/tclperl/ChangeLog b/dev-tcltk/tclperl/ChangeLog
index 422452b1f87e..a616a0957e67 100644
--- a/dev-tcltk/tclperl/ChangeLog
+++ b/dev-tcltk/tclperl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-tcltk/tclperl
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclperl/ChangeLog,v 1.11 2012/10/07 12:31:09 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclperl/ChangeLog,v 1.12 2015/03/20 10:47:29 jlec Exp $
+
+*tclperl-3.2-r1 (20 Mar 2015)
+
+  20 Mar 2015; Justin Lecher <jlec@gentoo.org> +tclperl-3.2-r1.ebuild:
+  Fix tcl/tk slotting; Bump to EAPI=5
 
   07 Oct 2012; Agostino Sarubbo <ago@gentoo.org> -tclperl-3.1.ebuild:
   Remove old
diff --git a/dev-tcltk/tclperl/Manifest b/dev-tcltk/tclperl/Manifest
index 265d67f40070..350ca3350b41 100644
--- a/dev-tcltk/tclperl/Manifest
+++ b/dev-tcltk/tclperl/Manifest
@@ -1,4 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST tclperl-3.2.tar.bz2 11765 SHA256 3643915a2f3d51da4d6296d0b57d796163ba0358f65bc97da6c0ef5cccb26173 SHA512 aed6fb4b0275cf75e6024336e81e3cd1502d82ae697e79b6142d2f9b3cfb0891541cc585fa83d6219632f11d6eda43b141d009caf5fe7433b2b2ca92aa875c00 WHIRLPOOL a64d8b043f208cd4a76424920c3510baed0ceecb9b5308463e6d6739df4d89cb7b4bde13b69db0c65e9da653a41fa64ca78986eeabf9631720e18e8fd6571862
+EBUILD tclperl-3.2-r1.ebuild 1029 SHA256 c4fe132791d5a2cd4065289a887e1cd829deecd8ee866f51c2856d947c5e1261 SHA512 1000387058fb1d3b027fdba33a0fe2740cf38efb732faecff6969c766eaa5b48ce512f81273a920f38f8bd3139af6c01fe95076cb01d912d9bd347837fc9f365 WHIRLPOOL 494cc36573a98be090a67e46111a495564c31e652be670dd7d51b07b1e0e28d9b1c2b6ceacf7e46161e54cd67a6ce6be57bccbd08ccd49678492ef06feef342b
 EBUILD tclperl-3.2.ebuild 1027 SHA256 16c02b18a33b86c97d557b2f07097b2faba6377d168a3694e61968011e33d533 SHA512 91ef922177d9180604c177d17794c16284a9257d3c8e8f628979ce4bb68cd901c0aaff435e3bc784af0b89ab5fa27d50fe2043309dd22d954d5ec2abaa7e4622 WHIRLPOOL 2ec96065bd9914569cca689c8024b1defdeaa42e2db015e167fae70a91a1fb3c4f0a1042315f334e0397befa55161721026aaaf70a24bfb0f9a3c891609c2de6
-MISC ChangeLog 1244 SHA256 f809fa16ea9b662956070f4bac2900189142e2733b5aaeea469d2310233b5e19 SHA512 b80279e443ffdbd4e718a13e50d9ad97c5b5d497e7ed4a9880448b87ca9167637227a9e96989121df6496ed4290920def0e6622857d6a1b1ffb9972dc90e6e53 WHIRLPOOL f4217321d1db30765a926574b64c69305f01693963ad93ed10b8730b98323eab1e6d11d9535f6503d3d716891fc20516894d26681d38a5c01e383ef007783955
+MISC ChangeLog 1386 SHA256 100fc5b59aa9c926b69ca8bfbdf2dd5b809e6631936626a60fb3939b21055827 SHA512 2f7897f759051a18e7ec73c2f063842009ba8db758ea604cc1f12bd2b8da7020a7cc0860c27649ecedc612a11d309fa12b611901f88f75a664ee7dd42b1eb1fc WHIRLPOOL 88e9135364c583851854d1fb599219e0bab41cf4ddcfd76c3a1ff7cdebac7e59d4c7e115ef695f92fb60c08c39ca1adca99bc0ca352fe277565f5da5581959b1
 MISC metadata.xml 158 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290 SHA512 60ffb8f937083ebfa2a70b1a3ac90bd9ca29cae6194ab77341a78c17d44123cedf5bf740611910e9a2f65585d0973e489bb6062471d26d0a5107e1e8b7f267ae WHIRLPOOL ef7a6760bc24a47df7eb857c63984981cf6b92fc52ce6cb4f71d937308dbbb94590841c5870bf0d6d550084f8dbe59707be14e61e3482267c5268c8f7d3a1080
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJVC/rCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirN/AP+wdFcpgpdYVL6/ryHiDQld6F
+rYWYBIzMUx3n2DiCrVh7dax8G7jOAZJItk2bPLcqeLWjf6CEMtkDUTCNxbi1Dis+
+wbqcNPyzEmnFHDCmSdfDD7iU+uaf2e6bQu8LyauM1i5ueNDf3aQXBMkPwaBfF5tV
+qmne95hQFUAvavInxs3lvoL/Q1vY3xJJoUTzKH/X+g7l7e9G+UdO8/gx9F3DSyqy
+ZTA9XUVhcANvPZBqBmfhHvkjsvPDLpMalhE/m+MbVCbk1hbWurQZvdfBqaXLkX0p
+CLoEFsR8L1XnFOHDyTxt62rjlUi24PMLBtKs9U7cUAFfAsdPb82AtepoeXcDiblA
+tfmYHftkkUxcVklmmwqIq002w2Hq76EnutvLzOoe5R+0RqKO8ssClx596cakuzUt
+OtmLFt2TDTwnrB3GgBBXr1PmHbC423Vv1IPSHMVovk5V/s4FLhOaS4PlLPIFOfoh
+I1VHEgGtwTpb8Hyhl6dxCMIcn80RDLyCKlia9QBb7Toaeqdxhmb4Xun95ct2XOLT
+wbXPrJQHV6oz40oUHkrhGyGKoKSvMzJhl2sQ6mpdb2HmpFwFKbNG/BLr5KobcoBp
+3UTtouXxk9gGHjwL1chFvTRwhMrqaPkguXE1dt8JkcUueDUrM+Jq+zk38K0I04By
+wDCbhjzpeb4QjtwCYTvp
+=FgU3
+-----END PGP SIGNATURE-----
diff --git a/dev-tcltk/tclperl/tclperl-3.2-r1.ebuild b/dev-tcltk/tclperl/tclperl-3.2-r1.ebuild
new file mode 100644
index 000000000000..634ab584d31a
--- /dev/null
+++ b/dev-tcltk/tclperl/tclperl-3.2-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclperl/tclperl-3.2-r1.ebuild,v 1.1 2015/03/20 10:47:29 jlec Exp $
+
+EAPI=5
+
+inherit flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Perl package for Tcl"
+HOMEPAGE="http://jfontain.free.fr/tclperl.htm"
+SRC_URI="http://jfontain.free.fr/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-lang/tcl-8.3.3:0
+	>=dev-lang/perl-5.6.0"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	append-flags -fPIC
+
+	# ./build.sh
+	perl Makefile.PL || die
+	emake OPTIMIZE="${CFLAGS}" Tcl.o
+
+	$(tc-getCC) -shared ${LDFLAGS} ${CFLAGS} -o tclperl.so.${PV} -DUSE_TCL_STUBS \
+		tclperl.c tclthread.c `perl -MExtUtils::Embed -e ccopts -e ldopts` \
+		/usr/$(get_libdir)/libtclstub`echo 'puts $tcl_version' | tclsh`.a Tcl.o || die
+}
+
+src_install() {
+	exeinto /usr/$(get_libdir)/${P}
+	doexe tclperl.so.${PV}
+	doexe pkgIndex.tcl
+
+	dodoc CHANGES README
+	dohtml tclperl.htm
+}