Added KDE 4.0.0's konqueror.

Package-Manager: portage-2.1.4

4 files changed, 85 insertions, 2 deletions

diff --git a/kde-base/konqueror/ChangeLog b/kde-base/konqueror/ChangeLog
index 3c5f5df53eb9..a68171c9bd6a 100644
--- a/kde-base/konqueror/ChangeLog
+++ b/kde-base/konqueror/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/konqueror
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/ChangeLog,v 1.96 2007/10/20 16:43:10 philantrop Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/ChangeLog,v 1.97 2008/01/18 02:27:41 ingmar Exp $
+
+*konqueror-4.0.0 (18 Jan 2008)
+
+  18 Jan 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  +files/konqueror-4.0.0-linkage.patch, +konqueror-4.0.0.ebuild:
+  Added KDE 4.0.0's konqueror.
 
   20 Oct 2007; Wulf C. Krueger <philantrop@gentoo.org>
   konqueror-3.5.8.ebuild:
diff --git a/kde-base/konqueror/files/digest-konqueror-4.0.0 b/kde-base/konqueror/files/digest-konqueror-4.0.0
new file mode 100644
index 000000000000..24ff971acf2c
--- /dev/null
+++ b/kde-base/konqueror/files/digest-konqueror-4.0.0
@@ -0,0 +1,3 @@
+MD5 01d8f2f16cbd4e225efc996b0dd39769 kdebase-4.0.0.tar.bz2 4032455
+RMD160 48d400a860b01697dde0e335f81a7c9622963247 kdebase-4.0.0.tar.bz2 4032455
+SHA256 3881342b8921f0cd1077a24ecc3e2ca2a0b8c15e6d78654198d6f4cc64fc2990 kdebase-4.0.0.tar.bz2 4032455
diff --git a/kde-base/konqueror/files/konqueror-4.0.0-linkage.patch b/kde-base/konqueror/files/konqueror-4.0.0-linkage.patch
new file mode 100644
index 000000000000..e661ac7b335d
--- /dev/null
+++ b/kde-base/konqueror/files/konqueror-4.0.0-linkage.patch
@@ -0,0 +1,38 @@
+SVN revision 758314
+Author: dfaure <dfaure@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
+Date:   Mon Jan 7 15:54:16 2008 +0000
+
+    doesn't need to link to libkonq anymore
+
+SVN revision 758304
+Author: dfaure <dfaure@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
+Date:   Mon Jan 7 15:14:42 2008 +0000
+
+    doesn't use libkonq anymore
+
+diff --git a/kdebase/apps/konqueror/shellcmdplugin/CMakeLists.txt b/kdebase/apps/konqueror/shellcmdplugin/CMakeLists.txt
+index ddbad19..64919ce 100644
+--- a/kdebase/apps/konqueror/shellcmdplugin/CMakeLists.txt
++++ b/kdebase/apps/konqueror/shellcmdplugin/CMakeLists.txt
+@@ -7,7 +7,7 @@ set(konq_shellcmdplugin_PART_SRCS kshellcmdexecutor.cpp kshellcmddialog.cpp kshe
+ kde4_add_plugin(konq_shellcmdplugin ${konq_shellcmdplugin_PART_SRCS})
+ 
+ 
+-target_link_libraries(konq_shellcmdplugin  konq ${KDE4_KDEUI_LIBS} ${KDE4_KDESU_LIBS})
++target_link_libraries(konq_shellcmdplugin ${KDE4_KPARTS_LIBS} ${KDE4_KDESU_LIBS})
+ 
+ install(TARGETS konq_shellcmdplugin  DESTINATION ${PLUGIN_INSTALL_DIR} )
+ 
+diff --git a/kdebase/apps/konqueror/remoteencodingplugin/CMakeLists.txt b/kdebase/apps/konqueror/remoteencodingplugin/CMakeLists.txt
+index bb92516..160f1a2 100644
+--- a/kdebase/apps/konqueror/remoteencodingplugin/CMakeLists.txt
++++ b/kdebase/apps/konqueror/remoteencodingplugin/CMakeLists.txt
+@@ -6,7 +6,7 @@ set(konq_remoteencoding_PART_SRCS kremoteencodingplugin.cpp )
+ kde4_add_plugin(konq_remoteencoding ${konq_remoteencoding_PART_SRCS})
+ 
+ 
+-target_link_libraries(konq_remoteencoding  ${KDE4_KDECORE_LIBS} konq )
++target_link_libraries(konq_remoteencoding  ${KDE4_KPARTS_LIBS} )
+ 
+ install(TARGETS konq_remoteencoding  DESTINATION ${PLUGIN_INSTALL_DIR} )
+ 
diff --git a/kde-base/konqueror/konqueror-4.0.0.ebuild b/kde-base/konqueror/konqueror-4.0.0.ebuild
new file mode 100644
index 000000000000..7bacd7195269
--- /dev/null
+++ b/kde-base/konqueror/konqueror-4.0.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/konqueror-4.0.0.ebuild,v 1.1 2008/01/18 02:27:41 ingmar Exp $
+
+EAPI="1"
+
+KMNAME=kdebase
+KMMODULE=apps/${PN}
+inherit kde4-meta
+
+DESCRIPTION="KDE: Web browser, file manager, ..."
+IUSE="debug htmlhandbook"
+KEYWORDS="~amd64 ~x86"
+# Tests fail to compile due to the fact that we compile libkonq seperately.
+RESTRICT="test"
+
+DEPEND="
+	>=kde-base/libkonq-${PV}:${SLOT}"
+RDEPEND="${DEPEND}
+	>=kde-base/kdebase-kioslaves-${PV}:${SLOT}
+	>=kde-base/kfind-${PV}:${SLOT}"
+
+KMEXTRA="apps/doc/${PN}"
+KMEXTRACTONLY="apps/lib/konq/"
+
+PATCHES="${FILESDIR}/${P}-linkage.patch"
+#	${FILESDIR}/${P}-linkage-2.patch"
+
+pkg_postinst() {
+	echo
+	elog "If you want to use konqueror as a filemanager, install the dolphin kpart:"
+	elog "emerge kde-base/dolphin:kde-4"
+	echo
+	elog "To use Java on webpages: emerge >=virtual/jre-1.4"
+	echo
+}