Version bump. Fixes bugs #380375 #380377 #381165, thanks to Agostino Sarubbo. Added a live ebuild.

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

4 files changed, 124 insertions, 23 deletions

diff --git a/www-client/xxxterm/ChangeLog b/www-client/xxxterm/ChangeLog
index dbd8561e3042..5e0087301eef 100644
--- a/www-client/xxxterm/ChangeLog
+++ b/www-client/xxxterm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-client/xxxterm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/xxxterm/ChangeLog,v 1.1 2011/07/23 02:37:01 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/xxxterm/ChangeLog,v 1.2 2011/09/19 00:26:07 rafaelmartins Exp $
+
+*xxxterm-9999 (19 Sep 2011)
+*xxxterm-1.518 (19 Sep 2011)
+
+  19 Sep 2011; Rafael G. Martins <rafaelmartins@gentoo.org>
+  -xxxterm-1.425.ebuild, +xxxterm-1.518.ebuild, +xxxterm-9999.ebuild:
+  Version bump. Fixes bugs #380375 #380377 #381165, thanks to Agostino Sarubbo.
+  Added a live ebuild.
 
 *xxxterm-1.425 (23 Jul 2011)
 
diff --git a/www-client/xxxterm/Manifest b/www-client/xxxterm/Manifest
index 33f60509ba0a..aa5e12d70982 100644
--- a/www-client/xxxterm/Manifest
+++ b/www-client/xxxterm/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST xxxterm-1.425.tgz 150138 RMD160 019203d74a35c99f70c1720d8a7157b80bb0597d SHA1 7286bb29b9a37b643cc411ec6d1669286214a45f SHA256 07aeb9a93c0f46e2022bbbff2c62a68e0937a0ffd4a358f0121551ae84bbd72b
-EBUILD xxxterm-1.425.ebuild 1483 RMD160 23a0026893420862233d0d34ed4ad4f292fed989 SHA1 d71e5dba40ddb5f2385f98443d8330730c28e60e SHA256 9464d61ac45a6595ca3b8d23961f766fa619522902fed31a5906f46875ce45a5
-MISC ChangeLog 365 RMD160 c070def40a47885ffb0a814b3f675d8a06efd82d SHA1 1ef098419c028e78468b50d197de17359da317f1 SHA256 4ce815a695bf37f5de6b9d4e539be3d1ff8497508bfa65d3e3ba3a47fcdd7e6d
+DIST xxxterm-1.518.tgz 158514 RMD160 1ad014c99ba5e932727f9f45795add34b09a8450 SHA1 42259d45a76c8a6e1039b61428a5e46264ee82c8 SHA256 c7b3e89c91cfe4aec21573c3810dc6b6882360fde7ef7061c2cc3d1a6c222084
+EBUILD xxxterm-1.518.ebuild 1867 RMD160 43d522193a909ddbf64a6de57079b4de2ab7ebec SHA1 ab2b15f1859c859f1a567aa8069ea0a708767cdf SHA256 2e46b55fd99f3b37d350e12547960e663cca866013a10b71fbe0bd862b78c5d1
+EBUILD xxxterm-9999.ebuild 1866 RMD160 1b9abf669bbec290a8caa77d240b2654e56193d9 SHA1 aa1d7680e53ef33f1abd8030540b6d2592c2fb9d SHA256 2edd0968f009252c3a5f228ca1f20e0db0058e6f2484a65b20f2a4bda2a481c4
+MISC ChangeLog 657 RMD160 1dafeff968aea72b473526bf8a31a16573f6914a SHA1 4cefc35fa83c3b404e2406a310c6e1cc66f226cd SHA256 23dcd2640c417451582dafc53a96152ced895c05cdcfdfb06868fd024dfa41bb
 MISC metadata.xml 884 RMD160 345cef0e4af20d027db2daf1f1aeb68fe4f35c92 SHA1 9761fa98eee4edfb52159af18d9f470d3ee2191f SHA256 e4a3d26fdf22b7866b41193faadeb4a2427623f560add1a5f2e22cc1e594fb1e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOKjPgAAoJEMmH5mwCk1NvNQ4H/jQDJrwpdokGbMQIjrlpCAVe
-WSg8mAzusaDfZBVLjhzpVM44nBwolbKgDTRenz3NBfav/rp4AZLcVpLRkruppiTW
-7pts9qPop/JQzILaKZ9IdEk9mBnNmjEGCQbzuFFusA0rk5I26j1L+ZsxDND/Mhob
-vmMAb7OgiZrqU5S/i0EPU5AOAFyVqNFs9NqlDJkMBfNaZ4JKWcB1fmJAY76KjOBO
-37Qg/mG76pRPDIw/IRJLHSnamHugvhN4R65S2dmrjKFGueDBTVSeTtrm26Tu8QvG
-i6RuSf29sHp87gcZAZDIV6k13R4qupF4OrNCxAWbw/WAdqOyBB3erX27qiXuwUQ=
-=CWwu
+iQEcBAEBAgAGBQJOdowlAAoJEMmH5mwCk1NvDI8IAICMM6fvJ/uap0SKWZe1ljC7
+k08SDACAbJM+nNzwW+5U/Z+kVzUuS4+yVFxKiQF2wUeQ0O5RniM48Fsw5eDTtBGC
+LF3qOkUgadQHPwvTF7wL4xJgrJqAMIkGKshH2jInyE+IA65rAsIZposi6/+ADcnT
+8cAJtDUYp1MMAMOmBSEuGdkmInh/ICZH5XA6jz0HSL+qGPWH0kWHKKpcjogsaQp3
+GGwJ2mYmLJJv2AlNvsD4fl5K+H8LS28tyWCrkExwy27CG69WV9AF6qNu/AZXs2ra
+QSM/DTGPUP8dZV5uo9OAuJQxRqoNppCjI6iTtKL49EUA+sx1KM9WnGUs2+Oz6+c=
+=mtbO
 -----END PGP SIGNATURE-----
diff --git a/www-client/xxxterm/xxxterm-1.425.ebuild b/www-client/xxxterm/xxxterm-1.518.ebuild
index 556fae462e3c..c66a3d538e6d 100644
--- a/www-client/xxxterm/xxxterm-1.425.ebuild
+++ b/www-client/xxxterm/xxxterm-1.518.ebuild
@@ -1,18 +1,31 @@
 # 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.425.ebuild,v 1.1 2011/07/23 02:37:01 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/xxxterm/xxxterm-1.518.ebuild,v 1.1 2011/09/19 00:26:07 rafaelmartins Exp $
 
 EAPI="4"
 
-inherit eutils fdo-mime toolchain-funcs
+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"
-SRC_URI="http://opensource.conformal.com/snapshots/${PN}/${P}.tgz"
+
+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"
-KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="x11-libs/gtk+
@@ -38,21 +51,21 @@ src_prepare() {
 }
 
 src_compile() {
-	emake \
-		CC="$(tc-getCC)"
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
+	CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDADD="${LDFLAGS}" emake
 }
 
 src_install() {
-	einstall \
+	emake \
 		DESTDIR="${D}" \
-		PREFIX=/usr
+		PREFIX=/usr install
 
-	insinto /usr/share/${PN}
+	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() {
diff --git a/www-client/xxxterm/xxxterm-9999.ebuild b/www-client/xxxterm/xxxterm-9999.ebuild
new file mode 100644
index 000000000000..c3afa3474b8f
--- /dev/null
+++ b/www-client/xxxterm/xxxterm-9999.ebuild
@@ -0,0 +1,79 @@
+# 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-9999.ebuild,v 1.1 2011/09/19 00:26:07 rafaelmartins 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+
+	net-libs/webkit-gtk
+	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
+}