Ensure examples get installed with USE=doc, fixes bug #41130 Thanks to Alexander Tsoy for patches

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0x5395BF49

4 files changed, 129 insertions, 10 deletions

diff --git a/dev-tcltk/expect/ChangeLog b/dev-tcltk/expect/ChangeLog
index 2238668c1f56..0ee0bee8f263 100644
--- a/dev-tcltk/expect/ChangeLog
+++ b/dev-tcltk/expect/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-tcltk/expect
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.91 2012/04/26 16:18:17 aballier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.92 2013/08/18 11:31:36 tomk Exp $
+
+*expect-5.44.1.15-r1 (18 Aug 2013)
+
+  18 Aug 2013; Tom Knight <tomk@gentoo.org> +expect-5.44.1.15-r1.ebuild,
+  expect-5.45.ebuild:
+  Ensure examples get installed with USE=doc, fixes bug #41130 Thanks to
+  Alexander Tsoy for patches
 
   26 Apr 2012; Alexis Ballier <aballier@gentoo.org> expect-5.45.ebuild:
   keyword ~amd64-fbsd
diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest
index eb612b572c97..972c8196f2ee 100644
--- a/dev-tcltk/expect/Manifest
+++ b/dev-tcltk/expect/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX expect-5.39.0-libdir.patch 480 SHA256 971ac5bd88e393d1029ab248c1071529337baf0b50445c53e35f49fdb7c6365a SHA512 ef9f44102c9fd0950e6506d109ca4b7cb031cb80e863f512b40332daea18c9e629e80865d841a7e01afa262d99a4771d93e4913d8a9bcd04ece2d6231ec1fcd4 WHIRLPOOL 90153a23c22bbe1caff76c88d44b8fd485829bac21b9e56710dd78f9be0f893178b761c741672f05974a75b2a6c79a656d15c2d4ba07b65fc6740ca2220d492c
 AUX expect-5.43.0-avoid-tcl-internals-1.patch 3376 SHA256 2dbfcf569e766d6e5d2b6bc83a7556c0cb189a7da334e07b7201bb0b764fb610 SHA512 f195c66f705788195039c5525c65a702b41cdfedf159b05a4e99228369a6dbcc7694e3ff549d807334e477d3c206d77be47dbe8cb2f3b6355235eec6da1b7902 WHIRLPOOL e659e74016c8b87665b8a9e0c60bc42621b63d9d30f5c6203f2d9aa056de19bf1435450d2eadec6837009a59205f8db91516f5eea1330f2029a417aa8c466d4d
 AUX expect-5.43.0-darwin.patch 476 SHA256 d2e32a49f770189b2ceb5245cdd0b5a326ff8ed776cb172618fe8dc2fde53605 SHA512 b056916adf3a0dd6cf102c0e98882106a865941d5d46203a2e1b5bf0cc43283780388c65b0f45821ccba4285a64ef6703d3548e3bc369f23bb9d4f3d1d9dff02 WHIRLPOOL 573fd36d9b46ff71deb2f98665f4d9a59618b9948d11b154ae3eee85f382da6cd5a192d8af8f2be34da7828cc84938bfeea5c2b469e56eefdc4e2198df0bd885
@@ -17,7 +20,19 @@ DIST expect-5.44.1.15.tar.bz2 547655 SHA256 c8565b869d67389995684b60553685168dd4
 DIST expect5.45.tar.gz 628808 SHA256 b28dca90428a3b30e650525cdc16255d76bb6ccd65d448be53e620d95d5cc040 SHA512 be991c68241e607b3a689eae7e7966056dbfb577e857331d54a4911bd178c1816425217603b43918ad1b6d2e966271a0f01e79d7028a22e223562d59d10c8c51 WHIRLPOOL e28a5019036d20260f76b13cbd47d2e56661b0107592ead296118c12ed28157a1300a091730820e088d2fa6f86396e7244e844c7bc2e942fc6cf995e4194f10f
 EBUILD expect-5.43.0-r1.ebuild 3820 SHA256 de5dcecfa85e53ae9166711673bfba1bf308439b523e49faf7baae279fe1f25a SHA512 fffc42537b90db93a1c8d5374d3cef9f8150abf95a70ef90a049c7035f18d5d5cd7880282753f36db2194cd544e068a79b4bbaecea4a2def8f8ada213b9acc82 WHIRLPOOL cd62fecca32ef5af6125a0f9db694ee91f09587ae47eab5a654d61cf944901beec827a1d02ffe219d4adf8e2c7b1f3a656590c1e7b365c74d1cdf26c2d24878d
 EBUILD expect-5.43.0.ebuild 3539 SHA256 b68fcde292800697bb761562efc4682ac6fa8c77b6a807f639bbf404a9d3bac9 SHA512 0e7b05408a820adcac7be4684addcee4dd35ce2e14607f7b8c51a5c3d96c9fd4b6fd9a88503d93f77bfcff5e4aeb833a7f778ced8659a010099eb6a5079061a4 WHIRLPOOL 2a4d715d16e32084c65f85809e9c88b6d96502b596da34ea2adc99216ab45d3e6a9053bf67e7d59b17c11c24de015834fa301784fe10f436108200eb4dc027e8
+EBUILD expect-5.44.1.15-r1.ebuild 3197 SHA256 8f89bbda7fdb8f397c560e6f4a921315358f90ad8e98716cfe71a6d807ff1e46 SHA512 30fa6821dd21cabd9bceb50c13dccc1b8fe62a6cbf3f651d63cfc6e5e4eb640d9b04ce06ffb05a0f5e89f364d95d4f0df4c2ecead36e1cbb7029285aa47c8bb1 WHIRLPOOL 32f380797103eefb10c8ba1a6dce576f277b695aeb05a1b78925af8a036e07baff12e1750e83c67da9d16bfd6c68817a4a85222e5b61585d76f24ccc191a66a5
 EBUILD expect-5.44.1.15.ebuild 3146 SHA256 f3529bcd30ce6c352499c4f80ca8aa807c22b45a7553382059dc873fbb38f962 SHA512 6c5fedda112395021e1699ad61818700745c780b27397e70c5f32bed03cf2917b529fa653e138fe78fc9387efb27cb7ef39773475ea9a3318e6bcff585073ba8 WHIRLPOOL 2a79f2928ddca7e9871f87f0525ff503239be75bb91f2771ce5f5a75022a775849b36065d6cc0d126856ebcbd34ac983cfd05b05c72dbd3c5e8ff8de45f924d4
-EBUILD expect-5.45.ebuild 2391 SHA256 1a85b30c4b0996ecc51a6a454d42f31c0ddf2ec425616a61632f31807064585e SHA512 2a2a14a0e9626909d8f403055905405e86909daaadf8d90793fccd80ed116361a2306f585eca586f8109597582dda53a10840866af4bdcc5893802fa4a76cd30 WHIRLPOOL 8a064d9467f71471cd7a86f286e826484e29aba5d91c94972d0341b8e00b18b58364488f60488a7833b5a955fd3fba1890264857691dac345c6554ffe7bb8a29
-MISC ChangeLog 13114 SHA256 bd1edc25efa5234588d385dfcb933e81de91c7b99c57f1beb72505808924ff73 SHA512 cc87878948826a73f7635d4784e6d32e698b151eea69c27a6d2a2b94bbf3b131ab4746703ab0c83fbc39c4a800a47194c9edb0ec4687d90b79b537f994f0d2ec WHIRLPOOL deabc1d872f372ed4a87d17429b09713e812ddef47e1ea8d85e6bf0bb7215bca307f38c31545b0c7ac0f7217ac46f52edda8b96c0e64ba61846a21f0809907ed
+EBUILD expect-5.45.ebuild 2424 SHA256 3e78315bc5139f601ac15f431ae311e09163e24b3571e9ae8cfe038289eb322a SHA512 4ce9f4fbcbf97b72be10ccd73a9bb9fada0c96ceda3b6fb6535daf2b9431e7e44337728a7c1669c627ce73bf8dcc5676308404d35b502711d392fd6399600697 WHIRLPOOL 973d309700c76ab5446a7769b75189151eb1e1f3944452f590b533ec013339f0ebd7870f8697792bdc5c57252bad29a17ac3356faee8428c12be7092bcb49acb
+MISC ChangeLog 13344 SHA256 f79ca8e14c361461684313abb48b0c18828911a135872016dc7cb7d5f35f8ee3 SHA512 0c45bf13c8e6b8626d582f4889e013f5ab9e87357210576f99d2d18a0f13d6d570bd47075a7618e3497aba1abd74bb696bfcf04290dd430418bab873f76318a5 WHIRLPOOL ea4ac8ff22fcb4da9a60c4db7ed89e209764a1d011b7e2db2f931dce0c0c28448ff80764700c3f96265fbac1bc72ec0831a59a01a92b6f8fd4144c7e8d1b4dc9
 MISC metadata.xml 159 SHA256 fe5eea9a276e11191a0c8e266e6dc128c3dd73347bb01020814acb0863316029 SHA512 7072291f336a01c6b6b0da289ab72b58c47062f94a06fed23a4982b776b5711df68662a3d8ff3a6954e2699817bda9780e01920056e29164944ead4d0fe815b6 WHIRLPOOL cb245ca2202ce7a680a703d76cf8dcb11e7627fddcc3c0bd9127855263f0e3d48db44511c2257ae793a0cb1d4a7764ffba5ceb992ff1a351d8f8a7ab96307683
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJSELCiAAoJEMUlhJpTlb9JnLMH/0aoScBhtp/WmDE1iCGVoTPo
+pjQHfDxKqE2IIqksMcMRzmkXWWmJrSCIRBgMvO6PrSGmbJJYUcyMJdAbon4ZRAGC
+1LVWPglBAkhGV/J2RLc2J63OXDOIwGdOXAagsmzoM2bmDMDjWtyR4O17riiAeTAq
+AOme9/l5VYIGAVNOTKemR1romt/IaUn57bvyIBclfsee/67ugOpp37MhHP4EeOar
+EnQYiTTKT+WbCm7DsCYLRwg+Tavj6O4OZE+uGSNgGeFe4pqAuOBrhqlA5UvLoexs
+yjp5Knji/Xdp2coWnbJHJWQ9doEcZAT2dsj3un904S+GepfGmI6TcHsYalYwD1A=
+=PLo+
+-----END PGP SIGNATURE-----
diff --git a/dev-tcltk/expect/expect-5.44.1.15-r1.ebuild b/dev-tcltk/expect/expect-5.44.1.15-r1.ebuild
new file mode 100644
index 000000000000..cd13c3b4ff23
--- /dev/null
+++ b/dev-tcltk/expect/expect-5.44.1.15-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.44.1.15-r1.ebuild,v 1.1 2013/08/18 11:31:36 tomk Exp $
+
+EAPI="3"
+
+inherit autotools eutils
+
+DESCRIPTION="tool for automating interactive applications"
+HOMEPAGE="http://expect.nist.gov/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="debug doc threads X"
+
+# We need dejagnu for src_test, but dejagnu needs expect
+# to compile/run, so we cant add dejagnu to DEPEND :/
+DEPEND=">=dev-lang/tcl-8.2[threads?]
+	X? ( >=dev-lang/tk-8.2[threads?] )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -i "s#/usr/local/bin#${EPREFIX}/usr/bin#" expect{,k}.man || die
+	# stops any example scripts being installed by default
+	sed -i \
+		-e 's/^SCRIPT_LIST[[:space:]]*=/_&/' \
+		-e 's/^SCRIPTS[[:space:]]*=/_&/' \
+		-e 's/^SCRIPTS_MANPAGES[[:space:]]*=/_&/' \
+		Makefile.in
+
+	epatch "${FILESDIR}"/${P}-gfbsd.patch
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+	epatch "${FILESDIR}"/${P}_with-tk-no.patch
+	epatch "${FILESDIR}"/${P}-headers.patch #337943
+	epatch "${FILESDIR}"/${P}-expectk.patch
+	sed -i 's:ifdef HAVE_SYS_WAIT_H:ifndef NO_SYS_WAIT_H:' *.c
+
+	eautoconf
+}
+
+src_configure() {
+	local myconf
+	local tclv
+	local tkv
+	# Find the version of tcl/tk that has headers installed.
+	# This will be the most recently merged, not necessarily the highest
+	# version number.
+	tclv=$(grep TCL_VER ${EPREFIX}/usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/')
+	#tkv isn't really needed, included for symmetry and the future
+	#tkv=$(grep	 TK_VER ${EPREFIX}/usr/include/tk.h  | sed 's/^.*"\(.*\)".*/\1/')
+	myconf="--with-tcl=${EPREFIX}/usr/$(get_libdir) --with-tclinclude=${EPREFIX}/usr/$(get_libdir)/tcl${tclv}/include/generic --with-tk=yes"
+
+	if use X ; then
+		#--with-x is enabled by default
+		#configure needs to find the file tkConfig.sh and tk.h
+		#tk.h is in /usr/lib so don't need to explicitly set --with-tkinclude
+		myconf="$myconf --with-tk=${EPREFIX}/usr/$(get_libdir) --with-tkinclude=${EPREFIX}/usr/include"
+	else
+		#configure knows that tk depends on X so just disable X
+		myconf="$myconf --with-tk=no"
+	fi
+
+	econf \
+		$myconf \
+		--enable-shared \
+		$(use_enable threads) \
+		$(use_enable amd64 64bit) \
+		$(use_enable debug symbols)
+}
+
+src_test() {
+	# we need dejagnu to do tests ... but dejagnu needs
+	# expect ... so don't do tests unless we have dejagnu
+	type -p runtest || return 0
+	emake test || die "emake test failed"
+}
+
+expect_make_var() {
+	touch pkgIndex.tcl-hand
+	printf 'all:;echo $('$1')\ninclude Makefile' | emake --no-print-directory -s -f -
+	rm -f pkgIndex.tcl-hand
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc ChangeLog FAQ HISTORY NEWS README
+
+	# install examples if 'doc' is set
+	if use doc ; then
+		insinto /usr/share/doc/${PF}/examples
+		doins $(printf 'example/%s ' $(expect_make_var _SCRIPTS)) || die
+		docinto examples
+		dodoc example/README $(printf 'example/%s.man ' $(expect_make_var _SCRIPTS_MANPAGES)) || die
+	fi
+}
diff --git a/dev-tcltk/expect/expect-5.45.ebuild b/dev-tcltk/expect/expect-5.45.ebuild
index fe0277265641..5c6935d64a57 100644
--- a/dev-tcltk/expect/expect-5.45.ebuild
+++ b/dev-tcltk/expect/expect-5.45.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.45.ebuild,v 1.5 2012/04/26 16:18:17 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.45.ebuild,v 1.6 2013/08/18 11:31:36 tomk Exp $
 
 EAPI="3"
 
@@ -27,9 +27,9 @@ src_prepare() {
 	sed -i "s:/usr/local/bin:${EPREFIX}/usr/bin:" expect.man || die
 	# stops any example scripts being installed by default
 	sed -i \
-		-e 's/^SCRIPT_LIST/_&/' \
-		-e 's/^SCRIPTS/_&/' \
-		-e 's/^SCRIPTS_MANPAGES = /_&/' \
+		-e 's/^SCRIPT_LIST[[:space:]]*=/_&/' \
+		-e 's/^SCRIPTS[[:space:]]*=/_&/' \
+		-e 's/^SCRIPTS_MANPAGES[[:space:]]*=/_&/' \
 		Makefile.in
 
 	epatch "${FILESDIR}"/${PN}-5.45-gfbsd.patch
@@ -76,7 +76,7 @@ src_install() {
 		docinto examples
 		dodoc \
 			example/README \
-			$(printf 'example/%s ' $(expect_make_var SCRIPTS)) \
+			$(printf 'example/%s ' $(expect_make_var _SCRIPTS)) \
 			$(printf 'example/%s.man ' $(expect_make_var _SCRIPTS_MANPAGES)) \
 			|| die
 	fi