Add NETSURF_COMPONENT_TYPE default, restore .desktop generation

Package-Manager: portage-2.2.0_alpha180/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

3 files changed, 18 insertions, 27 deletions

diff --git a/www-client/netsurf/ChangeLog b/www-client/netsurf/ChangeLog
index 0ea3a7742641..c26e02122d44 100644
--- a/www-client/netsurf/ChangeLog
+++ b/www-client/netsurf/ChangeLog
@@ -1,9 +1,6 @@
 # ChangeLog for www-client/netsurf
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/netsurf/ChangeLog,v 1.8 2013/06/19 07:20:26 xmw Exp $
-
-  19 Jun 2013; Michael Weber <xmw@gentoo.org> netsurf-3.0.ebuild:
-  Add NETSURF_COMPONENT_TYPE default.
+# $Header: /var/cvsroot/gentoo-x86/www-client/netsurf/ChangeLog,v 1.9 2013/06/19 07:26:45 xmw Exp $
 
 *netsurf-3.0 (19 Jun 2013)
 
diff --git a/www-client/netsurf/Manifest b/www-client/netsurf/Manifest
index 1cba83416582..705d5da6c9dd 100644
--- a/www-client/netsurf/Manifest
+++ b/www-client/netsurf/Manifest
@@ -10,13 +10,13 @@ DIST netsurf-3.0-src.tar.gz 2950260 SHA256 7c6a48d3cc3e9a3e3a51b532ddf60f7697e97
 DIST netsurf-buildsystem-1.0.tar.gz 37026 SHA256 4495e8e12faf0ace668ab80401064ce7f65a195efe63c924c066a109649ff146 SHA512 763e10766ab16be375c40a226e36a95df5740ac62b5bbc4eb6d52693b83284d2e71d9a3d797f55c28853a5d2565182759ffa9bfb3d736daf21b347f418661c47 WHIRLPOOL a65d53424a34a796a1f85ed5d4a9ca9bf58eaba7246e5ea20bc7da09e0e8ab60e156ce47da521660d5567c6358fda0da744e56ccf52cda6e0db92b19a6055d38
 DIST netsurf-fb.modes-example.gz 4586 SHA256 df1514790be120f27bd23dfdca71c24112679d45d3cbd3916f9231ec5e2596bb SHA512 753a707dc428212803dd64250bb723a498fdc1c328fdac4df38be533eab3af45f727cdc6b7ced3faaa0e82db182c4eab140b8e81b0d3cfe2152252b89e6d2981 WHIRLPOOL 5a91c32a712b746c993d2fa1d47625f16241e845d556b8113ab957eda7385ac5bdde5f78b0de2dad4df544c7d7c13d8145ebb9d81272af9a3759ad4e307c3767
 EBUILD netsurf-2.9.ebuild 4157 SHA256 6b321be09e4e31e3d2e085f2bd92a4429436c0bfe465c156394d4b56fbd562b4 SHA512 6618fd5716728f27e8bae4d60191505dbe2b78a399b498ea68b240127f7970970c50dfe733b0a58dafbdc5c949c6944b279259d0a50a8ff80fdb733a4ba00bb3 WHIRLPOOL b6b42a3271ed99ce7efd8caaef61568a90dc395ba163512389576f230b4d0f0aefb63fd937a5344c034107086d92f933e4ad63c6299e25cccd6a5f0095342c9f
-EBUILD netsurf-3.0.ebuild 7697 SHA256 117f7f641970515d1325f34140b230854b19d2a6cd0fda6426a0d4d5986136c4 SHA512 a77bbeb2736b14e50cfe6ff5b758711de91d31b9cb44625d1bbffebfb1ad2da362b1e88bc5b4571c9e0291e71cbd2138efe105fe8ef7974cdaa7fcb8cbe22b62 WHIRLPOOL 8d16732dfc6064f64d59339d73299b913d564c0268211f915da11546abf6428f860e45fa80237a580aa2dcd5f1c416ee2c02a898c73a143e4e917ae3c0d5b0a6
-MISC ChangeLog 1329 SHA256 0f6f9a25d294fe6970f55af02d5ddcf98db07537832c7c032b09c08be4ab6283 SHA512 2c05402855aecab8a093c48f4964911f570fa15d8726dfd3a93f7bd0b2b704f0c50d874574d09886e050d80288184dbfb7c31c6b064bac61504f4a61efc77276 WHIRLPOOL 5f632b5b0817ed0067d90a14fdccc351405b1522ca33280f90375faa1c14b95a368539ad5b057a6d82414cc7c4a730dc0046b9ae91dbc9ecbb2aabe28d36c5cc
+EBUILD netsurf-3.0.ebuild 7704 SHA256 fa3769a342232584d3f1b290d39fd1e5cf8d4afb25cc460cf8c575a713599ca4 SHA512 cbd2119663d3ed93d3f8bc5ce70b2b63d94091b61c958fa0f121b3122e9a6edc4dc8b93805c5c3a69089bcf691b3fb7ff046c4121fb5529b2a6958f38f6e47c8 WHIRLPOOL 752d9e11306ae227c695cb9c46ce8805001d678f4d1995dddef04b8d1b5e7e29e15f32c042eb91d77b890e565421a09a9945f9a6b82eca14f0aa7b320e5002c9
+MISC ChangeLog 1329 SHA256 11a934c1c2e140aca383342d4d58ca6905c090e838ea67df1a71f2673b84ff8f SHA512 85213c3709f834756a95df6d5a4ab8cb8911a89c1184be0f0407c7553bbc2d332b7b9038c1a586c24faaf6ee4e1320eaf4f1650a3a6c8930a89b549757674953 WHIRLPOOL 670a88dbda59940bef9b6764099e5ce513c231e21519da1006068bc0f4a091d9e906084fb97574bb02d9102725906f253100881e3a9cd9bb291c3927b6036d07
 MISC metadata.xml 1577 SHA256 f53de90c2188f6b757c2fdd700eaf1c25c642f708786c552449bd54c57da40f6 SHA512 4003d28e9ef15fe3f3a46080a2584986e166148a43f060cbc90bbcc46ffe130becca495b65ee3e0d3bd348f78fdd42bccfd0e1fa90a7176a8ff5d01151a4ffc8 WHIRLPOOL 8d6c7941d0731d8280e6ee016cbc500137cd5087523dd637657fbe1c668814bdf093b66bd68f89c9d12a2dedc71719e49e873cb935b006fa93c188af12424cc1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlHBVj0ACgkQknrdDGLu8JBVVwD/RAMc5tQAcRvbekROV+knXjdC
-8rZF3hIdkjxflcW6dlYA+gPbV4/U+N4WWhx+oUEtkoiZveGRY7gvMU9+Iuw+FmYt
-=Ysf1
+iF4EAREIAAYFAlHBXTwACgkQknrdDGLu8JDejgD/RTQTAMpZlRfxu0bqqSPJVVrv
+9faAJHm9hr1PAwRMtqYA/3lw0UnyfhY4hL8CV+bSEYepdVC7w0QKSLDrqLcyG2CP
+=kzKS
 -----END PGP SIGNATURE-----
diff --git a/www-client/netsurf/netsurf-3.0.ebuild b/www-client/netsurf/netsurf-3.0.ebuild
index f61459a6eb26..a98b01ce70e6 100644
--- a/www-client/netsurf/netsurf-3.0.ebuild
+++ b/www-client/netsurf/netsurf-3.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/netsurf/netsurf-3.0.ebuild,v 1.2 2013/06/19 07:20:26 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/netsurf/netsurf-3.0.ebuild,v 1.3 2013/06/19 07:26:45 xmw Exp $
 
 EAPI=5
 
-inherit base toolchain-funcs multilib-minimal
+inherit eutils base toolchain-funcs multilib-minimal
 
 DESCRIPTION="a free, open source web browser"
 HOMEPAGE="http://www.netsurf-browser.org/"
@@ -230,28 +230,22 @@ src_install() {
 	if use fbcon ; then
 		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=framebuffer}" )
 		netsurf_src_install
-		einfo "install framebuffer binary as netsurf-fb"
+		elog "framebuffer binary has been installed as netsurf-fb"
 		mv -v "${ED}"usr/bin/netsurf{,-fb} || die
+		make_desktop_entry "${EROOT}"usr/bin/netsurf-gtk NetSurf-gtk netsurf "Network;WebBrowser"
+	
+		elog "In order to setup the framebuffer console, netsurf needs an /etc/fb.modes"
+		elog "You can use an example from /usr/share/doc/${PF}/fb.modes.* (bug 427092)."
+		elog "Please make /etc/input/mice readable to the account using netsurf-fb."
+		elog "Either use chmod a+r /etc/input/mice (security!!!) or use an group."
 	fi
 	if use gtk ; then
 		netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk}" )
 		netsurf_src_install
+		elog "netsurf gtk version has been installed as netsurf-gtk"
+		mv -v "${ED}"/usr/bin/netsurf{,-gtk} || die
+		make_desktop_entry "${EROOT}"usr/bin/netsurf-fb NetSurf-framebuffer netsurf "Network;WebBrowser"
 	fi
-	#	mv "${D}"/usr/bin/netsurf{,-gtk} || die
-	#	make_desktop_entry /usr/bin/netsurf-gtk NetSurf-gtk netsurf "Network;WebBrowser"
-	#if use fbcon ; then
-	#	emake DESTDIR="${D}" PREFIX="/usr" TARGET=framebuffer install
-	#	mv "${D}"/usr/bin/netsurf{,-fb} || die
-	#	make_desktop_entry /usr/bin/netsurf-fb NetSurf-framebuffer netsurf "Network;WebBrowser"
-	#
-	#	einfo
-	#	elog "In order to setup the framebuffer console, netsurf needs an /etc/fb.modes"
-	#	elog "You can use an example from /usr/share/doc/${PF}/fb.modes.* (bug 427092)."
-	#	einfo
-	#	elog "Please make /etc/input/mice readable to the account using netsurf-fb."
-	#	elog "Either use chmod a+r /etc/input/mice (security!!!) or use an group."
-	#	einfo
-	#fi
 	insinto /usr/share/pixmaps
 	doins gtk/res/netsurf.xpm