Stable for x86/amd64 , wrt bug #412483. Remove old.

(Portage version: 2.1.10.49/cvs/Linux i686)

3 files changed, 7 insertions, 82 deletions

diff --git a/www-client/xxxterm/ChangeLog b/www-client/xxxterm/ChangeLog
index 4e9d91e69252..b7147b1feddd 100644
--- a/www-client/xxxterm/ChangeLog
+++ b/www-client/xxxterm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/xxxterm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/xxxterm/ChangeLog,v 1.7 2012/04/29 18:02:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/xxxterm/ChangeLog,v 1.8 2012/04/29 19:57:50 ago Exp $
+
+  29 Apr 2012; Agostino Sarubbo <ago@gentoo.org> -xxxterm-1.518.ebuild,
+  xxxterm-1.1103.ebuild:
+  Stable for x86/amd64 , wrt bug #412483. Remove old.
 
   29 Apr 2012; Agostino Sarubbo <ago@gentoo.org> xxxterm-1.1103.ebuild:
   Drop extra CFLAGS
diff --git a/www-client/xxxterm/xxxterm-1.1103.ebuild b/www-client/xxxterm/xxxterm-1.1103.ebuild
index fb5f4949b205..1a148224bdec 100644
--- a/www-client/xxxterm/xxxterm-1.1103.ebuild
+++ b/www-client/xxxterm/xxxterm-1.1103.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/xxxterm/xxxterm-1.1103.ebuild,v 1.2 2012/04/29 18:02:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/xxxterm/xxxterm-1.1103.ebuild,v 1.3 2012/04/29 19:57:50 ago Exp $
 
 EAPI="4"
 
@@ -23,7 +23,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_SOURCEDIR="${WORKDIR}/${MY_P}"
 else
 	SRC_URI="http://opensource.conformal.com/snapshots/${PN}/${MY_P}.tgz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="ISC"
diff --git a/www-client/xxxterm/xxxterm-1.518.ebuild b/www-client/xxxterm/xxxterm-1.518.ebuild
deleted file mode 100644
index 827f74758241..000000000000
--- a/www-client/xxxterm/xxxterm-1.518.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/xxxterm/xxxterm-1.518.ebuild,v 1.4 2011/10/24 20:22:05 maekke Exp $
-
-EAPI="4"
-
-GIT_ECLASS=
-if [[ ${PV} = *9999* ]]; then
-	GIT_ECLASS=git-2
-fi
-
-inherit eutils fdo-mime toolchain-funcs ${GIT_ECLASS}
-
-DESCRIPTION="A minimalist web browser with sophisticated security features designed-in"
-HOMEPAGE="http://opensource.conformal.com/wiki/xxxterm"
-
-KEYWORDS=""
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://opensource.conformal.com/xxxterm.git
-		https://opensource.conformal.com/git/xxxterm.git"
-	EGIT_SOURCEDIR="${WORKDIR}/${P}"
-else
-	SRC_URI="http://opensource.conformal.com/snapshots/${PN}/${P}.tgz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="ISC"
-SLOT="0"
-IUSE=""
-
-DEPEND="x11-libs/gtk+:2
-	net-libs/webkit-gtk:2
-	net-libs/libsoup
-	net-libs/gnutls
-	dev-libs/libbsd"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P}/linux"
-
-src_prepare() {
-	sed -i \
-		's/-Wall -ggdb //' \
-		Makefile || die 'sed Makefile failed.'
-	sed -i \
-		-e 's#https://www\.cyphertite\.com#http://www.gentoo.org/#' \
-		-e "s#/usr/local#/usr#" \
-		../xxxterm.c || die 'sed ../xxxterm.c failed.'
-	sed -i \
-		"s#Icon=#Icon=/usr/share/${PN}/#" \
-		../xxxterm.desktop || die 'sed ../xxxterm.desktop failed.'
-}
-
-src_compile() {
-	CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDADD="${LDFLAGS}" emake
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX=/usr install
-
-	insinto "/usr/share/${PN}"
-	doins ../*.png ../style.css
-	insinto /usr/share/applications
-	doins ../xxxterm.desktop
-	insinto "/usr/share/doc/${PF}/examples"
-	doins ../xxxterm.conf ../playflash.sh ../favorites
-	doman ../xxxterm.1
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}