Backport patch from upstream fixing an issue where top level bookmarks do not appear in the toolbar, wrt bug #483666.

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

4 files changed, 109 insertions, 8 deletions

diff --git a/kde-base/konqueror/ChangeLog b/kde-base/konqueror/ChangeLog
index b6709982b0da..50681967e9da 100644
--- a/kde-base/konqueror/ChangeLog
+++ b/kde-base/konqueror/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/konqueror
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/ChangeLog,v 1.308 2013/09/03 19:50:14 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/ChangeLog,v 1.309 2013/09/05 11:55:21 kensington Exp $
+
+*konqueror-4.11.1-r1 (05 Sep 2013)
+
+  05 Sep 2013; Michael Palimaka <kensington@gentoo.org>
+  +files/konqueror-4.11.1-bookmarks.patch, +konqueror-4.11.1-r1.ebuild:
+  Backport patch from upstream fixing an issue where top level bookmarks do not
+  appear in the toolbar, wrt bug #483666.
 
   03 Sep 2013; Chris Reffett <creffett@gentoo.org> -konqueror-4.11.0.ebuild:
   Drop KDE 4.11.0
diff --git a/kde-base/konqueror/Manifest b/kde-base/konqueror/Manifest
index f37ddfd03d38..709b08d4f61b 100644
--- a/kde-base/konqueror/Manifest
+++ b/kde-base/konqueror/Manifest
@@ -1,18 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX konqueror-4.11.1-bookmarks.patch 989 SHA256 97c2bb112f98d4daab593f1fb339712cc40439af0f7224b485738ba2748998da SHA512 8fec4fded2285f96ba3f77ea6ab017ac65eb9059961edd21d200abe982f741ec25f7e821f8a936d7552e10065c6bad6391f1a5165d512d7968cf892bbb545074 WHIRLPOOL 5f6b36ce2b36889075ebeb3be7d492f0492d30a42fe6d9188145159dab976700cf591eff247d2135f6f7d1912791ee5c937e9d756320ef74b8aeb5bf7e6dc859
 DIST kde-baseapps-4.10.5.tar.xz 2615840 SHA256 ff89e9c3a6eea103a368200cf2aa2bcd5d5c2dad92683aff03d1253516e608b4 SHA512 b296fc3fabde36affda575bbbe3bd02383d2673dae1a30aeb897cfdba8b63a5ad9244ba11d677694afd89bc40ea1c7adbeb42680ea14b569d507e2931e29c980 WHIRLPOOL 2bfd54399ea4a15a59b9feb59bb1135579fd33c1eea39587443784a98ec92629cb506f493ec77323297736013d45c8a8cda37f1848efd275e41e7194b6dc3627
 DIST kde-baseapps-4.11.1.tar.xz 2557764 SHA256 f382f84d34dbb696533b026aa082987a9603584b5e92874ab94df9764a69fd91 SHA512 d2d0b0f49c568f58e1e47edb88a46806a5cf5ca566999fb705963079b49573b1c4f41f371fee16e7def66732e6bf43cab8cd51a24b843e31040ffebc104c16d5 WHIRLPOOL 93e0942196ca6fba72a174c53266903bda7cd00defeb7874444ff5abf5100ee764c6398b0e916286e77b4fb8a86dc5828e8658ac3e21157a515519d977e549b9
 EBUILD konqueror-4.10.5.ebuild 1323 SHA256 6a30e3cd8352e102fe19de19002eb5416c8eca58dfce225df8dbc9ff53009f92 SHA512 80371610301bdf6c6e6ea63249cc2ad4e7bfb90bb1b96091e0783d518332f0b19fc745d2b32778584b2b9e9984c6c1219b47bb26c060e77a4de1d90e427cba00 WHIRLPOOL 73994ce0a355ae515ad3e332b40975d4453ec3311aac214affbcd8bfa02ceebeb92fef8070b76a75a730ffb68e72d5d925aaff996215b4a68d3484f3e089d989
+EBUILD konqueror-4.11.1-r1.ebuild 1475 SHA256 178129e175119f737ec51ff6d7a289de264c9584b0193e5e35ce093e94932911 SHA512 0e544b213ec4bb057dff20b893c28a17dac1976f5d23305298d533637523be20477713443adcbc3ddb1ddf29c7b089ba659527e33e28ff84722d8fa95e7b50b3 WHIRLPOOL 1f2b0dfac9e079e91c2b415dc3edae8abd9cd4f9ab428b8f7fefe528e0389838577390ea607c3f393b2bf3445a2873d5fe6f2a6620be27334de5dddae7a4523c
 EBUILD konqueror-4.11.1.ebuild 1422 SHA256 ef613bbe3195de1e473e0fe497775f0d2c1399b26da51a99c74d8f571c6e5f65 SHA512 fd74fe603c73507f054cac01a1cf9eb1d23761158e91b8b16755642bcf25d5e9cd0dc2d1cc87d151d60c6ee1e364e469eaf65a490235847bf9f2e79eeab03ebf WHIRLPOOL 39228ec1a64440955053059353564c50f47f2fa87764c4fc46a5ddb5da916eea8836c670a0e85f6626ff94bb2dd0ca01532a7f003a34f6d55f26c751db9e6c74
-MISC ChangeLog 39457 SHA256 68e5fbbff72a53349543628ce53effd30861c73239b3d8380a15b136ae0f2557 SHA512 12a2fe522ada066621603df2dea6059a56c9187cde56b8a463afb0dd56e40d25aad5e8308e3fc750ee418b645f775a504d342f27e9e45023e014ef02574a71a8 WHIRLPOOL a75ef763e2a824c3c4b8c0ea8798f338f393767907c9a5980e4967b8e4c65367c1af6017e493f5c8de601652479cadbb6dc9871f662235c702db2660e164911a
+MISC ChangeLog 39746 SHA256 3e7959980f720a640ac91a6faf0eb613d38358a39467abee38b2e42e734dc53b SHA512 a5c70176ba4f64bf35153888c240f756040e336c3e49893d574f8b7f581f092be4cd447c715a6ef40f106e6dcfaf073a6ff5198fac5d79860e95c58d7c653fb5 WHIRLPOOL f282600efc64ddffd4a89aac526f13b87b6a3640d3c4c8a28c864805148e81c2b597d76a1c14266ce8b4f93533ddae2eceabc73eeecf991ff7eb9fda64b4fe90
 MISC metadata.xml 247 SHA256 6569683d0d0645fc26a371127f3c7b7135eaa937900e718d17f57b729457b754 SHA512 51f1bee5af253468e645e68f3da14f74ff7ff3e6ccc0f8298f5eb6c855693b551e8f32676f5ab3bdaee12125fd32b1210bd111abaf7f89dfdd88a7062c53ed24 WHIRLPOOL 51bf0af3505b9669fbe561b31f399f91ff6b3b6bbaccdbe7e3e544d84a120933fa116ed798eebebe806487549e22cb88331f452e9a7e03ace4a5a994727d40d8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iKYEAREIAGYFAlImPZhfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldEM2NzU5RjUyMDczREJDQkVDQTBDRkE1NERC
-Nzk1QThBNDI2MTgzNTQACgkQ23laikJhg1QF8wCgik9H/u7T/hWodBMIwyYVLN98
-DXkAn0skOY6BjjNxa9KD+GVn4bcumpCx
-=WU5O
+iQEcBAEBCAAGBQJSKHCUAAoJEMbwO6tnXQ0sVqQIAJh/XLdiXuv4F2QlcjHY833q
+tQtj7v5pL7coo0Scr5EVKP23Tkw8lVxXEN5gMMs5AL2ZBL9jfkU1drQrWKlK2wEv
+KOipiLmKnI/WHVyn5lX/zkOQGZIrjDpIanrAUpuBn4XSJu+HjgmoUh0HAvWnUrTG
+qsOJj9g9nn1VlD+j4v+O5KZApXpY8oWJFOKMqRRD7Fp70YEHefUQ5Vlzwr0v+nTR
+d5PgRRKXGgJprOorQ0UfuvdRXcItAq6QgMPo62LEcpc+j6fZsHO7IWFvxZTPBuJ7
+OsM0EIdxDLcQUPFrF6AgXH1RQpBJ7lWJu1AynmjtPRSJs6fEYOfXC4GuXZhtG6A=
+=MBhW
 -----END PGP SIGNATURE-----
diff --git a/kde-base/konqueror/files/konqueror-4.11.1-bookmarks.patch b/kde-base/konqueror/files/konqueror-4.11.1-bookmarks.patch
new file mode 100644
index 000000000000..66aae072473b
--- /dev/null
+++ b/kde-base/konqueror/files/konqueror-4.11.1-bookmarks.patch
@@ -0,0 +1,31 @@
+From 43a981481ab9161a83dd200db39c093e2502f68a Mon Sep 17 00:00:00 2001
+From: Bernd Buschinski <b.buschinski@googlemail.com>
+Date: Wed, 4 Sep 2013 16:23:35 +0200
+Subject: [PATCH] Fix toplevel bookmarks not showing in toolbar regression from
+ d1963e23
+
+---
+ konqueror/src/konqbookmarkbar.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/konqueror/src/konqbookmarkbar.cpp b/konqueror/src/konqbookmarkbar.cpp
+index 2141575..199e15f 100644
+--- a/konqueror/src/konqbookmarkbar.cpp
++++ b/konqueror/src/konqbookmarkbar.cpp
+@@ -184,10 +184,12 @@ void KBookmarkBar::fillBookmarkBar(const KBookmarkGroup & parent)
+ 
+         if (!bm.isGroup())
+         {
+-	    if ( bm.isSeparator() )
++            if ( bm.isSeparator() )
++            {
+                 if (m_toolBar) {
+                     m_toolBar->addSeparator();
+                 }
++            }
+             else
+             {
+                 KAction *action = new KBookmarkAction( bm, m_pOwner, 0 );
+-- 
+1.8.3.2
+
diff --git a/kde-base/konqueror/konqueror-4.11.1-r1.ebuild b/kde-base/konqueror/konqueror-4.11.1-r1.ebuild
new file mode 100644
index 000000000000..10644f840cf5
--- /dev/null
+++ b/kde-base/konqueror/konqueror-4.11.1-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/konqueror-4.11.1-r1.ebuild,v 1.1 2013/09/05 11:55:21 kensington Exp $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-baseapps"
+inherit flag-o-matic kde4-meta
+
+DESCRIPTION="KDE: Web browser, file manager, ..."
+HOMEPAGE="
+	http://www.kde.org/applications/internet/konqueror/
+	http://konqueror.org/
+"
+KEYWORDS=" ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+bookmarks debug svg"
+# 4 of 4 tests fail. Last checked for 4.0.3
+RESTRICT="test"
+
+DEPEND="
+	$(add_kdebase_dep libkonq)
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep kfind)
+	$(add_kdebase_dep kfmclient)
+	bookmarks? ( $(add_kdebase_dep keditbookmarks) )
+	svg? ( $(add_kdebase_dep svgpart) )
+"
+
+KMEXTRACTONLY="
+	konqueror/client/
+	lib/konq/
+"
+
+PATCHES=( "${FILESDIR}/${P}-bookmarks.patch" )
+
+src_prepare() {
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
+
+	kde4-meta_src_prepare
+
+	# Do not install *.desktop files for kfmclient
+	sed -e "/kfmclient\.desktop/d" -i konqueror/CMakeLists.txt \
+		|| die "Failed to omit .desktop files"
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	if ! has_version kde-base/dolphin:${SLOT} ; then
+		elog "If you want to use konqueror as a filemanager, install the dolphin kpart:"
+		elog "kde-base/dolphin:${SLOT}"
+	fi
+
+	if ! has_version virtual/jre ; then
+		elog "To use Java on webpages install virtual/jre."
+	fi
+}