Version bump to latest. Fixes bug#343189 and bug#342321.

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

4 files changed, 140 insertions, 81 deletions

diff --git a/dev-util/insight/ChangeLog b/dev-util/insight/ChangeLog
index 0a4e68b830f5..86dbaa20d853 100644
--- a/dev-util/insight/ChangeLog
+++ b/dev-util/insight/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/insight
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/insight/ChangeLog,v 1.47 2008/07/12 12:21:10 tester Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/insight/ChangeLog,v 1.48 2012/03/06 13:39:07 scarabeus Exp $
+
+*insight-6.8.1 (06 Mar 2012)
+
+  06 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org> +insight-6.8.1.ebuild,
+  -insight-6.8.ebuild:
+  Version bump to latest. Fixes bug#343189 and bug#342321.
 
 *insight-6.8 (12 Jul 2008)
 
diff --git a/dev-util/insight/Manifest b/dev-util/insight/Manifest
index cc643c026407..217f277c2f5e 100644
--- a/dev-util/insight/Manifest
+++ b/dev-util/insight/Manifest
@@ -1,10 +1,31 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 99insight 70 RMD160 52fcaed6d1e98148a618831a70244e0ff7ff20e2 SHA1 279361aa99e14f091277c23e31922a9fa75a0b02 SHA256 3d2b493b8b7879f26b8189b3d424aeefa39f9eba1784b34c6741882eff9c1e78
 AUX insight-6.6-DESTDIR.patch 7362 RMD160 f3ea5ca1d9dc2cabe1507c079c4af0427ef7867b SHA1 981f91bd340a1ab84d96c37f74de636ff17ea2a3 SHA256 3a8680c762b3d3fd75a02662dc5d0fac262e30aa91407b7cf553abd201b6d0a0
 AUX insight-6.6-burn-paths.patch 446 RMD160 e2ec981c7effaadf4ea2fc5382349e246d441dd1 SHA1 f021a3fc73ffcd3cd416a824b2f09b06dc442b7c SHA256 c80421818de4f7daaf1b8fde2251a06dc97b8de1fa38d6ef77aecabd301bf182
 AUX tkImgGIF.patch 2577 RMD160 ac6e4f4632bdf2ca8047a65238b691cbc063b8a2 SHA1 9aca848bbd3228325e1172ee409c1f8dac063636 SHA256 cd43fc8520b42f0c4a4b82cc89ae5b980f08426d1aa9936de28312e1e1f5b9d9
 DIST insight-6.7.1.tar.bz2 23172660 RMD160 475429a4429c65db7a783072eb5f2b00f05ee530 SHA1 014a1492621afd5c5ec012b1f4fdc43eef400e7b SHA256 c3b3fd534b1da4be279517e1755ce4fa65bc011ed0d62a1bb7e1aab219513542
-DIST insight-6.8.tar.bz2 23554905 RMD160 f7ce0dfd86107c06d99c5b7f7c4e456273e3deba SHA1 85fe6a4d4061a561d4b0051fb6b6e1043dd64674 SHA256 67104d6cec7ace422560c8188c3f5a6794f394d72ed223c51af20ee0d2a92359
+DIST insight-6.8-1a.tar.bz2 23900337 RMD160 608932af274065197a4a312eebf5ef5f43178f8c SHA1 a3182dda9fe52fe14ddb834fd2c9363f54bbda3f SHA256 51216df73adc4f68c67b60356270d5073f0ff094c1b477ecd96560f49707ea2a
+DIST insight-6.8.1-patchset-01.tar.xz 324484 RMD160 b071f60a8234d69685f1c8215b96490948c0f564 SHA1 2e69457fa6dd165fae6648ad027313b947564182 SHA256 54ca13a95d46941ebd25b8db2e31f6dcad9201dd0a414af296057b9fa91a9d0e
 EBUILD insight-6.7.1-r1.ebuild 1906 RMD160 32928b08a8abe3e203d83da9286b260d1db4a6c5 SHA1 6c1a8faa3b8c29f3952739a48cfe35c6a1e5c09b SHA256 9db4e83c4179427ab6bad51ca653a0b7f78e1a4caa98ff0fb9c044efa559d52a
-EBUILD insight-6.8.ebuild 1906 RMD160 6dcb369066dbce9de390d7b897d608ba4382e891 SHA1 d2f7d24c29bcca699c46b11ef543b7af7ebeedb4 SHA256 c8a745da5d95120c789516d448d1a0d378091eb55552852df3666521088cc2e3
-MISC ChangeLog 5663 RMD160 db9ab07693250d78f0bbb5f6a546bb640d44cf2d SHA1 6528b9f45120125cd9d495e5ecccb1eba0df9ddd SHA256 59c98b594648ddf05227ca471a9c6ab1d29ba6ca2831388351bd25e06ae88804
+EBUILD insight-6.8.1.ebuild 2626 RMD160 6a552e3ed688445d6e770b031da876ed8b45592c SHA1 74f4cb9abdcd90a7c766d54b92596c9faa8011c4 SHA256 1e2bcafb67ad8c8ac86bc6f46a00bd7c50924fd35f8f7493a68a72e617fc5100
+MISC ChangeLog 5857 RMD160 d293273b5bc587a7d4cc1dc9814fd98688f53913 SHA1 113a4f445f8bdf2bb6e74a7099231efa17c55b52 SHA256 728d962a383880ce2dbda53ad5c75b22a2d9be64efd7caccf1e23fa401ddbdec
 MISC metadata.xml 286 RMD160 12882e7694c3c4e380056119fe840917e8e7b8db SHA1 072f7af8878782a0d06b23a554ad3241daad15b9 SHA256 6c1d998e5098e6d7a2d0df5b9f38fccc23a06b02e8d37a4f03f98b7c70da4fde
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPVhOWAAoJEOSiRoyO7jvo2/0QALNgwE/RPooGgzXyeJ06hY4g
+dSrNtV2lAO4tFsfIB7ysVdpuz6DBPGvF9UHq/32pC/8nko5cIEsY8vvYJIuRCjMK
+3GRcBm7mRvX+YXF02heJma/QCUnG28cKJlDB3/wqqZjqbsNC9xIa4MQuc4nPlAZh
+u1IIBbMN2cjNuNJYVGSvXk3HqN0SGKv2lYhK1EGBjNLzRBi4CzR64yxc9SwAPJUL
+bFASfBteogAWa+6xIjtCMYgd+OgRjedLSBiymqd0c8KyFZVqfhtdKdmfxnHdLFG+
+RGK9Rib1pZ+IUZDxSZ17SZMH8yI+Cus5s6BrwDYQ/Y1tTZxp0zniP/ugaI23G+je
+iD0qxi0CQZDYB6HrNMOZqmJVSXdzAsVGOWfilXeEASWlyjHhN0GHKgnybTUELvBc
+Z2UN9UbJHmBmds3UH3TnUa8VoFB/vUdhkOB5ZzoTtxm4SWeswahGOalUoduhudh8
+/ltfkwCyhQjKnlZoy/Pn2xmHXAjtWeMxAf68MA0hnXJaXiqFz7DttcJUTRwoDVHg
+/236BHDvygEXOTHNbL/YMwQC/tIBWie6jkkpjpCLcvaSOB4yi/f97Y5tuBCiZam2
+VlOhxel8U0prWDjMcuLwrFveeJsCq/OejTsL5YnI6GAvziSWmTExOp8RvllW/1Kr
+9wYVmEON0c7X71MHGIg3
+=7OM9
+-----END PGP SIGNATURE-----
diff --git a/dev-util/insight/insight-6.8.1.ebuild b/dev-util/insight/insight-6.8.1.ebuild
new file mode 100644
index 000000000000..37a7bf490dad
--- /dev/null
+++ b/dev-util/insight/insight-6.8.1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/insight/insight-6.8.1.ebuild,v 1.1 2012/03/06 13:39:07 scarabeus Exp $
+
+EAPI=4
+
+inherit eutils autotools versionator
+
+MY_P="${PN}-$(replace_version_separator 2 -)"
+
+DESCRIPTION="A graphical interface to the GNU debugger"
+HOMEPAGE="http://sourceware.org/insight/"
+SRC_URI="ftp://sources.redhat.com/pub/${PN}/releases/${MY_P}a.tar.bz2
+	http://dev.gentooexperimental.org/~scarabeus/${P}-patchset-01.tar.xz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="nls static-libs"
+
+RDEPEND="
+	dev-libs/expat
+	dev-tcltk/iwidgets
+	sys-libs/ncurses
+	sys-libs/readline
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+	dev-lang/tcl
+	dev-lang/tk
+	dev-tcltk/itcl
+	dev-tcltk/itk
+	sys-devel/bison
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	local location
+
+	EPATCH_FORCE="yes" \
+	EPATCH_SOURCE="${WORKDIR}/patches" \
+	EPATCH_SUFFIX="patch" \
+	epatch
+
+	# remove bundled stuff
+	rm -rf "${S}"/{itcl,tcl,tk,readline} || die
+
+	for location in gdb/gdbtk/plugins libgui; do
+		pushd ${location} > /dev/null
+		eautoreconf
+		popd > /dev/null
+	done
+
+	cd gdb
+	eautoconf
+
+	sed -i \
+		-e 's:tk.h:tkInt.h:g' \
+		-e 's:ITCL_BUILD_LIB_SPEC:ITCL_LIB_SPEC:g' \
+		-e 's:ITK_BUILD_LIB_SPEC:ITK_LIB_SPEC:g' \
+		"${S}/gdb/configure" || die
+}
+
+src_configure() {
+	export ac_cv_c_itclh="${EPREFIX}/usr/include/"
+	export ac_cv_c_itkh="${EPREFIX}/usr/include/"
+
+	. "${EPREFIX}/usr/$(get_libdir)/tclConfig.sh"
+	. "${EPREFIX}/usr/$(get_libdir)/tkConfig.sh"
+	. "${EPREFIX}/usr/$(get_libdir)/itclConfig.sh"
+
+
+	# there will be warning about undefined options
+	# because it is passed only to some subdir configures
+	econf \
+		$(use_enable static-libs static) \
+		--with-system-readline \
+		--disable-rpath \
+		--disable-werror \
+		$(use_enable nls) \
+		--enable-gdbtk \
+		--enable-sim \
+		--with-expat \
+		--datadir=/usr/share \
+		--with-tclinclude="${TCL_SRC_DIR}" \
+		--with-tkinclude="${TK_SRC_DIR}"
+}
+
+src_install() {
+	# the tcl-related subdirs are not parallel safe
+	emake -j1 DESTDIR="${D}" install
+
+	use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
+
+	dodoc gdb/gdbtk/{README,TODO}
+
+	# scrub all the cruft we dont want
+	rm -f "${ED}"/usr/bin/{gdb,gdbtui,gdbserver} || die
+	rm -f "${ED}"/usr/$(get_libdir)/*.a || die
+	rm -f "${ED}"/usr/$(get_libdir)/*.sh || die
+	rm -rf "${ED}"/usr/include || die
+	rm -rf "${ED}"/usr/man || die
+	rm -rf "${ED}"/usr/share/{man,info,locale} || die
+
+	# regen pkgIndex.tcl
+	echo "pkg_mkIndex \"${ED}/usr/share/${PN}/gui\"" | tclsh
+}
diff --git a/dev-util/insight/insight-6.8.ebuild b/dev-util/insight/insight-6.8.ebuild
deleted file mode 100644
index c1b6f686b932..000000000000
--- a/dev-util/insight/insight-6.8.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/insight/insight-6.8.ebuild,v 1.1 2008/07/12 12:21:10 tester Exp $
-
-inherit eutils flag-o-matic
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
-	fi
-fi
-
-DESCRIPTION="A graphical interface to the GNU debugger"
-HOMEPAGE="http://sourceware.org/insight/"
-SRC_URI="ftp://sources.redhat.com/pub/${PN}/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2"
-[[ ${CTARGET} != ${CHOST} ]] \
-	&& SLOT="${CTARGET}" \
-	|| SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="nls"
-
-RDEPEND="sys-libs/ncurses
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-6.6-DESTDIR.patch
-	epatch "${FILESDIR}"/${PN}-6.6-burn-paths.patch
-
-	cd "${S}/tk"
-	epatch "${FILESDIR}"/tkImgGIF.patch
-}
-
-src_compile() {
-	append-flags -fno-strict-aliasing # tcl code sucks
-	strip-linguas -u bfd/po opcodes/po
-	econf \
-		--disable-werror \
-		$(use_enable nls) \
-		--enable-gdbtk \
-		--disable-tui \
-		--datadir=/usr/share/${PN} \
-		|| die
-	emake || die
-}
-
-src_install() {
-	# the tcl-related subdirs are not parallel safe
-	emake -j1 DESTDIR="${D}" install || die
-
-	# Don't install docs when building a cross-insight
-	if [[ ${CTARGET} == ${CHOST} ]] ; then
-		dodoc gdb/gdbtk/{README,TODO}
-	fi
-
-	# the gui tcl code does not consider any of the configure
-	# options given it ... instead, it requires the path to
-	# be /usr/share/redhat/...
-	mv "${D}"/usr/share/${PN}/redhat "${D}"/usr/share/ || die
-
-	# scrub all the cruft we dont want
-	local x
-	cd "${D}"/usr/bin
-	for x in * ; do
-		[[ ${x} != *insight ]] && rm -f ${x}
-	done
-	cd "${D}"
-	rm -rf usr/{include,man,share/{info,locale,man}}
-	rm -rf usr/lib*
-}