Version bump to 1.6.1, EAPI 5, wrt bug #475890

Package-Manager: portage-2.1.12.11/cvs/Linux x86_64
Manifest-Sign-Key: 0x7194459F

4 files changed, 129 insertions, 8 deletions

diff --git a/www-client/xombrero/ChangeLog b/www-client/xombrero/ChangeLog
index 52e58078e755..984adcf90fc6 100644
--- a/www-client/xombrero/ChangeLog
+++ b/www-client/xombrero/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/xombrero
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/xombrero/ChangeLog,v 1.2 2013/01/31 03:25:16 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/xombrero/ChangeLog,v 1.3 2013/07/05 22:20:33 ago Exp $
+
+*xombrero-1.6.1 (05 Jul 2013)
+
+  05 Jul 2013; Agostino Sarubbo <ago@gentoo.org> +xombrero-1.6.1.ebuild,
+  xombrero-9999.ebuild:
+  Version bump to 1.6.1, EAPI 5, wrt bug #475890
 
   31 Jan 2013; Rafael G. Martins <rafaelmartins@gentoo.org>
   xombrero-1.4.0.ebuild:
@@ -12,4 +18,3 @@
   31 Jan 2013; Rafael G. Martins <rafaelmartins@gentoo.org>
   +xombrero-1.4.0.ebuild, +xombrero-9999.ebuild, +metadata.xml:
   Initial import. Renamed from www-client/xxxterm
-
diff --git a/www-client/xombrero/Manifest b/www-client/xombrero/Manifest
index f9835cd9942e..89eb10a504a3 100644
--- a/www-client/xombrero/Manifest
+++ b/www-client/xombrero/Manifest
@@ -1,5 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST xombrero-1.4.0.tgz 288503 SHA256 4ad3f1b2f3c31849c257fb412a4bb61c10d35f07a1ddc0b90af29c94c8fc8f65 SHA512 ba9e9cb953324fa97c0e05b9870e0ffdd0170fff2a6eca1a2e15191d288b47195f2cb5a20e98b74d6711a511e68b7cb5e64f05433aa9a4c278fe3b2e3a44bc12 WHIRLPOOL feea56a7656f07029bb6aaae923f58425d8fb3be1b63fba442c1d3de356a04c106b32140a0492586d224ac6f0849888b12b2ee8317f766c38f57fca383eb71b8
+DIST xombrero-1.6.1.tgz 290004 SHA256 28e4de85266d67bfca0e91b44ad442ea3fd51157e6a627935d2ff8abb8111777 SHA512 543d5889455732f10c62290e8828d61b76870d13ce20e65cd55e96dfde0958a246537bc952f7b24c81a96fd432d32ea3518957feff1d118541bffcd92b6306dd WHIRLPOOL 4ca7ba3ef0dc68affd8cc53a1767e0c6cba3c16d80a3fcc6fa36321691ed5036937400c9f9935422d6cc18872bb7094f66ac9c43c11f7d0e16e07081d32e2c3f
 EBUILD xombrero-1.4.0.ebuild 2157 SHA256 7ad1e02c8e7254e05d1dd7c78c4fdc1cb17b406fadf06933a94b472de3ed63ac SHA512 24df9d9f5a7680b54486da80c3c87376034f304e4b80b03fea2f500809580119e1fd1a305768881c2de3220e737f5ce5d43293f59551071ffab7b40629bed239 WHIRLPOOL 17f31c3c3fc4895fc3297cbf65907bfcbb12fd9da24852757c052015af766be770acedb3d42bf0a147556e28d0879ad52ad6c4c8e6812f99a9be3cd66cb21663
-EBUILD xombrero-9999.ebuild 2057 SHA256 83e0237f3f3c5b2df981d2d0d48a2fa8d9960b9a33b6f761212940effb53b84d SHA512 3ef93b9b5e9871eb48fd805c676974c76b57198b338940ca3fff6ffa6573f1097612683f9593407f98c37bdc48e6b1fa543bc3eb8f00a24bbc32a7717661d3e4 WHIRLPOOL fadd63ff520d05a809b54980d6aa1b9a82df7be50c75cf33499a0f80b8de76c8f56fac1c86fee787f08d8b2e920b7b176ff319c4eb6484036aaedd4a05d3e130
-MISC ChangeLog 575 SHA256 77626714615d70516054fc6c34a9a27d2bb9133b87f06964d4e3359822396721 SHA512 359be79d28be15005497402587c2803ce5633c9359c78f7530ea034d37099f509ac755704f1bd7487e55baa2279506e1384e4bdb13532756c39e49dfb2e7d6fc WHIRLPOOL 294e4cb40a9a7829cbb9952440f1bfebc38e6cb20b9c4cd91937ac992276e158a97da0b7b6613ebfcbc7e0653f8f57415cca70ea87386816468ff468f06a6b93
+EBUILD xombrero-1.6.1.ebuild 2136 SHA256 4b6ae2ef18f129d7f653178ccc2100ff829917234fd64f8bd3841bff03954449 SHA512 094457e04b702cf5b25f97722bca4559167a1bcbf9c65f804c4191db6c3b8df30890e7fce7226c1fe4d43130af485e8c65f06f6932e6c0fcf47342c983403621 WHIRLPOOL 06a5071b9db1f9a697cb695419d07db24b630269c7f7fae41ecd4b38fb5ee3b44134f505a12182372e0a06cc28ade53ae63201ac4ed51f6f02251bfc7b7b2151
+EBUILD xombrero-9999.ebuild 2036 SHA256 c1793b4a9d52a3428f68e9ababacf93b92654c4d0623b6530363bd101393b715 SHA512 33ede8c5305675eb1679a4d106a71b68c776416a367e821c02d17d18b2afc7008d2c770c2b0772a061caa9c2009cfef1bc45032ca5952847520b71891de89371 WHIRLPOOL c083b1e27138eab1887856201842d62fb5d415fd33f669bd12ed9baa9bbddf64463b222b51a07e92e5d67d2387ffd075b09c08ce7c56b7504428a6bb6dde3ffc
+MISC ChangeLog 742 SHA256 242be3b3d8ee883d13db9f590eb948c707a51f2fabbcc8ec0c75bd43ab7d2115 SHA512 d45dd92dffa0bf7e6c57a54ee27c23444142a9bab2c615741b56c6f9531dea7e20ebf3bc909f5ee56719c55eb8736dc38a7cb83c0cd720825cf71f124ee3de4f WHIRLPOOL 4f5e3053f06b329deeeb1e797abd71afe1d67eb629aa6a4726d9ed68be5f4286189b2b81f31a877b01b3e3a49ace2d933c90ce2be1c43dc74ee1951e0b2307e1
 MISC metadata.xml 250 SHA256 dccf670f9a1d657bef4c5ec67d185a04aef67852d8970f840ebf95999b7fae2b SHA512 f9a705b4bfad1d63760fad96dc46b65a9c1fe5e083e090f32a48eeee8a20b04650c1925e6300e34f100d4499e635fd2511e99e3a116458d58bfe429c66117c4a WHIRLPOOL 7a38296d0e010e41d20f2d9489b6773060a9f654d8fbd72c554492482490fb45c81e2b0d750c4dcdec45db3b2de4e67fc35605418241b2ef16edd33824ef931a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iQIcBAEBCgAGBQJR10avAAoJELp701BxlEWf6V4P/3QOun8KbzLBu5HJ1Nro9t2a
+XloywiWDVnzsCV17u9BI+vs7y8Bcm8Y3zS/48r18163+HoUnrXPhDGqhCZ6flJz8
+ZkH5lQS8vFEKJRR/tKH+mjVPrDUmtm59uTkvSSV+P+6k5yXYKrVnpqiSfgsphwFZ
+6NqBCd7pz4d92gf5v1Dqys+A8h8SriUKUmYzUnMZAipbWQXXEeBMNsmDmSpbxKv2
+jZyb9J2XTmp/dsvGccnWK4Uotj2JDMnYUJ4EYFsfmM1B/aAjohogzBbhBorDRXYV
+DolwEWr4insaOt8qkbtBH6qepbYaADd71J+2CZD6R6wE57d7vBadZ0bfLikcsxb+
+3uW1kWZr+IsSw38GOvr9Q0Hx1FiIhvqO7i5F8fpzEcLK/85brer/UAsBi0Pqv88z
+a4ZJXlLWb2Ue9SvOGgqsHequv4yLrom0SeK7hy+LmMIdfpRRE9ER0PlcQjjaE34R
+evoTuldsgfVh1Vr2Al7rC4NDA/HUwSkH4dzdUw60BZ3S8s/8kFLeIJVBqmJIfNZm
+IwaXmCXJN+GsAZCfU1awjBpveJmu0ZtiM7Wj51qT6Wa06q6QzMgBKEV8Rzc/47HA
+tevKUw2+HJAvxdnyo1cwiGQkKiyyc6bsFIyKNkSlMRBsPuTEyJjT706lyUl1IkvK
+wpWOaUxxAd1FXxTR62sq
+=Em4h
+-----END PGP SIGNATURE-----
diff --git a/www-client/xombrero/xombrero-1.6.1.ebuild b/www-client/xombrero/xombrero-1.6.1.ebuild
new file mode 100644
index 000000000000..2b398d5964fe
--- /dev/null
+++ b/www-client/xombrero/xombrero-1.6.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/xombrero/xombrero-1.6.1.ebuild,v 1.1 2013/07/05 22:20:33 ago Exp $
+
+EAPI="5"
+
+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/xombrero"
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://opensource.conformal.com/${PN}.git
+		https://opensource.conformal.com/git/${PN}.git"
+	EGIT_SOURCEDIR="${WORKDIR}/${P}"
+	KEYWORDS=""
+else
+	SRC_URI="http://opensource.conformal.com/snapshots/${PN}/${P}.tgz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="examples"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/libbsd
+	dev-libs/libgcrypt
+	net-libs/libsoup
+	net-libs/gnutls
+	net-libs/webkit-gtk:3
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/pango"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	sys-apps/groff
+	dev-libs/atk
+	dev-libs/libxml2
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/libpng:0
+	x11-libs/cairo
+	x11-libs/libdrm
+	x11-libs/pixman"
+
+S="${WORKDIR}/${P}/linux"
+
+src_prepare() {
+	sed -i \
+		-e 's/-O2//' \
+		-e 's/-ggdb3//' \
+		-e 's,install: all,install: all\n\tinstall -m 755 -d $(DESTDIR)$(PREFIX)/share/applications,g' \
+		Makefile || die 'sed Makefile failed.'
+	sed -i \
+		-e 's#https://www\.cyphertite\.com#http://www.gentoo.org/#' \
+		-e "s#/usr/local#/usr#" \
+		../xombrero.h || die 'sed ../xombrero.c failed.'
+	sed -i \
+		"s#Icon=#Icon=/usr/share/${PN}/#" \
+		../xombrero.desktop || die 'sed ../xombrero.desktop failed.'
+}
+
+src_compile() {
+	CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDADD="${LDFLAGS}" emake
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX=/usr \
+		install
+
+	if use examples;then
+		insinto "/usr/share/doc/${PF}/examples"
+		doins \
+			../${PN}.conf \
+			../playflash.sh \
+			../favorites
+	fi
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/www-client/xombrero/xombrero-9999.ebuild b/www-client/xombrero/xombrero-9999.ebuild
index 2b0795716098..7cc4b234a1be 100644
--- a/www-client/xombrero/xombrero-9999.ebuild
+++ b/www-client/xombrero/xombrero-9999.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/xombrero/xombrero-9999.ebuild,v 1.1 2013/01/31 00:25:39 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/xombrero/xombrero-9999.ebuild,v 1.2 2013/07/05 22:20:32 ago Exp $
 
-EAPI="4"
+EAPI="5"
 
-GIT_ECLASS=
 if [[ ${PV} = *9999* ]]; then
 	GIT_ECLASS=git-2
 fi
@@ -14,11 +13,11 @@ 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/xombrero"
 
-KEYWORDS=""
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="git://opensource.conformal.com/${PN}.git
 		https://opensource.conformal.com/git/${PN}.git"
 	EGIT_SOURCEDIR="${WORKDIR}/${P}"
+	KEYWORDS=""
 else
 	SRC_URI="http://opensource.conformal.com/snapshots/${PN}/${P}.tgz"
 	KEYWORDS="~amd64 ~x86"