From: Justin Lecher Date: Fri, 2 Apr 2010 09:44:28 +0000 (+0000) Subject: Version Bump, Imported from prefix overlay, LDFLAGS patch X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9fca2aff7093981d53255b7a56004c0e23babc03;p=gentoo.git Version Bump, Imported from prefix overlay, LDFLAGS patch Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- diff --git a/dev-tcltk/expect/ChangeLog b/dev-tcltk/expect/ChangeLog index 54b752fb9b9e..240a60e375a7 100644 --- a/dev-tcltk/expect/ChangeLog +++ b/dev-tcltk/expect/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-tcltk/expect -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.64 2009/09/27 14:56:55 nixnut Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.65 2010/04/02 09:44:28 jlec Exp $ + + 02 Apr 2010; Justin Lecher +expect-5.44.1.ebuild, + +files/expect-5.44.1-darwin.patch, +files/expect-5.44.1-ldflags.patch: + Version Bump, Imported from prefix overlay, LDFLAGS patch 27 Sep 2009; nixnut expect-5.43.0.ebuild: ppc stable #281420 diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest index e5236172a25b..ee79595b2f37 100644 --- a/dev-tcltk/expect/Manifest +++ b/dev-tcltk/expect/Manifest @@ -1,16 +1,30 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX expect-5.39.0-libdir.patch 480 RMD160 e58373778379907bf68ce6e61acce5dad4852421 SHA1 f438e6899688f0b3d5bdb854246483ec29848c9a SHA256 971ac5bd88e393d1029ab248c1071529337baf0b50445c53e35f49fdb7c6365a AUX expect-5.42.1-missing-includes.patch 1031 RMD160 fbbf4d66eb9029e332fa6b4b73be2c96498025ff SHA1 67854b3950d2e71833ce45d9dc24beda34ddaf7e SHA256 22c393a04f1120b811fe366c0ab6a81500060414be2dd80fc9ba222b5710c493 AUX expect-5.42.1-multilib.patch 507 RMD160 d086ba11fb79048f1b800d17d93ffeb90912110b SHA1 b59faccf8a0e8c538126d68c5eed181d789f45d7 SHA256 a707e4d6f513f1b2b09edb3c7bb393b9f2f3fcfaf79db0326e82e018b842d002 AUX expect-5.43.0-avoid-tcl-internals-1.patch 3376 RMD160 2a99f4496dbbb7b1575189fe284e847851b4bedf SHA1 e85341cfd075dc27c9f79c86ac6c035e82203a15 SHA256 2dbfcf569e766d6e5d2b6bc83a7556c0cb189a7da334e07b7201bb0b764fb610 AUX expect-5.43.0-missing-includes.patch 1767 RMD160 9f5e3f92da5f651111220abd6a2571aaf247210c SHA1 02c957d9d0b5d110412ae9a77d8d7ff4c377312e SHA256 28f0a57901a714f52a29b829f01e934a45fd3b71aead7b7946a024719495f68b AUX expect-5.43.0-multilib.patch 507 RMD160 d086ba11fb79048f1b800d17d93ffeb90912110b SHA1 b59faccf8a0e8c538126d68c5eed181d789f45d7 SHA256 a707e4d6f513f1b2b09edb3c7bb393b9f2f3fcfaf79db0326e82e018b842d002 +AUX expect-5.44.1-darwin.patch 437 RMD160 75fac7c93e284b8c73ed983862059cab882a7b31 SHA1 bd774850775b0fb9ddc133a68c674060b9132708 SHA256 28439ab383c498a364536f677666d8da127201ed76623b556b0ab6bc4dc561bc AUX expect-5.44.1-destdir.patch 1072 RMD160 b5dcc02f39215616e790b79088ee197ea74af7f6 SHA1 a662f32614cf37a40991e80cea8d43646ca72947 SHA256 41102ebbd7da6eccea0a88c29e5b5a1ce7039effdf8c271fe09d9bbe3fe55f0e AUX expect-5.44.1-gfbsd.patch 720 RMD160 c2601d99b3e8d631af37d3f249c32aa9f9a3f488 SHA1 5c63fb190d20f0288e973bd24861075ebb4110e3 SHA256 7dc2e2bd43808f60574e300682c800b373ea0832488e684e589f33d79a3150bf +AUX expect-5.44.1-ldflags.patch 360 RMD160 07385db6345811c5f43316e508ea6e2677662197 SHA1 366ecf4a44558819fac92a6f7800961997d060d5 SHA256 2e9d3a614edc020044480ba78802696880be638f5b5dcb0fff02c632e0e738d2 AUX expect.m4 20468 RMD160 b06e075db9afed2b0a59d9b5721f874d74acdef5 SHA1 14d4cfc26131f8231af0bfa126722b123573aac4 SHA256 6b60f18a68792050c1cb8745508fd1595eb2789fd780195af0492e344d00faca DIST expect-5.42.1.tar.gz 524882 RMD160 d354d5d3ffa941d89e668fb4ad1ccbb59be4f341 SHA1 84ca72f0abd2b7a31ee332049b34575a286e8f27 SHA256 a2b64dbca4dc127dfcb6d7e16dd3c08ef8bba2056104ce89819d3e6f0e1df430 DIST expect-5.43.0.tar.gz 525570 RMD160 223b78f39dca8cc7900d82230cf7db91e6770389 SHA1 4da64b7c50cea22ac87fcf0f8f98f786793ee785 SHA256 d11a77e680ddc0244370b46f117f0b28a6571db842885bee3b7c15372c1ca079 +DIST expect-5.44.1.tar.gz 623422 RMD160 5f206d9e5b9bb73c97bb7fc0d7df7318d4525a32 SHA1 b897c7626e7dde0fd090a572389a5e2a95056de8 SHA256 e41a6b82d67150f0dc38faa5c96715d93b68d3e55be40a585737cc4f59c4fd8f EBUILD expect-5.42.1-r1.ebuild 3062 RMD160 37e2632986cfa482437551c2e8842fa773505d66 SHA1 21a51490a22cbcaac3ff158159af9583d34082e1 SHA256 e3315c6b5fd88d502bc53c735ca654308084a3cd4d0ba814b197f92ff4229183 EBUILD expect-5.42.1-r2.ebuild 3182 RMD160 15ba15d1cf65267408c690390e8139576dc71509 SHA1 cce29a75c72bb943f3d55f2715c7eb1baffcbc4b SHA256 f9b02c01b8473854790f4f153ddf48b9ed63db4b3d76145001eda1c99e658553 EBUILD expect-5.43.0.ebuild 3541 RMD160 0a9309f8707f4b3af96efe595fc26cf11b203d4c SHA1 ea1607517c769490e976ff3191de0914414348d4 SHA256 fd457236e9f6396133dc1e8ff52ec04466e04ba62b6b0dfa044bddf799ed974f -MISC ChangeLog 9050 RMD160 1ec588cba058826d612704f0b27e792a9c95c60b SHA1 a1361b9ab28a0d31379c9f520b2d0ec2140b6a95 SHA256 d6ba2737b05c46699082ea4ba9f75c5e9185a2f7dae2705924ad6d10883c1fad +EBUILD expect-5.44.1.ebuild 3605 RMD160 009c8fb8c4dcdcbf7760a063b05674949d50acc3 SHA1 c17d5c27c55336374e105cb0aabe0d2b916dbd79 SHA256 51853752c628130cfa7b1621c380258d36dceea774ac1f7d51f4e6428b5cd082 +MISC ChangeLog 9252 RMD160 63c1c63e3519bebb264d0501838762bc5f107f2f SHA1 5de4765de620be14716e44c6cd41aa16a501e234 SHA256 3ab510efd6df8e44b2a9349662f06c12519e7ecaa70c4ceae7ba97d95adf2323 MISC metadata.xml 158 RMD160 f197c34c7dd71f6025e93436e3f999137928554a SHA1 edb8e5ac668440e92e947fc3dff54484b28c7775 SHA256 62fb2b0a899315973de885234e3931a2f652b343b68f90fe0778378fdca6f290 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEARECAAYFAku1vIEACgkQgAnW8HDreRY3/gCgvgMsTUSlQMtlgNRJGJaTR5pa +tPsAoI+53BhjHYtFoNd+CfDQJcLV6b1P +=fTNM +-----END PGP SIGNATURE----- diff --git a/dev-tcltk/expect/expect-5.44.1.ebuild b/dev-tcltk/expect/expect-5.44.1.ebuild new file mode 100644 index 000000000000..76e92864bede --- /dev/null +++ b/dev-tcltk/expect/expect-5.44.1.ebuild @@ -0,0 +1,114 @@ +# Copyright 1999-2010 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.ebuild,v 1.6 2010/04/02 09:44:28 jlec Exp $ + +EAPI="3" + +WANT_AUTOCONF="2.5" +inherit autotools eutils + +DESCRIPTION="tool for automating interactive applications" +HOMEPAGE="http://expect.nist.gov/" +SRC_URI="http://expect.nist.gov/src/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris" +IUSE="X doc" + +# 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 + >=dev-lang/tk-8.2" +RDEPEND="${DEPEND}" + +RESTRICT="test" + +src_prepare() { + # fix install_name on darwin + [[ ${CHOST} == *-darwin* ]] && \ + epatch "${FILESDIR}"/${P}-darwin.patch + + sed -i "s#/usr/local/bin#${EPREFIX}/usr/bin#" expect.man + sed -i "s#/usr/local/bin#${EPREFIX}/usr/bin#" expectk.man + #stops any example scripts being installed by default + sed -i \ + -e '/^install:/s/install-libraries //' \ + -e 's/^SCRIPTS_MANPAGES = /_&/' \ + Makefile.in + + #they forgot to include expect.m4 (now it's in expect cvs) + cp "${FILESDIR}/expect.m4" . + #configure broken for testsuite + sed -i -e 's/^AC_CONFIG_SUBDIRS(testsuite)$//' configure.in + #fixes "TCL_REG_BOSONLY undeclared" error due to a change in tcl8.5 + sed -i -e 's/^#include "tcl.h"/#include "tclInt.h"/' exp_inter.c + #slacky destdir support in Makefile + epatch "${FILESDIR}/${P}-destdir.patch" + + epatch "${FILESDIR}/${P}-gfbsd.patch" + + epatch "${FILESDIR}/${P}-ldflags.patch" + + 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 /usr/include/tk.h | sed 's/^.*"\(.*\)".*/\1/') + + #configure needs to find the files tclConfig.sh and tclInt.h + myconf="--with-tcl=${EPREFIX}/usr/$(get_libdir) --with-tclinclude=${EPREFIX}/usr/$(get_libdir)/tcl${tclv}/include/generic" + + 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 --without-x" + fi + + econf $myconf --enable-shared || die "econf failed" +} + +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 + make check || die "make check failed" +} + +src_install() { + dodir /usr/$(get_libdir) + make install DESTDIR="${D}" || die "make install failed" + + dodoc ChangeLog FAQ HISTORY NEWS README + + local static_lib="lib${NON_MICRO_V/-/}.a" + rm "${ED}"/usr/$(get_libdir)/${NON_MICRO_V/-/}/${static_lib} + + #install examples if 'doc' is set + if use doc ; then + docinto examples + local scripts=$(make -qp | \ + sed -e 's/^SCRIPTS = //' -et -ed | head -n1) + exeinto /usr/share/doc/${PF}/examples + doexe ${scripts} + local scripts_manpages=$(make -qp | \ + sed -e 's/^_SCRIPTS_MANPAGES = //' -et -ed | head -n1) + for m in ${scripts_manpages}; do + dodoc example/${m}.man + done + dodoc example/README + fi +} diff --git a/dev-tcltk/expect/files/expect-5.44.1-darwin.patch b/dev-tcltk/expect/files/expect-5.44.1-darwin.patch new file mode 100644 index 000000000000..bdbfffb959dc --- /dev/null +++ b/dev-tcltk/expect/files/expect-5.44.1-darwin.patch @@ -0,0 +1,15 @@ +http://bugs.gentoo.org/show_bug.cgi?id=287072 + +patch by Stuart Shelton + +--- Makefile.in.dist 2009-10-09 15:09:49 +0100 ++++ Makefile.in 2009-10-09 15:09:59 +0100 +@@ -148,7 +148,7 @@ + RANLIB = @RANLIB@ + RANLIB_STUB = @RANLIB_STUB@ + SHLIB_CFLAGS = @SHLIB_CFLAGS@ +-SHLIB_LD = @SHLIB_LD@ ++SHLIB_LD = @SHLIB_LD@ -install_name $(tcl_libdir)/$(EXP_SHARED_LIB_FILE) + SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ + STLIB_LD = @STLIB_LD@ + TCL_DEFS = @TCL_DEFS@ diff --git a/dev-tcltk/expect/files/expect-5.44.1-ldflags.patch b/dev-tcltk/expect/files/expect-5.44.1-ldflags.patch new file mode 100644 index 000000000000..be3641c2105c --- /dev/null +++ b/dev-tcltk/expect/files/expect-5.44.1-ldflags.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.in b/Makefile.in +index cc2c79b..1083eaf 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -148,7 +148,7 @@ OBJEXT = @OBJEXT@ + RANLIB = @RANLIB@ + RANLIB_STUB = @RANLIB_STUB@ + SHLIB_CFLAGS = @SHLIB_CFLAGS@ +-SHLIB_LD = @SHLIB_LD@ ++SHLIB_LD = @SHLIB_LD@ $(LDFLAGS) + SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ + STLIB_LD = @STLIB_LD@ + TCL_DEFS = @TCL_DEFS@