Port the last changes to 9999

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

3 files changed, 49 insertions, 24 deletions

diff --git a/www-client/xxxterm/ChangeLog b/www-client/xxxterm/ChangeLog
index 5cf6ce11933a..ad84841811fa 100644
--- a/www-client/xxxterm/ChangeLog
+++ b/www-client/xxxterm/ChangeLog
@@ -1,6 +1,9 @@
 # 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.9 2012/05/13 17:42:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/xxxterm/ChangeLog,v 1.10 2012/05/13 18:56:08 ago Exp $
+
+  13 May 2012; Agostino Sarubbo <ago@gentoo.org> xxxterm-9999.ebuild:
+  Port the last changes to 9999
 
 *xxxterm-1.1103-r1 (13 May 2012)
 
diff --git a/www-client/xxxterm/Manifest b/www-client/xxxterm/Manifest
index 0f47933a20af..0eda37c4c62f 100644
--- a/www-client/xxxterm/Manifest
+++ b/www-client/xxxterm/Manifest
@@ -4,17 +4,17 @@ 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-9999.ebuild 1903 RMD160 cfd2c82c503568f0a8dbc275145677604b5e52f7 SHA1 e413c15cb2ffbc78854cbeeaf15350ccdab9f275 SHA256 94b3ff585e24c0b066dd99abb672788213684ee3a9cede85170a2d2de1ba8ef7
-MISC ChangeLog 1623 RMD160 947b0c30a8dda8dd0361d5949aadc50315713209 SHA1 1270c0eb53abce33d8d5cae8467a37ab04dfb336 SHA256 410c491761c782f11e4e26de942c91e6329b5ae39faec6fae33e96ddc4e2c64b
+EBUILD xxxterm-9999.ebuild 2177 RMD160 4d5707e2087ce9e522e5146219514e2a089de37c SHA1 d107a5f7fca8f526ce9a232e4f9d41016c22b2cd SHA256 cb315b1d53d3ca42cef1dbf31eef671d71ca52fc9dabb34acafde0a2be702afd
+MISC ChangeLog 1727 RMD160 b23b05ff06b63221abfd74ba7893bfaf74834de5 SHA1 0e36fc6bf16dc3457de4bf5cb6416212594801ce SHA256 1fe0e5c8d57fb08dcb71625c2578733eabf99143e09bc4ce222bd589826fd59e
 MISC metadata.xml 861 RMD160 526567a64e01ed435d45e8be0c926d38df136b0b SHA1 61ba9af5a098894ae913590c0c85aeb7f4ff563a SHA256 2a3bda724ac94442852310edeff192b63eb3a656d8b36781960aeae960987167
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPr/JyAAoJEOTDgjZ80txd7dgIAJr19aHgcwxhzbVHR4+qk2EO
-Y4HtOI0Dt8e0bcDDedxBrR9J28A18alOcIuTeSFR8a7v2wj0wOcHvSazepQRXjQ+
-v166eDsn6hRtGAn27XriB6jA5kwWDaCX0P0m3I7jC7/J7mYI53QGan4XXzR69xDz
-hHTaoYrTR8gxv4injDmjtGr9mQxgqas/JABpA0575oqJ4xtiGoWX40xCSvoY/ESO
-CSMKNNBFvFwVBQYzp8qEDJlsftEvwWWsxfveHmcVReVgf0fenZSQvTzgAAg6j4DR
-uMQW8h0AW5Qkv5AMH+qkG2DU+Ym7tLf+RVIQ/93mQSBmS5YKDJRpBp1nCooiVZQ=
-=7++Q
+iQEcBAEBCgAGBQJPsAPMAAoJEOTDgjZ80txdyfoH/RNVp9I3fnhkK1CyYrRT53Dv
+2iatdxVjaR4R9CU8gzSS8Fd3UHOEaFWGq+KNbVCqhO4OXAfuTYkE4Q2+9Agp15Al
+DRgf7bFRWp6W4d7Qzs6/7hEi8c/ORixqMHwTVz0L14e/u9R6w0G1BZ7x+EpqiE37
+ldfgsPKh7qk+byfVSR9UPzxa3ZLCWZyzaR/ICHJqcF68+TGFEhUob//Yenmw3GSp
+06Zb4v5dO79bC00VSzBra7ttB4swJ8sbFivqhd8MUFptUyhbJCVT48zRkdGK2vRN
+ft9g4R5WZ99ToMylzKGMCURFhJLFMqlxZ4m0ILx66Uh6en4SPL9U9PLVGyfNYdA=
+=8Sgb
 -----END PGP SIGNATURE-----
diff --git a/www-client/xxxterm/xxxterm-9999.ebuild b/www-client/xxxterm/xxxterm-9999.ebuild
index da2a4a58e070..0b12df6fc16d 100644
--- a/www-client/xxxterm/xxxterm-9999.ebuild
+++ b/www-client/xxxterm/xxxterm-9999.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-9999.ebuild,v 1.3 2012/03/17 21:54:12 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/xxxterm/xxxterm-9999.ebuild,v 1.4 2012/05/13 18:56:08 ago Exp $
 
 EAPI="4"
 
@@ -18,8 +18,8 @@ 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_REPO_URI="git://opensource.conformal.com/${PN}.git
+		https://opensource.conformal.com/git/${PN}.git"
 	EGIT_SOURCEDIR="${WORKDIR}/${MY_P}"
 else
 	SRC_URI="http://opensource.conformal.com/snapshots/${PN}/${MY_P}.tgz"
@@ -28,20 +28,33 @@ fi
 
 LICENSE="ISC"
 SLOT="0"
-IUSE=""
+IUSE="examples"
 
-DEPEND="x11-libs/gtk+:2
-	net-libs/webkit-gtk:2
+RDEPEND="dev-libs/glib:2
+	dev-libs/libbsd
+	dev-libs/libgcrypt
 	net-libs/libsoup
 	net-libs/gnutls
-	dev-libs/libbsd"
-RDEPEND="${DEPEND}"
+	net-libs/webkit-gtk:2
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/pango"
+DEPEND="${RDEPEND}
+	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}/${MY_P}/linux"
 
 src_prepare() {
 	sed -i \
-		's/-Wall -ggdb //' \
+		-e 's/-O2//' \
+		-e 's/-ggdb3//' \
 		Makefile || die 'sed Makefile failed.'
 	sed -i \
 		-e 's#https://www\.cyphertite\.com#http://www.gentoo.org/#' \
@@ -59,15 +72,24 @@ src_compile() {
 src_install() {
 	emake \
 		DESTDIR="${D}" \
-		PREFIX=/usr install
+		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
+	doins ../${PN}.desktop
+
+	doman ../${PN}.1
+
+	if use examples;then
+		insinto "/usr/share/doc/${PF}/examples"
+		doins \
+			../${PN}.conf \
+			../playflash.sh \
+			../favorites
+	fi
 }
 
 pkg_postinst() {