* [gentoo-commits] gentoo-x86 commit in dev-tcltk/expect: expect-5.43.0-r1.ebuild ChangeLog expect-5.44.1.15.ebuild
@ 2010-04-17 13:40 Justin Lecher (jlec)
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher (jlec) @ 2010-04-17 13:40 UTC (permalink / raw
To: gentoo-commits
jlec 10/04/17 13:40:36
Modified: expect-5.43.0-r1.ebuild ChangeLog
expect-5.44.1.15.ebuild
Log:
Remove USE=X support, as it isn't supported anymore, #315729
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.2 dev-tcltk/expect/expect-5.43.0-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/expect/expect-5.43.0-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/expect/expect-5.43.0-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/expect/expect-5.43.0-r1.ebuild?r1=1.1&r2=1.2
Index: expect-5.43.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.43.0-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- expect-5.43.0-r1.ebuild 16 Apr 2010 12:07:25 -0000 1.1
+++ expect-5.43.0-r1.ebuild 17 Apr 2010 13:40:36 -0000 1.2
@@ -1,6 +1,6 @@
# 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.43.0-r1.ebuild,v 1.1 2010/04/16 12:07:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.43.0-r1.ebuild,v 1.2 2010/04/17 13:40:36 jlec Exp $
EAPI="3"
@@ -14,12 +14,11 @@
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"
+IUSE="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
- X? ( >=dev-lang/tk-8.2 )"
+DEPEND=">=dev-lang/tk-8.2"
RDEPEND="${DEPEND}"
NON_MICRO_V=${PN}-$(get_version_component_range 1-2)
@@ -29,7 +28,7 @@
# fix install_name on darwin
[[ ${CHOST} == *-darwin* ]] && \
epatch "${FILESDIR}"/${P}-darwin.patch
-epatch "${FILESDIR}"/"${P}"-multilib.patch
+ epatch "${FILESDIR}"/"${P}"-multilib.patch
#fix the rpath being set to /var/tmp/portage/...
epatch "${FILESDIR}"/expect-5.39.0-libdir.patch
@@ -68,15 +67,7 @@
#configure needs to find the file tclConfig.sh is
myconf="--with-tcl=${EPREFIX}/usr/$(get_libdir) --with-tclinclude=${TCL_HDIR}"
- 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)"
- else
- #configure knows that tk depends on X so just disable X
- myconf="$myconf --without-x"
- fi
+ myconf="$myconf --with-tk=${EPREFIX}/usr/$(get_libdir)"
econf $myconf --enable-shared
}
1.70 dev-tcltk/expect/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/expect/ChangeLog?rev=1.70&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/expect/ChangeLog?rev=1.70&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/expect/ChangeLog?r1=1.69&r2=1.70
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- ChangeLog 16 Apr 2010 12:07:25 -0000 1.69
+++ ChangeLog 17 Apr 2010 13:40:36 -0000 1.70
@@ -1,6 +1,10 @@
# ChangeLog for dev-tcltk/expect
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.69 2010/04/16 12:07:25 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.70 2010/04/17 13:40:36 jlec Exp $
+
+ 17 Apr 2010; Justin Lecher <jlec@gentoo.org> expect-5.43.0-r1.ebuild,
+ expect-5.44.1.15.ebuild:
+ Remove USE=X support, as it isn't supported anymore, #315729
*expect-5.43.0-r1 (16 Apr 2010)
1.3 dev-tcltk/expect/expect-5.44.1.15.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/expect/expect-5.44.1.15.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/expect/expect-5.44.1.15.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/expect/expect-5.44.1.15.ebuild?r1=1.2&r2=1.3
Index: expect-5.44.1.15.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.44.1.15.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- expect-5.44.1.15.ebuild 12 Apr 2010 20:21:32 -0000 1.2
+++ expect-5.44.1.15.ebuild 17 Apr 2010 13:40:36 -0000 1.3
@@ -1,6 +1,6 @@
# 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.15.ebuild,v 1.2 2010/04/12 20:21:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.44.1.15.ebuild,v 1.3 2010/04/17 13:40:36 jlec Exp $
EAPI="3"
@@ -14,13 +14,11 @@
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="X doc"
+IUSE="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"
+DEPEND=">=dev-lang/tk-8.2"
RDEPEND="${DEPEND}"
src_prepare() {
@@ -56,15 +54,7 @@
#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
+ myconf="$myconf --with-tk=${EPREFIX}/usr/$(get_libdir) --with-tkinclude=${EPREFIX}/usr/include"
econf $myconf --enable-shared || die "econf failed"
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-tcltk/expect: expect-5.43.0-r1.ebuild ChangeLog expect-5.44.1.15.ebuild
@ 2010-04-23 10:44 Justin Lecher (jlec)
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher (jlec) @ 2010-04-23 10:44 UTC (permalink / raw
To: gentoo-commits
jlec 10/04/23 10:44:12
Modified: expect-5.43.0-r1.ebuild ChangeLog
expect-5.44.1.15.ebuild
Log:
Reintroduced USE=X again on request of aballier
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.3 dev-tcltk/expect/expect-5.43.0-r1.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/expect/expect-5.43.0-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/expect/expect-5.43.0-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/expect/expect-5.43.0-r1.ebuild?r1=1.2&r2=1.3
Index: expect-5.43.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.43.0-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- expect-5.43.0-r1.ebuild 17 Apr 2010 13:40:36 -0000 1.2
+++ expect-5.43.0-r1.ebuild 23 Apr 2010 10:44:12 -0000 1.3
@@ -1,6 +1,6 @@
# 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.43.0-r1.ebuild,v 1.2 2010/04/17 13:40:36 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.43.0-r1.ebuild,v 1.3 2010/04/23 10:44:12 jlec Exp $
EAPI="3"
@@ -14,11 +14,12 @@
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="doc"
+IUSE="doc X"
# We need dejagnu for src_test, but dejagnu needs expect
# to compile/run, so we cant add dejagnu to DEPEND :/
-DEPEND=">=dev-lang/tk-8.2"
+DEPEND=">=dev-lang/tcl-8.2
+ X? ( >=dev-lang/tk-8.2 )"
RDEPEND="${DEPEND}"
NON_MICRO_V=${PN}-$(get_version_component_range 1-2)
@@ -61,13 +62,20 @@
src_configure() {
local myconf
local tcl_version
- tcl_version="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
+ tcl_version="$(best_version dev-lang/tcl | cut -d- -f3 | cut -d. -f1,2)"
TCL_HDIR="${EPREFIX}/usr/$(get_libdir)/tcl${tcl_version}/include"
-
#configure needs to find the file tclConfig.sh is
myconf="--with-tcl=${EPREFIX}/usr/$(get_libdir) --with-tclinclude=${TCL_HDIR}"
- myconf="$myconf --with-tk=${EPREFIX}/usr/$(get_libdir)"
+ 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/$(get_libdir)"
+ else
+ #configure knows that tk depends on X so just disable X
+ myconf="$myconf --without-x"
+ fi
econf $myconf --enable-shared
}
1.71 dev-tcltk/expect/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/expect/ChangeLog?rev=1.71&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/expect/ChangeLog?rev=1.71&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/expect/ChangeLog?r1=1.70&r2=1.71
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- ChangeLog 17 Apr 2010 13:40:36 -0000 1.70
+++ ChangeLog 23 Apr 2010 10:44:12 -0000 1.71
@@ -1,6 +1,10 @@
# ChangeLog for dev-tcltk/expect
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.70 2010/04/17 13:40:36 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.71 2010/04/23 10:44:12 jlec Exp $
+
+ 23 Apr 2010; Justin Lecher <jlec@gentoo.org> expect-5.43.0-r1.ebuild,
+ expect-5.44.1.15.ebuild:
+ Reintroduced USE=X again on request of aballier
17 Apr 2010; Justin Lecher <jlec@gentoo.org> expect-5.43.0-r1.ebuild,
expect-5.44.1.15.ebuild:
1.4 dev-tcltk/expect/expect-5.44.1.15.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/expect/expect-5.44.1.15.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/expect/expect-5.44.1.15.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-tcltk/expect/expect-5.44.1.15.ebuild?r1=1.3&r2=1.4
Index: expect-5.44.1.15.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.44.1.15.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- expect-5.44.1.15.ebuild 17 Apr 2010 13:40:36 -0000 1.3
+++ expect-5.44.1.15.ebuild 23 Apr 2010 10:44:12 -0000 1.4
@@ -1,6 +1,6 @@
# 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.15.ebuild,v 1.3 2010/04/17 13:40:36 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.44.1.15.ebuild,v 1.4 2010/04/23 10:44:12 jlec Exp $
EAPI="3"
@@ -14,11 +14,12 @@
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="doc"
+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/tk-8.2"
+DEPEND=">=dev-lang/tcl-8.2[threads?]
+ X? ( >=dev-lang/tk-8.2[threads?] )"
RDEPEND="${DEPEND}"
src_prepare() {
@@ -49,14 +50,25 @@
# 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
+ #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"
- myconf="$myconf --with-tk=${EPREFIX}/usr/$(get_libdir) --with-tkinclude=${EPREFIX}/usr/include"
-
- econf $myconf --enable-shared || die "econf failed"
+# 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 \
+ $(use_enable threads) \
+ $(use_enable amd64 64bit) \
+ $(use_enable debug symbols)
}
src_test() {
@@ -76,11 +88,11 @@
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}
+ sed -e 's/^SCRIPTS = //' -et -ed | head -n1)
+ insinto /usr/share/doc/${PF}/examples
+ doins ${scripts} || die
local scripts_manpages=$(make -qp | \
- sed -e 's/^_SCRIPTS_MANPAGES = //' -et -ed | head -n1)
+ sed -e 's/^_SCRIPTS_MANPAGES = //' -et -ed | head -n1)
for m in ${scripts_manpages}; do
dodoc example/${m}.man
done
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-04-23 10:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-23 10:44 [gentoo-commits] gentoo-x86 commit in dev-tcltk/expect: expect-5.43.0-r1.ebuild ChangeLog expect-5.44.1.15.ebuild Justin Lecher (jlec)
-- strict thread matches above, loose matches on Subject: below --
2010-04-17 13:40 Justin Lecher (jlec)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox