Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dev-tcltk/blt/ChangeLog9
-rw-r--r--dev-tcltk/blt/blt-2.4z-r1.ebuild58
-rw-r--r--dev-tcltk/blt/blt-2.4z-r5.ebuild16
-rw-r--r--dev-tcltk/blt/blt-2.4z-r6.ebuild96
-rw-r--r--dev-tcltk/blt/blt-2.4z-r7.ebuild100
-rw-r--r--dev-tcltk/blt/blt-2.4z-r8.ebuild34
6 files changed, 33 insertions, 280 deletions
diff --git a/dev-tcltk/blt/ChangeLog b/dev-tcltk/blt/ChangeLog
index f7c625d88ed5..0e809ec77053 100644
--- a/dev-tcltk/blt/ChangeLog
+++ b/dev-tcltk/blt/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-tcltk/blt
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/ChangeLog,v 1.35 2010/04/08 10:18:22 jlec Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/ChangeLog,v 1.36 2011/01/16 19:30:10 jlec Exp $
+
+ 16 Jan 2011; Justin Lecher <jlec@gentoo.org> -blt-2.4z-r1.ebuild,
+ blt-2.4z-r5.ebuild, -blt-2.4z-r6.ebuild, -blt-2.4z-r7.ebuild,
+ blt-2.4z-r8.ebuild:
+ Removed old, streamlined others
*blt-2.4z-r8 (08 Apr 2010)
diff --git a/dev-tcltk/blt/blt-2.4z-r1.ebuild b/dev-tcltk/blt/blt-2.4z-r1.ebuild
deleted file mode 100644
index e43909e2a9b0..000000000000
--- a/dev-tcltk/blt/blt-2.4z-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r1.ebuild,v 1.9 2008/02/17 04:19:39 tgall Exp $
-
-inherit eutils flag-o-matic
-
-SRC_URI="mirror://sourceforge/blt/BLT2.4z.tar.gz"
-HOMEPAGE="http://blt.sf.net"
-DESCRIPTION="BLT is an extension to the Tk toolkit adding new widgets, geometry managers, and miscellaneous commands."
-DEPEND=">=dev-lang/tk-8.0"
-IUSE=""
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-
-S="${WORKDIR}/${PN}${PV}"
-
-src_unpack() {
- unpack ${A}
- epatch "${FILESDIR}"/blt2.4z-install.diff
-
- # From blt-2.4z-6mdk.src.rpm
- epatch "${FILESDIR}"/blt2.4z-64bit.patch
-
- # Set the correct libdir
- sed -i -e "s:\(^libdir=\${exec_prefix}/\)lib:\1$(get_libdir):" \
- "${S}"/configure || die "sed failed"
-}
-
-src_compile() {
- # bug 167934
- append-flags -fPIC
-
- cd "${S}"
- ./configure --host=${CHOST} \
- --prefix=/usr \
- --libdir=/usr/$(get_libdir) \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- --with-x \
- --with-tcl=/usr/$(get_libdir) || die "./configure failed"
-
- emake -j1 CFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
- dodir /usr/bin \
- /usr/lib/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
- for f in `ls "${D}"/usr/share/man/mann` ; do
- mv "${D}"/usr/share/man/mann/${f} "${D}"/usr/share/man/mann/${f/.n/.nblt}
- done
-}
diff --git a/dev-tcltk/blt/blt-2.4z-r5.ebuild b/dev-tcltk/blt/blt-2.4z-r5.ebuild
index 678ec79cef70..e5855cc76eb7 100644
--- a/dev-tcltk/blt/blt-2.4z-r5.ebuild
+++ b/dev-tcltk/blt/blt-2.4z-r5.ebuild
@@ -1,21 +1,23 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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-r5.ebuild,v 1.7 2009/09/22 11:55:33 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r5.ebuild,v 1.8 2011/01/16 19:30:10 jlec Exp $
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"
+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="BLT is an extension to the Tk toolkit adding new widgets, geometry managers, and misc commands."
+DESCRIPTION="Extension to Tk, adding new widgets, geometry managers, and misc commands"
IUSE=""
SLOT="0"
LICENSE="BSD"
KEYWORDS="amd64 ppc ppc64 sparc x86"
-DEPEND=">=dev-lang/tk-8.0
+DEPEND="
+ dev-lang/tk
x11-libs/libX11"
RDEPEND="${DEPEND}"
@@ -44,7 +46,7 @@ src_compile() {
# bug 167934
append-flags -fPIC
- econf --with-blt=/usr/$(get_libdir) || die "./configure failed"
+ econf --with-blt=/usr/$(get_libdir)
# parallel borks
emake -j1 || die "emake failed"
}
diff --git a/dev-tcltk/blt/blt-2.4z-r6.ebuild b/dev-tcltk/blt/blt-2.4z-r6.ebuild
deleted file mode 100644
index e99d585d70b6..000000000000
--- a/dev-tcltk/blt/blt-2.4z-r6.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r6.ebuild,v 1.1 2010/03/06 12:16:07 jlec 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="BLT is an extension to the Tk toolkit adding new widgets, geometry managers, and misc commands."
-
-IUSE="jpeg X"
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
- >=dev-lang/tk-8.0
- jpeg? ( media-libs/jpeg:0 )
- 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"
-}
-
-src_configure() {
- # bug 167934
- append-flags -fPIC
-
- 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) \
- || die "./configure failed"
-
-}
-
-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
-}
diff --git a/dev-tcltk/blt/blt-2.4z-r7.ebuild b/dev-tcltk/blt/blt-2.4z-r7.ebuild
deleted file mode 100644
index d97f98521187..000000000000
--- a/dev-tcltk/blt/blt-2.4z-r7.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r7.ebuild,v 1.1 2010/03/21 20:05:21 jlec 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="BLT is an extension to the Tk toolkit adding new widgets, geometry managers, and misc commands."
-
-IUSE="jpeg X"
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
- >=dev-lang/tk-8.0
- jpeg? ( media-libs/jpeg:0 )
- 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"
-}
-
-src_configure() {
- # bug 167934
- append-flags -fPIC
-
- 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) \
- || die "./configure failed"
-
-}
-
-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.so /usr/$(get_libdir)/libBLT.so || die
- dosym libBLTlite24.so /usr/$(get_libdir)/libBLTlite.so || die
-}
diff --git a/dev-tcltk/blt/blt-2.4z-r8.ebuild b/dev-tcltk/blt/blt-2.4z-r8.ebuild
index 48fc97b02ee0..455307b8a155 100644
--- a/dev-tcltk/blt/blt-2.4z-r8.ebuild
+++ b/dev-tcltk/blt/blt-2.4z-r8.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.1 2010/04/08 10:18:22 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/blt/blt-2.4z-r8.ebuild,v 1.2 2011/01/16 19:30:10 jlec 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"
+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="BLT is an extension to the Tk toolkit adding new widgets, geometry managers, and misc commands."
+DESCRIPTION="Extension to Tk, adding new widgets, geometry managers, and misc commands"
IUSE="jpeg X"
SLOT="0"
@@ -18,7 +19,7 @@ LICENSE="BSD"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
DEPEND="
- >=dev-lang/tk-8.0
+ dev-lang/tk
jpeg? ( media-libs/jpeg:0 )
X? ( x11-libs/libX11 )"
RDEPEND="${DEPEND}"
@@ -50,20 +51,19 @@ src_configure() {
append-flags -fPIC
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) \
+ --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) \
- || die "./configure failed"
+ $(use_with X x)
}