| 1 |
jlec 12/06/07 16:47:30 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: tk-8.5.11-r1.ebuild |
| 5 |
Log: |
| 6 |
dev-lang/tk: Drop standard lib locataion from tkConfig.sh equal to tcl, #420129 |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.171 dev-lang/tk/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/ChangeLog?rev=1.171&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/ChangeLog?rev=1.171&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/ChangeLog?r1=1.170&r2=1.171 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v |
| 20 |
retrieving revision 1.170 |
| 21 |
retrieving revision 1.171 |
| 22 |
diff -u -r1.170 -r1.171 |
| 23 |
--- ChangeLog 26 Apr 2012 19:49:06 -0000 1.170 |
| 24 |
+++ ChangeLog 7 Jun 2012 16:47:30 -0000 1.171 |
| 25 |
@@ -1,6 +1,11 @@ |
| 26 |
# ChangeLog for dev-lang/tk |
| 27 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.170 2012/04/26 19:49:06 aballier Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.171 2012/06/07 16:47:30 jlec Exp $ |
| 30 |
+ |
| 31 |
+*tk-8.5.11-r1 (07 Jun 2012) |
| 32 |
+ |
| 33 |
+ 07 Jun 2012; Justin Lecher <jlec@g.o> +tk-8.5.11-r1.ebuild: |
| 34 |
+ Drop standard lib locataion from tkConfig.sh equal to tcl, #420129 |
| 35 |
|
| 36 |
26 Apr 2012; Alexis Ballier <aballier@g.o> tk-8.5.11.ebuild: |
| 37 |
keyword ~amd64-fbsd |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.1 dev-lang/tk/tk-8.5.11-r1.ebuild |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/tk-8.5.11-r1.ebuild?rev=1.1&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tk/tk-8.5.11-r1.ebuild?rev=1.1&content-type=text/plain |
| 45 |
|
| 46 |
Index: tk-8.5.11-r1.ebuild |
| 47 |
=================================================================== |
| 48 |
# Copyright 1999-2012 Gentoo Foundation |
| 49 |
# Distributed under the terms of the GNU General Public License v2 |
| 50 |
# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.11-r1.ebuild,v 1.1 2012/06/07 16:47:30 jlec Exp $ |
| 51 |
|
| 52 |
EAPI=4 |
| 53 |
|
| 54 |
inherit autotools eutils multilib toolchain-funcs prefix |
| 55 |
|
| 56 |
MY_P="${PN}${PV/_beta/b}" |
| 57 |
|
| 58 |
DESCRIPTION="Tk Widget Set" |
| 59 |
HOMEPAGE="http://www.tcl.tk/" |
| 60 |
SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz" |
| 61 |
|
| 62 |
LICENSE="BSD" |
| 63 |
SLOT="0" |
| 64 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 65 |
IUSE="debug threads truetype aqua xscreensaver" |
| 66 |
|
| 67 |
RDEPEND=" |
| 68 |
!aqua? ( |
| 69 |
x11-libs/libX11 |
| 70 |
x11-libs/libXt |
| 71 |
truetype? ( x11-libs/libXft ) |
| 72 |
xscreensaver? ( x11-libs/libXScrnSaver ) ) |
| 73 |
~dev-lang/tcl-${PV}" |
| 74 |
DEPEND="${RDEPEND} |
| 75 |
!aqua? ( x11-proto/xproto )" |
| 76 |
|
| 77 |
S="${WORKDIR}/${MY_P}" |
| 78 |
|
| 79 |
src_prepare() { |
| 80 |
epatch "${FILESDIR}"/${P}-fedora-xft.patch |
| 81 |
epatch "${FILESDIR}"/${PN}-8.4.11-multilib.patch |
| 82 |
|
| 83 |
epatch "${FILESDIR}"/${PN}-8.4.15-aqua.patch |
| 84 |
eprefixify unix/Makefile.in |
| 85 |
|
| 86 |
# Bug 125971 |
| 87 |
epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch |
| 88 |
|
| 89 |
# Bug 354067 : the same applies to tk, since the patch is about tcl.m4, just |
| 90 |
# copy the tcl patch |
| 91 |
epatch "${FILESDIR}"/tcl-8.5.9-gentoo-fbsd.patch |
| 92 |
|
| 93 |
sed -i 's/FT_New_Face/XftFontOpen/g' unix/configure.in || die |
| 94 |
|
| 95 |
cd "${S}"/unix |
| 96 |
eautoreconf |
| 97 |
} |
| 98 |
|
| 99 |
src_configure() { |
| 100 |
tc-export CC |
| 101 |
cd "${S}"/unix |
| 102 |
|
| 103 |
local mylibdir=$(get_libdir) |
| 104 |
|
| 105 |
econf \ |
| 106 |
--with-tcl="${EPREFIX}/usr/${mylibdir}" \ |
| 107 |
$(use_enable threads) \ |
| 108 |
$(use_enable aqua) \ |
| 109 |
$(use_enable truetype xft) \ |
| 110 |
$(use_enable xscreensaver xss) \ |
| 111 |
$(use_enable debug symbols) |
| 112 |
} |
| 113 |
|
| 114 |
src_compile() { |
| 115 |
cd "${S}"/unix && emake |
| 116 |
} |
| 117 |
|
| 118 |
src_install() { |
| 119 |
#short version number |
| 120 |
local v1 |
| 121 |
v1=${PV%.*} |
| 122 |
|
| 123 |
cd "${S}"/unix |
| 124 |
S= emake DESTDIR="${D}" install |
| 125 |
|
| 126 |
# normalize $S path, bug #280766 (pkgcore) |
| 127 |
local nS="$(cd "${S}"; pwd)" |
| 128 |
|
| 129 |
# fix the tkConfig.sh to eliminate refs to the build directory |
| 130 |
local mylibdir=$(get_libdir); mylibdir=${mylibdir//\/} |
| 131 |
sed -i \ |
| 132 |
-e "s,^TK_BUILD_LIB_SPEC='-L.*/unix ,TK_BUILD_LIB_SPEC='," \ |
| 133 |
-e "s,^TK_SRC_DIR='.*',TK_SRC_DIR='${EPREFIX}/usr/${mylibdir}/tk${v1}/include'," \ |
| 134 |
-e "s,^TK_BUILD_STUB_LIB_SPEC='-L.*/unix ,TK_BUILD_STUB_LIB_SPEC='," \ |
| 135 |
-e "s,^TK_BUILD_STUB_LIB_PATH='.*/unix,TK_BUILD_STUB_LIB_PATH='${EPREFIX}/usr/${mylibdir}," \ |
| 136 |
-e "s,^TK_LIB_FILE='libtk${v1}..TK_DBGX..so',TK_LIB_FILE=\"libtk${v1}\$\{TK_DBGX\}.so\"," \ |
| 137 |
-e "s,^TK_STUB_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir} ,TK_STUB_LIB_SPEC='," \ |
| 138 |
-e "s,^TK_LIB_SPEC='-L${EPREFIX}/usr/${mylibdir} ,TK_LIB_SPEC='," \ |
| 139 |
"${ED}"/usr/${mylibdir}/tkConfig.sh || die |
| 140 |
if [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then |
| 141 |
sed -i \ |
| 142 |
-e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:${EPREFIX}/usr/${mylibdir}'," \ |
| 143 |
-e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:${EPREFIX}/usr/${mylibdir}'," \ |
| 144 |
"${ED}"/usr/${mylibdir}/tkConfig.sh || die |
| 145 |
fi |
| 146 |
|
| 147 |
# install private headers |
| 148 |
insinto /usr/${mylibdir}/tk${v1}/include/unix |
| 149 |
doins "${S}"/unix/*.h |
| 150 |
insinto /usr/${mylibdir}/tk${v1}/include/generic |
| 151 |
doins "${S}"/generic/*.h |
| 152 |
rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/tk.h |
| 153 |
rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h |
| 154 |
rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h |
| 155 |
|
| 156 |
# install symlink for libraries |
| 157 |
#dosym libtk${v1}.a /usr/${mylibdir}/libtk.a |
| 158 |
dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname) |
| 159 |
dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a |
| 160 |
|
| 161 |
dosym wish${v1} /usr/bin/wish |
| 162 |
|
| 163 |
cd "${S}" |
| 164 |
dodoc ChangeLog* README changes |
| 165 |
} |
Archives