diff options
author | George Shapovalov <george@gentoo.org> | 2002-10-28 08:31:59 +0000 |
---|---|---|
committer | George Shapovalov <george@gentoo.org> | 2002-10-28 08:31:59 +0000 |
commit | 2caec98473c24fdea946ba79c547c49fcc8d3e99 (patch) | |
tree | d0554bfd6be0b56c7052435dbad92b1855d92458 | |
parent | misc bugfixes (diff) | |
download | historical-2caec98473c24fdea946ba79c547c49fcc8d3e99.tar.gz historical-2caec98473c24fdea946ba79c547c49fcc8d3e99.tar.bz2 historical-2caec98473c24fdea946ba79c547c49fcc8d3e99.zip |
unmasked changes upon testing
(avoiding revision bump by transfering changes into -r1 and rmoving -r2)
-rw-r--r-- | dev-tcltk/expect/ChangeLog | 7 | ||||
-rw-r--r-- | dev-tcltk/expect/expect-5.37.1-r1.ebuild | 10 | ||||
-rw-r--r-- | dev-tcltk/expect/expect-5.37.1-r2.ebuild | 66 | ||||
-rw-r--r-- | dev-tcltk/expect/files/digest-expect-5.37.1-r2 | 1 |
4 files changed, 14 insertions, 70 deletions
diff --git a/dev-tcltk/expect/ChangeLog b/dev-tcltk/expect/ChangeLog index 81f5aab833b7..1a6e3d677e06 100644 --- a/dev-tcltk/expect/ChangeLog +++ b/dev-tcltk/expect/ChangeLog @@ -1,9 +1,14 @@ # ChangeLog for dev-tcltk/expect # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.5 2002/10/26 04:02:49 george Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.6 2002/10/28 08:31:59 george Exp $ *expect-5.37.1 (08 July 2002) + 27 Oct 2002; George Shapovalov <george@gentoo.org> epect-5.37.1-r1.ebuild, epect-5.37.1-r2.ebuild : + + incorporated changes in -r2 into -r1 and deleted -r2 keeping -r1 unmasked. + Avoiding revision bump in unmasked version, since the fix will only concern some users. + 25 Oct 2002; George Shapovalov <george@gentoo.org> epect-5.37.1-r2.ebuild : modified src_install to add examples if doc is defined. Revision bumped for testing. diff --git a/dev-tcltk/expect/expect-5.37.1-r1.ebuild b/dev-tcltk/expect/expect-5.37.1-r1.ebuild index 68278765c0ee..c0a41acd39c9 100644 --- a/dev-tcltk/expect/expect-5.37.1-r1.ebuild +++ b/dev-tcltk/expect/expect-5.37.1-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.37.1-r1.ebuild,v 1.6 2002/10/20 18:47:52 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.37.1-r1.ebuild,v 1.7 2002/10/28 08:31:59 george Exp $ -IUSE="X" +IUSE="X doc" #remove the trailing ".0" from the tarball version S=${WORKDIR}/${P%.1} @@ -56,5 +56,11 @@ src_install () { #docs dodoc Changelog FAQ HISTORY NEWS README + #install examples if 'doc' is set + if use doc; then + cd ${S} + dodir /usr/share/doc/${PF}/examples/ + cp example/* ${D}/usr/share/doc/${PF}/examples/ + fi } diff --git a/dev-tcltk/expect/expect-5.37.1-r2.ebuild b/dev-tcltk/expect/expect-5.37.1-r2.ebuild deleted file mode 100644 index d7e3eca9ee67..000000000000 --- a/dev-tcltk/expect/expect-5.37.1-r2.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.37.1-r2.ebuild,v 1.2 2002/10/26 04:17:04 george Exp $ - -IUSE="X doc" - -#remove the trailing ".0" from the tarball version -S=${WORKDIR}/${P%.1} - -DESCRIPTION="Expect is a tool for automating interactive applications" -SRC_URI="http://expect.nist.gov/src/${P}.tar.gz" -HOMEPAGE="http://expect.nist.gov/" - -SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc ~sparc64" -LICENSE="BSD" - -DEPEND=">=dev-lang/tcl-8.2 - X? ( >=dev-lang/tk-8.2 )" - - -src_compile() { - - 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 /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=/usr/lib --with-tclinclude=/usr/lib/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=/usr/lib" - else - #configure knows that tk depends on X so just disable X - myconf="$myconf --without-x" - fi - - econf $myconf --enable-shared || die - emake || die - -} - -src_install () { - - einstall || die - - #docs - dodoc Changelog FAQ HISTORY NEWS README - - #install examples if 'doc' is set - if use doc; then - cd ${S} - dodir /usr/share/doc/${PF}/examples/ - cp example/* ${D}/usr/share/doc/${PF}/examples/ - fi -} - diff --git a/dev-tcltk/expect/files/digest-expect-5.37.1-r2 b/dev-tcltk/expect/files/digest-expect-5.37.1-r2 deleted file mode 100644 index 6543a4578374..000000000000 --- a/dev-tcltk/expect/files/digest-expect-5.37.1-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 d570837b6dc6311036d7bdeab19f0e03 expect-5.37.1.tar.gz 517284 |