* [gentoo-commits] gentoo-x86 commit in dev-tcltk/blt: ChangeLog blt-2.4z-r9.ebuild blt-2.4z-r8.ebuild
@ 2011-07-01 14:54 Fabian Groffen (grobian)
0 siblings, 0 replies; only message in thread
From: Fabian Groffen (grobian) @ 2011-07-01 14:54 UTC (permalink / raw
To: gentoo-commits
grobian 11/07/01 14:54:53
Modified: ChangeLog blt-2.4z-r8.ebuild
Added: blt-2.4z-r9.ebuild
Log:
Fix broken darwin patch, thanks Honza Macháček in bug #373695
(Portage version: 2.2.01.18826-prefix/cvs/Darwin powerpc)
Revision Changes Path
1.45 dev-tcltk/blt/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/blt/ChangeLog?rev=1.45&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/blt/ChangeLog?rev=1.45&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/blt/ChangeLog?r1=1.44&r2=1.45
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-tcltk/blt/ChangeLog,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ChangeLog 27 Jun 2011 17:30:02 -0000 1.44
+++ ChangeLog 1 Jul 2011 14:54:53 -0000 1.45
@@ -1,6 +1,12 @@
# ChangeLog for dev-tcltk/blt
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/ChangeLog,v 1.44 2011/06/27 17:30:02 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/ChangeLog,v 1.45 2011/07/01 14:54:53 grobian Exp $
+
+*blt-2.4z-r9 (01 Jul 2011)
+
+ 01 Jul 2011; Fabian Groffen <grobian@gentoo.org> blt-2.4z-r8.ebuild,
+ +blt-2.4z-r9.ebuild, files/blt-2.4z-darwin.patch:
+ Fix broken darwin patch, thanks Honza Macháček in bug #373695
27 Jun 2011; Fabian Groffen <grobian@gentoo.org> blt-2.4z-r8.ebuild:
Marked *-solaris, bug #355373
1.11 dev-tcltk/blt/blt-2.4z-r8.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/blt/blt-2.4z-r8.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/blt/blt-2.4z-r8.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/blt/blt-2.4z-r8.ebuild?r1=1.10&r2=1.11
Index: blt-2.4z-r8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r8.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- blt-2.4z-r8.ebuild 27 Jun 2011 17:30:02 -0000 1.10
+++ blt-2.4z-r8.ebuild 1 Jul 2011 14:54:53 -0000 1.11
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r8.ebuild,v 1.10 2011/06/27 17:30:02 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r8.ebuild,v 1.11 2011/07/01 14:54:53 grobian Exp $
EAPI="3"
@@ -44,7 +44,6 @@
Makefile.in demos/Makefile.in || die "sed Makefile.in failed"
epatch "${FILESDIR}"/${P}-linking.patch
- epatch "${FILESDIR}"/${P}-darwin.patch
}
src_configure() {
1.1 dev-tcltk/blt/blt-2.4z-r9.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/blt/blt-2.4z-r9.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/blt/blt-2.4z-r9.ebuild?rev=1.1&content-type=text/plain
Index: blt-2.4z-r9.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r9.ebuild,v 1.1 2011/07/01 14:54:53 grobian Exp $
EAPI="3"
inherit eutils flag-o-matic toolchain-funcs
MY_V_SUFFIX="-8.5.2"
HOMEPAGE="
http://blt.sourceforge.net/
http://jos.decoster.googlepages.com/bltfortk8.5.2"
SRC_URI="http://jos.decoster.googlepages.com/${PN}${PV}${MY_V_SUFFIX}.tar.gz"
DESCRIPTION="Extension to Tk, adding new widgets, geometry managers, and misc commands"
IUSE="jpeg X"
SLOT="0"
LICENSE="BSD"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND="
dev-lang/tk
jpeg? ( virtual/jpeg )
X? ( x11-libs/libX11 )"
RDEPEND="${DEPEND}"
S="${WORKDIR}/${PN}${PV}${MY_V_SUFFIX}"
src_prepare() {
epatch "${FILESDIR}/blt-2.4z-r4-fix-makefile.patch"
epatch "${FILESDIR}/blt-2.4z-r4-fix-makefile2.patch"
# From blt-2.4z-6mdk.src.rpm
epatch "${FILESDIR}"/blt2.4z-64bit.patch
#epatch "${FILESDIR}"/blt-2.4z-tcl8.5-fix.patch
epatch "${FILESDIR}"/blt-2.4z-tcl8.5-fixpkgruntime.patch
epatch "${FILESDIR}"/${P}-ldflags.patch
# Set the correct libdir
sed -i -e "s:\(^libdir=\${exec_prefix}/\)lib:\1$(get_libdir):" \
configure* || die "sed configure* failed"
sed -i -e "/^scriptdir =/s:lib:$(get_libdir):" \
Makefile.in demos/Makefile.in || die "sed Makefile.in failed"
epatch "${FILESDIR}"/${P}-linking.patch
epatch "${FILESDIR}"/${P}-darwin.patch
}
src_configure() {
# bug 167934
append-flags -fPIC
LC_ALL=C \
econf \
--x-includes="${EPREFIX}/usr/include" \
--x-libraries="${EPREFIX}/usr/$(get_libdir)" \
--with-blt="${EPREFIX}/usr/$(get_libdir)" \
--with-tcl="${EPREFIX}/usr/$(get_libdir)" \
--with-tk="${EPREFIX}/usr/$(get_libdir)" \
--with-tclincls="${EPREFIX}/usr/include" \
--with-tkincls="${EPREFIX}/usr/include" \
--with-tcllibs="${EPREFIX}/usr/$(get_libdir)" \
--with-tklibs="${EPREFIX}/usr/$(get_libdir)" \
--with-cc="$(tc-getCC)" \
--with-cflags="${CFLAGS}" \
$(use_enable jpeg) \
$(use_with X x)
}
src_compile() {
# parallel borks
emake -j1 LDFLAGS="${LDFLAGS}" || die "emake failed"
}
src_install() {
sed \
-e "s:\.\./src/bltwish:${EPREFIX}/usr/bin/bltwish:g" \
-e "s:\.\./bltwish:${EPREFIX}/usr/bin/bltwish:g" \
-e "s:/usr/local/bin/bltwish:${EPREFIX}/usr/bin/bltwish:g" \
-e "s:/usr/local/bin/tclsh:${EPREFIX}/usr/bin/tclsh:g" \
-i demos/{,scripts/}*.tcl || die
dodir /usr/bin \
/usr/$(get_libdir)/blt2.4/demos/bitmaps \
/usr/share/man/mann \
/usr/include \
|| die "dodir failed"
emake -j1 INSTALL_ROOT="${D}" install || die "make install failed"
dodoc NEWS PROBLEMS README
dohtml html/*.html
for f in `ls "${ED}"/usr/share/man/mann` ; do
mv "${ED}"/usr/share/man/mann/${f} "${ED}"/usr/share/man/mann/${f/.n/.nblt}
done
# bug 259338 - dev-tcltk/blt-2.4z-r4 provides empty pkgIndex.tcl
cp "${FILESDIR}"/pkgIndex.tcl "${ED}"/usr/$(get_libdir)/blt2.4/pkgIndex.tcl
# fix for linking against shared lib with -lBLT or -lBLTlite
dosym libBLT24$(get_libname) /usr/$(get_libdir)/libBLT$(get_libname) || die
dosym libBLTlite24$(get_libname) /usr/$(get_libdir)/libBLTlite$(get_libname) || die
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-07-01 14:55 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-01 14:54 [gentoo-commits] gentoo-x86 commit in dev-tcltk/blt: ChangeLog blt-2.4z-r9.ebuild blt-2.4z-r8.ebuild Fabian Groffen (grobian)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox