Stable for amd64/x86, remove old

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

4 files changed, 16 insertions, 95 deletions

diff --git a/www-client/xxxterm/ChangeLog b/www-client/xxxterm/ChangeLog
index ad84841811fa..7739c2591bb5 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.10 2012/05/13 18:56:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/xxxterm/ChangeLog,v 1.11 2012/06/05 11:08:09 ago Exp $
+
+  05 Jun 2012; Agostino Sarubbo <ago@gentoo.org> -xxxterm-1.1103.ebuild,
+  xxxterm-1.1103-r1.ebuild:
+  Stable for amd64/x86, remove old
 
   13 May 2012; Agostino Sarubbo <ago@gentoo.org> xxxterm-9999.ebuild:
   Port the last changes to 9999
diff --git a/www-client/xxxterm/Manifest b/www-client/xxxterm/Manifest
index 0eda37c4c62f..1a2d3b552636 100644
--- a/www-client/xxxterm/Manifest
+++ b/www-client/xxxterm/Manifest
@@ -2,19 +2,18 @@
 Hash: SHA512
 
 DIST xxxterm-1.11.3.tgz 223312 RMD160 69599e210224498de8f94dda43e3389111e7dadb SHA1 c9c191ce60e2351fdbb47eae190e933cbcdbd097 SHA256 766d2c1c0220887ad113998135a0497dfbb641bfe9d0f24bd8b9ce67fbc879a1
-EBUILD xxxterm-1.1103-r1.ebuild 2182 RMD160 131b5e40626ce88747d4b169d92d63a99d55f019 SHA1 8947c1f2e0685c1ec4a4208ecc1cb27f5cd538d8 SHA256 1f08979bd098ca088660fae92b29a9b4135e48e929b6c836be7d2d5bfdf38e6b
-EBUILD xxxterm-1.1103.ebuild 1907 RMD160 9345eb6388c50fc4dd11c0a7c53e6231340b477c SHA1 70e49ceb61fa8f4bab09067052da44a804df116b SHA256 caf2de7dd000973141b5f95ec5978680f5214f041b2f6092d18ad519d78237ac
+EBUILD xxxterm-1.1103-r1.ebuild 2180 RMD160 d96402d795ee6027dacce4b83b38e3bc278420be SHA1 6501c3fb6ef8e61f0b792383153830bf7cd05404 SHA256 87f07e7fdef4050c711041915a70920c7c84863c0df34e45a9e025db7916ee4a
 EBUILD xxxterm-9999.ebuild 2177 RMD160 4d5707e2087ce9e522e5146219514e2a089de37c SHA1 d107a5f7fca8f526ce9a232e4f9d41016c22b2cd SHA256 cb315b1d53d3ca42cef1dbf31eef671d71ca52fc9dabb34acafde0a2be702afd
-MISC ChangeLog 1727 RMD160 b23b05ff06b63221abfd74ba7893bfaf74834de5 SHA1 0e36fc6bf16dc3457de4bf5cb6416212594801ce SHA256 1fe0e5c8d57fb08dcb71625c2578733eabf99143e09bc4ce222bd589826fd59e
+MISC ChangeLog 1864 RMD160 0fe150ffd3bac6be779cb61c1ea2445a9d71c570 SHA1 f13291ca4be55934e93f0390d71f2da33cc7572a SHA256 28f3d2ba70a075410ca6d10c33b3a12a6d95cec1bc9256c1ac1d0346c0fda742
 MISC metadata.xml 861 RMD160 526567a64e01ed435d45e8be0c926d38df136b0b SHA1 61ba9af5a098894ae913590c0c85aeb7f4ff563a SHA256 2a3bda724ac94442852310edeff192b63eb3a656d8b36781960aeae960987167
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPsAPMAAoJEOTDgjZ80txdyfoH/RNVp9I3fnhkK1CyYrRT53Dv
-2iatdxVjaR4R9CU8gzSS8Fd3UHOEaFWGq+KNbVCqhO4OXAfuTYkE4Q2+9Agp15Al
-DRgf7bFRWp6W4d7Qzs6/7hEi8c/ORixqMHwTVz0L14e/u9R6w0G1BZ7x+EpqiE37
-ldfgsPKh7qk+byfVSR9UPzxa3ZLCWZyzaR/ICHJqcF68+TGFEhUob//Yenmw3GSp
-06Zb4v5dO79bC00VSzBra7ttB4swJ8sbFivqhd8MUFptUyhbJCVT48zRkdGK2vRN
-ft9g4R5WZ99ToMylzKGMCURFhJLFMqlxZ4m0ILx66Uh6en4SPL9U9PLVGyfNYdA=
-=8Sgb
+iQEcBAEBCgAGBQJPzeieAAoJEOTDgjZ80txda3gH/35xtYpsieyTz0VHR+vJ4w4C
+7xtcxW8R0IiaHo4+yncGj5CrwkpkubhFyQFaOSkFvMfyEjdKZcOmuExyj1j5XmjE
+fwTTbOKgQAMgYQTlH6L2JhO8CJekOhnaCXWYx0hZFjUkJciGNzMjFriRhCvM1Z63
+7KyrHvh8HP8+tZW+ou3B09jGZOz2LqXfDpubfSy2nod1cGebOIn24YhCpjn9bToR
+VNATB5ZaU3+Oyrxk8uxJq5dumMCygxrrMeBPFYosc7FKBfBOj5Ugt9FaR7Gk4HRV
+5AFqaoZwqG3d0RscyYWXTeGQUiALqXJbAeCowv2BvWcU9XYrKaGo5Hl4BW+9Tho=
+=K4BH
 -----END PGP SIGNATURE-----
diff --git a/www-client/xxxterm/xxxterm-1.1103-r1.ebuild b/www-client/xxxterm/xxxterm-1.1103-r1.ebuild
index 5224eeaf3c12..b852e947a550 100644
--- a/www-client/xxxterm/xxxterm-1.1103-r1.ebuild
+++ b/www-client/xxxterm/xxxterm-1.1103-r1.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-r1.ebuild,v 1.1 2012/05/13 17:42:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/xxxterm/xxxterm-1.1103-r1.ebuild,v 1.2 2012/06/05 11:08:09 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.1103.ebuild b/www-client/xxxterm/xxxterm-1.1103.ebuild
deleted file mode 100644
index 1a148224bdec..000000000000
--- a/www-client/xxxterm/xxxterm-1.1103.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# 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.3 2012/04/29 19:57:50 ago 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"
-
-MY_P="${PN}-${PV/0/.}"
-
-KEYWORDS=""
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://opensource.conformal.com/xxxterm.git
-		https://opensource.conformal.com/git/xxxterm.git"
-	EGIT_SOURCEDIR="${WORKDIR}/${MY_P}"
-else
-	SRC_URI="http://opensource.conformal.com/snapshots/${PN}/${MY_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}/${MY_P}/linux"
-
-src_prepare() {
-	sed -i \
-		-e 's/-O2//' \
-		-e 's/-ggdb3//' \
-		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
-}