Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 291715 | Differences between
and this patch

Collapse All | Expand All

(-)/opt/gentoo/home/../usr/portage/dev-lang/tk/tk-8.5.8.ebuild (-12 / +14 lines)
Lines 44-49 Link Here
44
	# Bug 125971
44
	# Bug 125971
45
	epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch
45
	epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch
46
46
47
	epatch "${FILESDIR}"/${PN}-8.5.7-prefix.patch || die "Failed to apply prefix patch"
48
47
	cd "${S}"/unix
49
	cd "${S}"/unix
48
	eautoreconf
50
	eautoreconf
49
}
51
}
Lines 55-61 Link Here
55
	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
57
	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
56
58
57
	econf \
59
	econf \
58
		--with-tcl=/usr/${mylibdir} \
60
		--with-tcl="${EPREFIX}"/usr/${mylibdir} \
59
		$(use_enable threads) \
61
		$(use_enable threads) \
60
		$(use_enable truetype xft) \
62
		$(use_enable truetype xft) \
61
		$(use_enable debug symbols) || die
63
		$(use_enable debug symbols) || die
Lines 77-102 Link Here
77
	# fix the tkConfig.sh to eliminate refs to the build directory
79
	# fix the tkConfig.sh to eliminate refs to the build directory
78
	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
80
	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
79
	sed -i \
81
	sed -i \
80
		-e "s,^\(TK_BUILD_LIB_SPEC='-L\)${nS}/unix,\1/usr/${mylibdir}," \
82
		-e "s,^\(TK_BUILD_LIB_SPEC='-L\)${nS}/unix,\1${EPREFIX}/usr/${mylibdir}," \
81
		-e "s,^\(TK_SRC_DIR='\)${nS}',\1/usr/${mylibdir}/tk${v1}/include'," \
83
		-e "s,^\(TK_SRC_DIR='\)${nS}',\1${EPREFIX}/usr/${mylibdir}/tk${v1}/include'," \
82
		-e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${nS}/unix,\1/usr/${mylibdir}," \
84
		-e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${nS}/unix,\1${EPREFIX}/usr/${mylibdir}," \
83
		-e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${nS}/unix,\1/usr/${mylibdir}," \
85
		-e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${nS}/unix,\1${EPREFIX}/usr/${mylibdir}," \
84
		-e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
86
		-e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:${EPREFIX}/usr/${mylibdir}'," \
85
		-e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
87
		-e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:${EPREFIX}/usr/${mylibdir}'," \
86
		"${D}"/usr/${mylibdir}/tkConfig.sh || die
88
		"${ED}"/usr/${mylibdir}/tkConfig.sh || die
87
89
88
	# install private headers
90
	# install private headers
89
	insinto /usr/${mylibdir}/tk${v1}/include/unix
91
	insinto /usr/${mylibdir}/tk${v1}/include/unix
90
	doins "${S}"/unix/*.h || die
92
	doins "${S}"/unix/*.h || die
91
	insinto /usr/${mylibdir}/tk${v1}/include/generic
93
	insinto /usr/${mylibdir}/tk${v1}/include/generic
92
	doins "${S}"/generic/*.h || die
94
	doins "${S}"/generic/*.h || die
93
	rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tk.h
95
	rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/tk.h
94
	rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h
96
	rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h
95
	rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h
97
	rm -f "${ED}"/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h
96
98
97
	# install symlink for libraries
99
	# install symlink for libraries
98
	#dosym libtk${v1}.a /usr/${mylibdir}/libtk.a
100
	#dosym libtk${v1}.a /usr/${mylibdir}/libtk.a
99
	dosym libtk${v1}.so /usr/${mylibdir}/libtk.so
101
	dosym libtk${v1}$(get_libname) /usr/${mylibdir}/libtk$(get_libname)
100
	dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
102
	dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
101
103
102
	dosym wish${v1} /usr/bin/wish
104
	dosym wish${v1} /usr/bin/wish

Return to bug 291715