Fix tcl/tk slotting; drop old

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

4 files changed, 32 insertions, 216 deletions

diff --git a/sys-fs/owfs/ChangeLog b/sys-fs/owfs/ChangeLog
index 02260ca10154..ee4613ed6b63 100644
--- a/sys-fs/owfs/ChangeLog
+++ b/sys-fs/owfs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/owfs
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/owfs/ChangeLog,v 1.26 2014/12/26 11:42:05 mgorny Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/owfs/ChangeLog,v 1.27 2015/03/20 15:12:49 jlec Exp $
+
+  20 Mar 2015; Justin Lecher <jlec@gentoo.org> -owfs-2.7_p21-r2.ebuild,
+  owfs-2.7_p21-r3.ebuild:
+  Fix tcl/tk slotting; drop old
 
 *owfs-2.7_p21-r3 (26 Dec 2014)
 
diff --git a/sys-fs/owfs/Manifest b/sys-fs/owfs/Manifest
index a02e921e1a48..5f8e330e186b 100644
--- a/sys-fs/owfs/Manifest
+++ b/sys-fs/owfs/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX owfs-vendordir.patch 1261 SHA256 9a077df11039e1c20150a0f50f4f988635b40048284fb4f5310d6a2b33318041 SHA512 12d5efbdeaa2f59e2c12aa5df4602f8b3ac1b3aff946fd9915bcfe717e9fd342766c379380a02087762b6028c048d08e05d88d9183667ad7222f3996ca0ec12c WHIRLPOOL 19b710c1938bf5daaefd7af5bdb6245942acc56abb4e6f608f845d3bffdb4244bd49bf7ba050b95510e518954d8aee11d8e388443f419d415286b5f7ec1ab844
 AUX owfs.confd 86 SHA256 a9dcdfcea30619f692275a7ee9842746e10ed72884dd0c8184668cbe7f065783 SHA512 7c23bd956d2e22cc3952eefa52bd6b5b08c1b24561d5ac9cfc5222595d083ea64ba26dd0b4826e0fad3e2eb5774cc06a7bb6c7afd9c4c0726ce2b4b6df4dbdcd WHIRLPOOL bc8d7e66c34f8411387b3931f387b937e9a8fff81bcb0b48eaa086310962477e42927350f1ecbfad7dee2a854c86899910de63a434f0c77face3cedc54ec85d8
@@ -11,26 +11,25 @@ AUX owhttpd.initd 847 SHA256 81469aa86786f6926685b9f4668051c8a862afd0f380a71df49
 AUX owserver.confd 108 SHA256 e14d16d11a9a4c597a957f2db48840e1fa6280db241dcab28922ae2c449940e7 SHA512 c10fb23a60d89348c82f6f5ee6b0ba1c5d59e506dcdf484fa0c9c8c6ae07064cafc39517670b5edb474bcc1921efddfce2e5dd879f59f3bb3a1f80d6df3c0411 WHIRLPOOL 1dbdd8ed06ea24b9abebdfe6190b9cf4aff20df66127732c283e6179ed685fc0a47e00b2690c4949042083ae52f39f9895d594c278b7596ff3e3ed6298f7311b
 AUX owserver.initd 836 SHA256 52d6b43977485bde574889491cceddbca7d8554fa9f314e2d34d9a88ed7eb752 SHA512 779163dc4181676e8f5972baa9fe4bbe23f85cc4a58bc5fe3c70c32563d4853ce92b4be5f5928f8b7f6eb424205db91c9b88a12f62ed6def7ced4fad61f0fd9b WHIRLPOOL 8f63622c4482bafda86373b987588d0b522a332719bff3ce4e155deb0fd61effdb7ada69bf73183431fc9ed4b8a0f3a9036bd78c85ace48f95434c56b31db660
 DIST owfs-2.7p21.tar.gz 1247466 SHA256 070a3368e9400e900618f8a704f487baf3671f6764715b4de04b151c66d3306d SHA512 ec6d372d32ebf59278c2c68d5fbed42664f52bc1702f4ea8e5506457594943413e37801d341102029cb48a9d8c3d6b3d68615a1dd517c93aa0a475a1bb06c4cf WHIRLPOOL 31901ae07a7431a368cdb4fa0a30a1885da29f55187dc601b53f2e9ebf4e11aba73de93d7f6308671ecb3afa8433548b41a2e79a9a0cc4771adee93a5a6a1ddd
-EBUILD owfs-2.7_p21-r2.ebuild 4500 SHA256 73ead0f3e8969c9a77b90097e2eee207180f41b1057bc5c6842162981e87a367 SHA512 6e3588fa53fbd37a618b0a06a4b61b3535cc885b44161890ff53b6a9e95d1a7d5feccf60456cbed3e502dba35266eaa25590cb26d832149ec7ff2a7568508c6b WHIRLPOOL 7c37fe51a2fe684d463d5ce3aaf7043cee6085bfa6d7f44f6e06c5e26e15572803ec9c488abd8e05c67fe5767979ff53031badd0a048f90b83b22f509f433186
-EBUILD owfs-2.7_p21-r3.ebuild 4265 SHA256 5f151535f8a2fc8b6f8a38ce7a70d2deeaef8785005466e69c5e39f0a8213918 SHA512 e1ceefbb452420683b3a49ca83046f35882bd424c54a10ed56259eff6cfcb06ab1ea4d7effdb5afd701e1f6c3db20fe4ebcfcf4e257adcd5f8095e3d49cc59bf WHIRLPOOL 88e04e803667e54efba1aba03622210f854a5feb3761d8582ee5c60b0c8c60e8500e3058d8926cedf0f6c8615661aa1a2e854c215f6c7ef218a173c55ba1466b
-MISC ChangeLog 4467 SHA256 14dcc4c4eb2f1a0a3ef6a024f532b56950de5ceedeffbc2e30c9bbddcf4e280b SHA512 b80ded98cc32fc8d8fddcc32d60f5d9c7683143b619159a98e583f75abfb26ea4279e5dc42ed9f73ef0a910185d19fb9f83aea958d171eb6adc1ab00fae94a80 WHIRLPOOL 6319da0d08bf82a2e1536223f5b28a92abd4741dcc632db5736ee9316d5fc5091a3b2a16af5fe44f858104ebd9728cf3cb3187e4f41c7ac49dd40b455283e3f1
+EBUILD owfs-2.7_p21-r3.ebuild 4257 SHA256 975ed9484434069168e3a84560d2dbdb787a4aa524231c1a23651f4ed087307c SHA512 23d07a65be750e2db27ec68a476330d531616e0173430ea236cf8fc7cd7e0aa30ec80f2a0c4ade310c94451f7208199fc95e938d5b26496da89e7cbb021e91fe WHIRLPOOL 869849875a2c5b89384d8d3586be9b016ba2c25802ecd602d2f173c005020a5b4e32d4035736bd56f01a6ea610916231d79c987b09ef220131fa7d857041ee99
+MISC ChangeLog 4596 SHA256 561e613948707942bbc56416fb08abdd8e0939f445030504e543cad95c6f6780 SHA512 6b54c924a2603d6d34a639e976a8945efff724234063fd0fd9fc46704bb6b9bba650c9bd61a72ef6879f5135bfa1f3d6ec2efec7dfab481f6721ba44addd791e WHIRLPOOL 5d6b05ffeae098b7b4106f1b56a49e7785f666f41b999c2140493d922090c06d89fef754aaa7a83b9fbdc1e9bf22fbf5c47a7c67f45d4811cfaddb000577608a
 MISC metadata.xml 902 SHA256 bef6f286e4d88d88094978a8c8a2cbe91dbd297faa57b3185373e4ad976ad0fc SHA512 96ffae008a24e7004672c3ee3676795f7a1b306c64af8a76ae7438868258da6b909338d60a88d9d0e08b05e10087cbc871f565e7be67db32bd081f523b9e41cb WHIRLPOOL 51984be95feabdfae94e0293992c1bdb67ecd84aed09e9e810572898dbde00df2b35e8a1a7210366dd4334204e454b3c11671d7fb7b656ef555a68b1bef304b6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUnUmQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOUo8P/3b2/mMIpybSYK3YEp9u+ML7
-28qdojkm+fmZUgcNQtrr9O5kPX1dPLg/jcAUVaFz39iGgxqlEQvxiS54OvydeWOh
-VPE/miklyQ3zUzZ2S0VOUe0rz6zVnG/CfT29vcrgGKZMzGLlP0BVbulNNc43x8R+
-leFSOMwCv8K2C/GJG/8aTcn+WgfHloezHE6BETIBEB3CfzW2GAk9yU5P/3F/QGaW
-bPK9nfPX2C2R93cvU29g8ZOaVu/hbkw9kETAfpsVlrJc8XQ3f6GlXuqWJNx+Shl5
-jWfSUj1U5VlkE04eeWTyoKXc6+mSNBUJwhJwL0jKtgKETjNTgzSwZuYSoHV9AJM5
-zBcyrxJZlw4IZZI9/sbv2yXPJJw4OSvdUFlLz2wAZu7ps6fadEo6bx707yZA+YMw
-gQGKODOVelOOMmLrCw1biZoxiJy5N4PosE9vdccYLDy9QOBvOfOCfokT4UXRxY5e
-Fu0CIhQ1BfwJ8RWlaVb8aIjEGnbTtT3mOEeMyc0NI32dK2P3TUdRRTooSJ2bn7c7
-7yh4+uuNTRg6f0u+Na3U7zWPxat6adSrsQAkqqWhVwtTFzHLu8mtTuu0ScRDY7NG
-uuF6hdmlESomP1+3GlNkP7XYCcgnmqscF1TBkj6ujdpcsjAfGZ5dc3qV9DF9sIoc
-ijsFRNeJ5P9DoAgG/hsF
-=dacq
+iQJ8BAEBCgBmBQJVDDj2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirg8sP/2r80Qa5jNoWwfQAZEWKIMUT
+2XPNEjzbatTZ3N/ip/4+4RA9h5+GQ419Xa620hAdoeMuyuoggGnCijgcm/GxHxwe
+v7Ajk7mKX8TpIqUohrScbUDtuhjoDcHETjCBrZJ6FHJT69DzvI6AZTD1RnduWrj+
+ExNi0AL2QNw6zl0Ab3pfm7dVvVV8iEt+rvauTBo11VCspZAjcPn5LQehLYmhB77y
+6N+71t2CJMYHwbobQl6c6pAnunokK8U0P88v8okwlWlihOI9KHFyk55Rd65UO6SX
+7t1/sE523MVNgkJHBawa0i/J/BV6pAsBXaZH16QmTrodAEPfzn1HXcPcdp+aYdkt
+eiQJq0X3VTEGlF6T6OxzXvP7Oi9srxoV+wIDJojT/5kSv3yyAFc/J7MSclNHwxxT
+5s5CEqWbnCH5KULHa+e/bed+xi8eJUXJfPw2pkmorxaIlfiop4N3tT7admI/iVr4
+BhaZKgoyn/VGcgStIfcn8alVqvL64L570AcypkPvxxqZv/eM03ZTc3fFnZwuTjtJ
+ztTldclxcA1LqFtK/nu5wemyAWXxX2PFrH6iUds194VXsnul2b5bfPXV0zsDYdQs
+NAHAKo78zyuGNfK3gX2IvAi+ssl8ToAweUpwax4redmOec0TvzgyZlcF6Mr7PSVR
+omPYp0IRztiHlBNb2mi0
+=jQQE
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/owfs/owfs-2.7_p21-r2.ebuild b/sys-fs/owfs/owfs-2.7_p21-r2.ebuild
deleted file mode 100644
index 123525d37f68..000000000000
--- a/sys-fs/owfs/owfs-2.7_p21-r2.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/owfs/owfs-2.7_p21-r2.ebuild,v 1.2 2014/11/17 23:23:33 dilfridge Exp $
-
-EAPI="5"
-
-PYTHON_DEPEND="python? 2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-
-inherit depend.php distutils eutils perl-module autotools user
-
-MY_P=${P/_/}
-
-DESCRIPTION="Access 1-Wire devices like a filesystem"
-SRC_URI="mirror://sourceforge/owfs/${MY_P}.tar.gz"
-HOMEPAGE="http://www.owfs.org/ http://owfs.sourceforge.net/"
-
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-RDEPEND="fuse? ( sys-fs/fuse )
-	perl? ( dev-lang/perl )
-	php? ( dev-lang/php )
-	tcl? ( dev-lang/tcl )
-	usb? ( virtual/libusb:0 )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
-
-DEPEND="${RDEPEND}
-	perl? ( dev-lang/swig )
-	php? ( dev-lang/swig )
-	python? ( dev-lang/swig )"
-
-IUSE="debug fuse ftpd httpd parport perl php python server tcl usb zeroconf"
-
-S=${WORKDIR}/${MY_P}
-
-OWUID=${OWUID:-owfs}
-OWGID=${OWGID:-owfs}
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-PYTHON_MODNAME="ow ownet"
-
-pkg_setup() {
-	if use php; then
-		require_php_cli
-	fi
-
-	if use python; then
-		python_pkg_setup
-	fi
-
-	enewgroup ${OWGID} 150
-	enewuser  ${OWUID} 150 -1 -1 ${OWGID}
-}
-
-src_prepare() {
-	sed -e 's/ \$(OWNET_SUBDIRPYTHON)//' -i module/ownet/Makefile.{am,in} || die
-	sed -e 's/ \$(SWIG_SUBDIRPYTHON)//' -i module/swig/Makefile.{am,in} || die
-	sed \
-		-e "s/@PYCFLAGS@//" \
-		-e "s/@PYLDFLAGS@//" \
-		-i module/swig/python/setup.py.in || die "sed failed"
-
-	# Support user's CFLAGS and LDFLAGS.
-	sed -i "s/@CPPFLAGS@/@CPPFLAGS@ ${CFLAGS}/" \
-		module/swig/perl5/OW/Makefile.linux.in || die
-	sed -i "s/@LIBS@/@LIBS@ ${LDFLAGS}/" \
-		module/swig/perl5/OW/Makefile.linux.in || die
-
-	epatch "${FILESDIR}/${PN}-vendordir.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable fuse owfs) \
-		$(use_enable ftpd owftpd) \
-		$(use_enable httpd owhttpd) \
-		$(use_enable parport) \
-		$(use_enable perl owperl) \
-		$(use_enable php owphp) \
-		$(use_enable python owpython) \
-		$(use_enable server owserver) \
-		$(use_enable tcl owtcl) \
-		$(use_enable zeroconf zero) \
-		$(use_enable usb)
-}
-
-src_compile() {
-	default
-
-	if use python; then
-		pushd module/ownet/python > /dev/null
-		distutils_src_compile
-		popd > /dev/null
-
-		pushd module/swig/python > /dev/null
-		emake ow_wrap.c
-		distutils_src_compile
-		popd > /dev/null
-	fi
-}
-
-src_test() { :; }
-
-src_install() {
-	default
-
-	if use server || use httpd || use ftpd || use fuse; then
-		diropts -m 0750 -o ${OWUID} -g ${OWGID}
-		dodir /var/run/owfs
-
-		for i in server httpd ftpd; do
-			if use ${i}; then
-				newinitd "${FILESDIR}"/ow${i}.initd ow${i}
-				newconfd "${FILESDIR}"/ow${i}.confd ow${i}
-			fi
-		done
-
-		if use fuse; then
-			dodir /var/lib/owfs
-			dodir /var/lib/owfs/mnt
-			newinitd "${FILESDIR}"/owfs.initd owfs
-			newconfd "${FILESDIR}"/owfs.confd owfs
-		fi
-	fi
-	use perl && perl_delete_localpod
-
-	if use python; then
-		pushd module/ownet/python > /dev/null
-		distutils_src_install
-		popd > /dev/null
-
-		pushd module/swig/python > /dev/null
-		distutils_src_install
-		popd > /dev/null
-	fi
-}
-
-pkg_postinst() {
-	if use server || use httpd || use ftpd || use fuse; then
-		echo
-		einfo
-		einfo "Be sure to check/edit the following files,"
-		einfo "e.g. to fit your 1 wire bus controller"
-		einfo "device or daemon network settings:"
-		for i in server httpd ftpd; do
-			if use ${i}; then
-				einfo "- ${ROOT%/}/etc/conf.d/ow${i}"
-			fi
-		done
-		if use fuse; then
-			einfo "- ${ROOT%/}/etc/conf.d/owfs"
-		fi
-		einfo
-		echo
-		if [[ ${OWUID} != root ]]; then
-			ewarn
-			ewarn "In order to allow the OWFS daemon user '${OWUID}' to read"
-			ewarn "from and/or write to a 1 wire bus controller device, make"
-			ewarn "sure the user has appropriate permission to access the"
-			ewarn "corresponding device node/path (e.g. /dev/ttyS0), for example"
-			ewarn "by adding the user to the group 'uucp' (for serial devices)"
-			ewarn "or 'usb' (for USB devices accessed via usbfs on /proc/bus/usb)."
-			ewarn
-			if use fuse; then
-				ewarn "In order to allow regular users to read from and/or write to"
-				ewarn "1 wire bus devices accessible via the owfs FUSE filesystem"
-				ewarn "client and its filesystem mountpoint, make sure the user is"
-				ewarn "a member of the group '${OWGID}'."
-				ewarn
-			fi
-			echo
-		fi
-	fi
-
-	use python && distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	use python && distutils_pkg_postrm
-}
diff --git a/sys-fs/owfs/owfs-2.7_p21-r3.ebuild b/sys-fs/owfs/owfs-2.7_p21-r3.ebuild
index 9c02c8750f71..51f763dc82b3 100644
--- a/sys-fs/owfs/owfs-2.7_p21-r3.ebuild
+++ b/sys-fs/owfs/owfs-2.7_p21-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/owfs/owfs-2.7_p21-r3.ebuild,v 1.1 2014/12/26 11:42:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/owfs/owfs-2.7_p21-r3.ebuild,v 1.2 2015/03/20 15:12:49 jlec Exp $
 
 EAPI="5"
 
@@ -19,11 +19,12 @@ KEYWORDS="~amd64 ~arm ~x86"
 SLOT="0"
 LICENSE="GPL-2"
 
-RDEPEND="fuse? ( sys-fs/fuse )
+RDEPEND="
+	fuse? ( sys-fs/fuse )
 	perl? ( dev-lang/perl )
-	php? ( dev-lang/php )
+	php? ( dev-lang/php:= )
 	python? ( ${PYTHON_DEPS} )
-	tcl? ( dev-lang/tcl )
+	tcl? ( dev-lang/tcl:= )
 	usb? ( virtual/libusb:0 )
 	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
 
@@ -41,9 +42,7 @@ OWUID=${OWUID:-owfs}
 OWGID=${OWGID:-owfs}
 
 pkg_setup() {
-	if use php; then
-		require_php_cli
-	fi
+	use php && require_php_cli
 
 	enewgroup ${OWGID} 150
 	enewuser  ${OWUID} 150 -1 -1 ${OWGID}