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

(Portage version: 2.2.0_alpha51_p7/cvs/Linux x86_64)

3 files changed, 112 insertions, 12 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/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
+}