Restore ~arm since slang-2 is keyworded. Remove unused.

(Portage version: 2.1.5.2)

4 files changed, 7 insertions, 142 deletions

diff --git a/dev-libs/newt/ChangeLog b/dev-libs/newt/ChangeLog
index ba07f0adcd05..b3e22256a57c 100644
--- a/dev-libs/newt/ChangeLog
+++ b/dev-libs/newt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/newt
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/ChangeLog,v 1.42 2008/03/17 15:40:30 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/ChangeLog,v 1.43 2008/05/29 15:44:59 drac Exp $
+
+  29 May 2008; Samuli Suominen <drac@gentoo.org> -newt-0.51.6-r2.ebuild,
+  -newt-0.52.7.ebuild, newt-0.52.8.ebuild:
+  Restore ~arm since slang-2 is keyworded. Remove unused.
 
   17 Mar 2008; Christian Zoffoli <xmerlin@gentoo.org> +newt-0.52.8.ebuild:
   Version bump, fixes also bug #206302. Removed arm arch, I'll re-add it when slang-2.x will have it.
diff --git a/dev-libs/newt/newt-0.51.6-r2.ebuild b/dev-libs/newt/newt-0.51.6-r2.ebuild
deleted file mode 100644
index f5bc7a252e59..000000000000
--- a/dev-libs/newt/newt-0.51.6-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/newt-0.51.6-r2.ebuild,v 1.5 2008/03/03 09:11:33 xmerlin Exp $
-
-inherit python toolchain-funcs eutils flag-o-matic
-
-DESCRIPTION="Redhat's Newt windowing toolkit development files"
-HOMEPAGE="http://www.redhat.com/"
-SRC_URI="mirror://gentoo/${P}.tar.gz
-	http://dev.gentoo.org/~xmerlin/misc/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gpm"
-
-DEPEND="=sys-libs/slang-1*
-	>=dev-libs/popt-1.6
-	dev-lang/python
-	elibc_uclibc? ( sys-libs/ncurses )
-	gpm? ( sys-libs/gpm )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/newt-gpm-fix.diff || die
-	epatch "${FILESDIR}"/newt-0.51.4-fix-wstrlen-for-non-utf8-strings.patch || die
-	epatch "${FILESDIR}"/${P}-newttextbox-memoryleak.patch || die
-	epatch "${FILESDIR}"/${P}-assorted-fixes.patch || die
-	epatch "${FILESDIR}"/${P}-do-not-ignore-EARLY-events-in-listbox--and-allow-textbox-to-take-focus.patch || die
-
-	# bug 73850
-	if use elibc_uclibc; then
-		sed -i -e 's:-lslang:-lslang -lncurses:g' "${S}"/Makefile.in
-	fi
-
-	# use the correct compiler...
-	sed -i \
-		-e 's:gcc:$(CC):g' \
-		-e "s:\(libdir =\).*:\1 \$(prefix)/$(get_libdir):g" \
-		"${S}"/Makefile.in || die "sed failed"
-
-	# avoid make cleaning up some intermediate files
-	# as it would rebuild them during install :-(
-	echo >>"${S}"/Makefile.in
-	echo '$(LIBNEWT): $(LIBOBJS)' >>"${S}"/Makefile.in
-}
-
-src_compile() {
-	python_version
-
-	econf \
-		$(use_with gpm gpm-support) \
-		|| die
-
-	# not parallel safe
-	emake -j1 PYTHONVERS="python${PYVER}" RPM_OPT_FLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "make failure"
-}
-
-src_install () {
-	python_version
-	# the RPM_OPT_FLAGS="ERROR" is there to catch a build error
-	# if it fails, that means something in src_compile() didn't build properly
-	# not parallel safe
-	emake -j1 prefix="${D}/usr" PYTHONVERS="python${PYVER}" RPM_OPT_FLAGS="ERROR" install || die "make install failed"
-	dodoc CHANGES peanuts.py popcorn.py tutorial.sgml
-	dosym libnewt.so.${PV} /usr/$(get_libdir)/libnewt.so.0.51
-}
diff --git a/dev-libs/newt/newt-0.52.7.ebuild b/dev-libs/newt/newt-0.52.7.ebuild
deleted file mode 100644
index 1a6346faba5a..000000000000
--- a/dev-libs/newt/newt-0.52.7.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/newt-0.52.7.ebuild,v 1.6 2008/03/03 09:11:33 xmerlin Exp $
-
-inherit python toolchain-funcs eutils rpm
-
-DESCRIPTION="Redhat's Newt windowing toolkit development files"
-HOMEPAGE="http://www.redhat.com/"
-SRC_URI="mirror://gentoo/${P}.tar.gz
-	http://dev.gentoo.org/~xmerlin/misc/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gpm tcl"
-
-RDEPEND=">=sys-libs/slang-1.4
-	>=dev-libs/popt-1.6
-	dev-lang/python
-	elibc_uclibc? ( sys-libs/ncurses )
-	gpm? ( sys-libs/gpm )
-	tcl? ( =dev-lang/tcl-8.4* )"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	rpm_src_unpack
-	cd "${S}"
-
-	if ! use tcl; then
-		epatch "${FILESDIR}"/${P}-notcl.patch || die
-	fi
-
-	# bug 73850
-	if use elibc_uclibc; then
-		sed -i -e 's:-lslang:-lslang -lncurses:g' "${S}"/Makefile.in
-	fi
-
-	sed -i -e 's:instroot:DESTDIR:g' "${S}"/Makefile.in || die
-}
-
-src_compile() {
-	python_version
-
-	econf \
-		$(use_with gpm gpm-support)
-
-	# not parallel safe
-	emake \
-		CC="$(tc-getCC)" \
-		PYTHONVERS="python${PYVER}" \
-		RPM_OPT_FLAGS="${CFLAGS}" \
-		|| die "emake failed"
-}
-
-src_install () {
-	python_version
-	# the RPM_OPT_FLAGS="ERROR" is there to catch a build error
-	# if it fails, that means something in src_compile() didn't build properly
-	# not parallel safe
-	emake \
-		DESTDIR="${D}" \
-		prefix="/usr" \
-		libdir="/usr/$(get_libdir)" \
-		PYTHONVERS="python${PYVER}" \
-		RPM_OPT_FLAGS="ERROR" \
-		install || die "make install failed"
-	dodoc peanuts.py popcorn.py tutorial.sgml
-	doman whiptail.1
-
-}
diff --git a/dev-libs/newt/newt-0.52.8.ebuild b/dev-libs/newt/newt-0.52.8.ebuild
index bb62e7a12725..b9379ffbfd0a 100644
--- a/dev-libs/newt/newt-0.52.8.ebuild
+++ b/dev-libs/newt/newt-0.52.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/newt-0.52.8.ebuild,v 1.1 2008/03/17 15:40:30 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/newt-0.52.8.ebuild,v 1.2 2008/05/29 15:44:59 drac Exp $
 
 inherit python toolchain-funcs eutils rpm
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="gpm tcl nls"
 
 RDEPEND="=sys-libs/slang-2*