| 1 |
grobian 11/07/01 14:54:53 |
| 2 |
|
| 3 |
Modified: ChangeLog blt-2.4z-r8.ebuild |
| 4 |
Added: blt-2.4z-r9.ebuild |
| 5 |
Log: |
| 6 |
Fix broken darwin patch, thanks Honza Macháček in bug #373695 |
| 7 |
|
| 8 |
(Portage version: 2.2.01.18826-prefix/cvs/Darwin powerpc) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.45 dev-tcltk/blt/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/blt/ChangeLog?rev=1.45&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/blt/ChangeLog?rev=1.45&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/blt/ChangeLog?r1=1.44&r2=1.45 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/dev-tcltk/blt/ChangeLog,v |
| 20 |
retrieving revision 1.44 |
| 21 |
retrieving revision 1.45 |
| 22 |
diff -u -r1.44 -r1.45 |
| 23 |
--- ChangeLog 27 Jun 2011 17:30:02 -0000 1.44 |
| 24 |
+++ ChangeLog 1 Jul 2011 14:54:53 -0000 1.45 |
| 25 |
@@ -1,6 +1,12 @@ |
| 26 |
# ChangeLog for dev-tcltk/blt |
| 27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/ChangeLog,v 1.44 2011/06/27 17:30:02 grobian Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/ChangeLog,v 1.45 2011/07/01 14:54:53 grobian Exp $ |
| 30 |
+ |
| 31 |
+*blt-2.4z-r9 (01 Jul 2011) |
| 32 |
+ |
| 33 |
+ 01 Jul 2011; Fabian Groffen <grobian@g.o> blt-2.4z-r8.ebuild, |
| 34 |
+ +blt-2.4z-r9.ebuild, files/blt-2.4z-darwin.patch: |
| 35 |
+ Fix broken darwin patch, thanks Honza Macháček in bug #373695 |
| 36 |
|
| 37 |
27 Jun 2011; Fabian Groffen <grobian@g.o> blt-2.4z-r8.ebuild: |
| 38 |
Marked *-solaris, bug #355373 |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.11 dev-tcltk/blt/blt-2.4z-r8.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/blt/blt-2.4z-r8.ebuild?rev=1.11&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/blt/blt-2.4z-r8.ebuild?rev=1.11&content-type=text/plain |
| 46 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/blt/blt-2.4z-r8.ebuild?r1=1.10&r2=1.11 |
| 47 |
|
| 48 |
Index: blt-2.4z-r8.ebuild |
| 49 |
=================================================================== |
| 50 |
RCS file: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r8.ebuild,v |
| 51 |
retrieving revision 1.10 |
| 52 |
retrieving revision 1.11 |
| 53 |
diff -u -r1.10 -r1.11 |
| 54 |
--- blt-2.4z-r8.ebuild 27 Jun 2011 17:30:02 -0000 1.10 |
| 55 |
+++ blt-2.4z-r8.ebuild 1 Jul 2011 14:54:53 -0000 1.11 |
| 56 |
@@ -1,6 +1,6 @@ |
| 57 |
# Copyright 1999-2011 Gentoo Foundation |
| 58 |
# Distributed under the terms of the GNU General Public License v2 |
| 59 |
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r8.ebuild,v 1.10 2011/06/27 17:30:02 grobian Exp $ |
| 60 |
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r8.ebuild,v 1.11 2011/07/01 14:54:53 grobian Exp $ |
| 61 |
|
| 62 |
EAPI="3" |
| 63 |
|
| 64 |
@@ -44,7 +44,6 @@ |
| 65 |
Makefile.in demos/Makefile.in || die "sed Makefile.in failed" |
| 66 |
|
| 67 |
epatch "${FILESDIR}"/${P}-linking.patch |
| 68 |
- epatch "${FILESDIR}"/${P}-darwin.patch |
| 69 |
} |
| 70 |
|
| 71 |
src_configure() { |
| 72 |
|
| 73 |
|
| 74 |
|
| 75 |
1.1 dev-tcltk/blt/blt-2.4z-r9.ebuild |
| 76 |
|
| 77 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/blt/blt-2.4z-r9.ebuild?rev=1.1&view=markup |
| 78 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-tcltk/blt/blt-2.4z-r9.ebuild?rev=1.1&content-type=text/plain |
| 79 |
|
| 80 |
Index: blt-2.4z-r9.ebuild |
| 81 |
=================================================================== |
| 82 |
# Copyright 1999-2011 Gentoo Foundation |
| 83 |
# Distributed under the terms of the GNU General Public License v2 |
| 84 |
# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r9.ebuild,v 1.1 2011/07/01 14:54:53 grobian Exp $ |
| 85 |
|
| 86 |
EAPI="3" |
| 87 |
|
| 88 |
inherit eutils flag-o-matic toolchain-funcs |
| 89 |
|
| 90 |
MY_V_SUFFIX="-8.5.2" |
| 91 |
HOMEPAGE=" |
| 92 |
http://blt.sourceforge.net/ |
| 93 |
http://jos.decoster.googlepages.com/bltfortk8.5.2" |
| 94 |
SRC_URI="http://jos.decoster.googlepages.com/${PN}${PV}${MY_V_SUFFIX}.tar.gz" |
| 95 |
DESCRIPTION="Extension to Tk, adding new widgets, geometry managers, and misc commands" |
| 96 |
|
| 97 |
IUSE="jpeg X" |
| 98 |
SLOT="0" |
| 99 |
LICENSE="BSD" |
| 100 |
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" |
| 101 |
|
| 102 |
DEPEND=" |
| 103 |
dev-lang/tk |
| 104 |
jpeg? ( virtual/jpeg ) |
| 105 |
X? ( x11-libs/libX11 )" |
| 106 |
RDEPEND="${DEPEND}" |
| 107 |
|
| 108 |
S="${WORKDIR}/${PN}${PV}${MY_V_SUFFIX}" |
| 109 |
|
| 110 |
src_prepare() { |
| 111 |
epatch "${FILESDIR}/blt-2.4z-r4-fix-makefile.patch" |
| 112 |
epatch "${FILESDIR}/blt-2.4z-r4-fix-makefile2.patch" |
| 113 |
# From blt-2.4z-6mdk.src.rpm |
| 114 |
epatch "${FILESDIR}"/blt2.4z-64bit.patch |
| 115 |
|
| 116 |
#epatch "${FILESDIR}"/blt-2.4z-tcl8.5-fix.patch |
| 117 |
epatch "${FILESDIR}"/blt-2.4z-tcl8.5-fixpkgruntime.patch |
| 118 |
|
| 119 |
epatch "${FILESDIR}"/${P}-ldflags.patch |
| 120 |
|
| 121 |
# Set the correct libdir |
| 122 |
sed -i -e "s:\(^libdir=\${exec_prefix}/\)lib:\1$(get_libdir):" \ |
| 123 |
configure* || die "sed configure* failed" |
| 124 |
sed -i -e "/^scriptdir =/s:lib:$(get_libdir):" \ |
| 125 |
Makefile.in demos/Makefile.in || die "sed Makefile.in failed" |
| 126 |
|
| 127 |
epatch "${FILESDIR}"/${P}-linking.patch |
| 128 |
epatch "${FILESDIR}"/${P}-darwin.patch |
| 129 |
} |
| 130 |
|
| 131 |
src_configure() { |
| 132 |
# bug 167934 |
| 133 |
append-flags -fPIC |
| 134 |
|
| 135 |
LC_ALL=C \ |
| 136 |
econf \ |
| 137 |
--x-includes="${EPREFIX}/usr/include" \ |
| 138 |
--x-libraries="${EPREFIX}/usr/$(get_libdir)" \ |
| 139 |
--with-blt="${EPREFIX}/usr/$(get_libdir)" \ |
| 140 |
--with-tcl="${EPREFIX}/usr/$(get_libdir)" \ |
| 141 |
--with-tk="${EPREFIX}/usr/$(get_libdir)" \ |
| 142 |
--with-tclincls="${EPREFIX}/usr/include" \ |
| 143 |
--with-tkincls="${EPREFIX}/usr/include" \ |
| 144 |
--with-tcllibs="${EPREFIX}/usr/$(get_libdir)" \ |
| 145 |
--with-tklibs="${EPREFIX}/usr/$(get_libdir)" \ |
| 146 |
--with-cc="$(tc-getCC)" \ |
| 147 |
--with-cflags="${CFLAGS}" \ |
| 148 |
$(use_enable jpeg) \ |
| 149 |
$(use_with X x) |
| 150 |
|
| 151 |
} |
| 152 |
|
| 153 |
src_compile() { |
| 154 |
# parallel borks |
| 155 |
emake -j1 LDFLAGS="${LDFLAGS}" || die "emake failed" |
| 156 |
} |
| 157 |
|
| 158 |
src_install() { |
| 159 |
sed \ |
| 160 |
-e "s:\.\./src/bltwish:${EPREFIX}/usr/bin/bltwish:g" \ |
| 161 |
-e "s:\.\./bltwish:${EPREFIX}/usr/bin/bltwish:g" \ |
| 162 |
-e "s:/usr/local/bin/bltwish:${EPREFIX}/usr/bin/bltwish:g" \ |
| 163 |
-e "s:/usr/local/bin/tclsh:${EPREFIX}/usr/bin/tclsh:g" \ |
| 164 |
-i demos/{,scripts/}*.tcl || die |
| 165 |
|
| 166 |
dodir /usr/bin \ |
| 167 |
/usr/$(get_libdir)/blt2.4/demos/bitmaps \ |
| 168 |
/usr/share/man/mann \ |
| 169 |
/usr/include \ |
| 170 |
|| die "dodir failed" |
| 171 |
emake -j1 INSTALL_ROOT="${D}" install || die "make install failed" |
| 172 |
|
| 173 |
dodoc NEWS PROBLEMS README |
| 174 |
dohtml html/*.html |
| 175 |
for f in `ls "${ED}"/usr/share/man/mann` ; do |
| 176 |
mv "${ED}"/usr/share/man/mann/${f} "${ED}"/usr/share/man/mann/${f/.n/.nblt} |
| 177 |
done |
| 178 |
|
| 179 |
# bug 259338 - dev-tcltk/blt-2.4z-r4 provides empty pkgIndex.tcl |
| 180 |
cp "${FILESDIR}"/pkgIndex.tcl "${ED}"/usr/$(get_libdir)/blt2.4/pkgIndex.tcl |
| 181 |
|
| 182 |
# fix for linking against shared lib with -lBLT or -lBLTlite |
| 183 |
dosym libBLT24$(get_libname) /usr/$(get_libdir)/libBLT$(get_libname) || die |
| 184 |
dosym libBLTlite24$(get_libname) /usr/$(get_libdir)/libBLTlite$(get_libname) || die |
| 185 |
} |
Archives