diff options
author | Ingmar Vanhassel <ingmar@gentoo.org> | 2008-02-17 03:31:00 +0000 |
---|---|---|
committer | Ingmar Vanhassel <ingmar@gentoo.org> | 2008-02-17 03:31:00 +0000 |
commit | 1f0d82e30a76e7b698e006c0b23ef4ba43d716db (patch) | |
tree | 71740acf58d3dc2cadad8ebbfe1669f80226a1ea /kde-base/konqueror | |
parent | Spring Cleaning (diff) | |
download | historical-1f0d82e30a76e7b698e006c0b23ef4ba43d716db.tar.gz historical-1f0d82e30a76e7b698e006c0b23ef4ba43d716db.tar.bz2 historical-1f0d82e30a76e7b698e006c0b23ef4ba43d716db.zip |
Spring cleaning.
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'kde-base/konqueror')
-rw-r--r-- | kde-base/konqueror/ChangeLog | 12 | ||||
-rw-r--r-- | kde-base/konqueror/files/konqueror-3.5.7-185603-spoofing.diff | 49 | ||||
-rw-r--r-- | kde-base/konqueror/files/konqueror-3.5.7-location.patch | 12 | ||||
-rw-r--r-- | kde-base/konqueror/files/konqueror-4.0.0-linkage.patch | 38 | ||||
-rw-r--r-- | kde-base/konqueror/konqueror-3.5.5.ebuild | 25 | ||||
-rw-r--r-- | kde-base/konqueror/konqueror-3.5.6-r1.ebuild | 37 | ||||
-rw-r--r-- | kde-base/konqueror/konqueror-3.5.6.ebuild | 34 | ||||
-rw-r--r-- | kde-base/konqueror/konqueror-3.5.7-r1.ebuild | 62 | ||||
-rw-r--r-- | kde-base/konqueror/konqueror-3.5.7-r2.ebuild | 67 | ||||
-rw-r--r-- | kde-base/konqueror/konqueror-3.5.7-r3.ebuild | 69 | ||||
-rw-r--r-- | kde-base/konqueror/konqueror-3.5.7.ebuild | 60 | ||||
-rw-r--r-- | kde-base/konqueror/konqueror-4.0.0.ebuild | 36 |
12 files changed, 11 insertions, 490 deletions
diff --git a/kde-base/konqueror/ChangeLog b/kde-base/konqueror/ChangeLog index 5f1b8a72a2d2..9a40ef7d59df 100644 --- a/kde-base/konqueror/ChangeLog +++ b/kde-base/konqueror/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for kde-base/konqueror # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/ChangeLog,v 1.103 2008/02/07 00:12:20 philantrop Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/ChangeLog,v 1.104 2008/02/17 01:43:02 ingmar Exp $ + + 16 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> + -files/konqueror-3.5.7-185603-spoofing.diff, + -files/konqueror-3.5.7-location.patch, + -files/konqueror-4.0.0-linkage.patch, -konqueror-3.5.5.ebuild, + -konqueror-3.5.6.ebuild, -konqueror-3.5.6-r1.ebuild, + -konqueror-3.5.7.ebuild, -konqueror-3.5.7-r1.ebuild, + -konqueror-3.5.7-r2.ebuild, -konqueror-3.5.7-r3.ebuild, + -konqueror-4.0.0.ebuild: + Spring cleaning *konqueror-4.0.1 (06 Feb 2008) diff --git a/kde-base/konqueror/files/konqueror-3.5.7-185603-spoofing.diff b/kde-base/konqueror/files/konqueror-3.5.7-185603-spoofing.diff deleted file mode 100644 index 0d6e44ef4f82..000000000000 --- a/kde-base/konqueror/files/konqueror-3.5.7-185603-spoofing.diff +++ /dev/null @@ -1,49 +0,0 @@ ---- konqueror/konq_combo.cc -+++ konqueror/konq_combo.cc -@@ -158,6 +158,9 @@ void KonqCombo::setURL( const QString& u - kapp->dcopClient()->send( "konqueror*", "KonquerorIface", - "addToCombo(QString,QCString)", data); - } -+ // important security consideration: always display the beginning -+ // of the url rather than its end to prevent spoofing attempts. -+ lineEdit()->setCursorPosition( 0 ); - } - - void KonqCombo::setTemporary( const QString& text ) ---- konqueror/konq_mainwindow.cc -+++ konqueror/konq_mainwindow.cc -@@ -611,12 +611,11 @@ void KonqMainWindow::openURL( KonqView * - } - else // no known serviceType, use KonqRun - { -- if ( ( view && view == m_currentView ) || -- ( !view && !req.newTab ) ) // startup with argument -+ if ( ( !view || view->url().isEmpty() ) && !req.newTab ) // startup with argument - { - // Show it for now in the location bar, but we'll need to store it in the view - // later on (can't do it yet since either view == 0 or updateHistoryEntry will be called). -- kdDebug(1202) << "setLocationBarURL : url = " << url << endl; -+ kdDebug(1202) << "setLocationBarURL (startup) : url = " << url << endl; - setLocationBarURL( url ); - } - -@@ -819,8 +818,6 @@ bool KonqMainWindow::openView( QString s - if ( childView ) - { - enableAllActions( true ); -- -- m_pViewManager->setActivePart( childView->part() ); - m_currentView = childView; - } - } ---- konqueror/konq_viewmgr.cc -+++ konqueror/konq_viewmgr.cc -@@ -1395,6 +1395,8 @@ void KonqViewManager::slotActivePartChan - - void KonqViewManager::emitActivePartChanged() - { -+ // prevent unnecessary multiple calls to slotPartActivated: -+ m_activePartChangedTimer->stop(); - m_pMainWindow->slotPartActivated( activePart() ); - } - diff --git a/kde-base/konqueror/files/konqueror-3.5.7-location.patch b/kde-base/konqueror/files/konqueror-3.5.7-location.patch deleted file mode 100644 index 7061e6a1b940..000000000000 --- a/kde-base/konqueror/files/konqueror-3.5.7-location.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: konqueror/konq_combo.cc -=================================================================== ---- konqueror/konq_combo.cc (revision 643782) -+++ konqueror/konq_combo.cc (working copy) -@@ -158,6 +158,7 @@ - kapp->dcopClient()->send( "konqueror*", "KonquerorIface", - "addToCombo(QString,QCString)", data); - } -+ lineEdit()->setCursorPosition( 0 ); - } - - void KonqCombo::setTemporary( const QString& text ) diff --git a/kde-base/konqueror/files/konqueror-4.0.0-linkage.patch b/kde-base/konqueror/files/konqueror-4.0.0-linkage.patch deleted file mode 100644 index e661ac7b335d..000000000000 --- a/kde-base/konqueror/files/konqueror-4.0.0-linkage.patch +++ /dev/null @@ -1,38 +0,0 @@ -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-3.5.5.ebuild b/kde-base/konqueror/konqueror-3.5.5.ebuild deleted file mode 100644 index 7d5cf4fc918c..000000000000 --- a/kde-base/konqueror/konqueror-3.5.5.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/konqueror-3.5.5.ebuild,v 1.10 2006/12/11 11:54:20 kloeri Exp $ - -KMNAME=kdebase -# Note: we need >=kdelibs-3.3.2-r1, but we don't want 3.3.3! -MAXKDEVER=$PV -KM_DEPRANGE="$PV $MAXKDEVER" -inherit kde-meta eutils - -DESCRIPTION="KDE: Web browser, file manager, ..." -KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="java kdehiddenvisibility" - -DEPEND=" -$(deprange $PV $MAXKDEVER kde-base/libkonq)" - -RDEPEND="${DEPEND} -$(deprange $PV $MAXKDEVER kde-base/kcontrol) -$(deprange $PV $MAXKDEVER kde-base/kdebase-kioslaves) -$(deprange $PV $MAXKDEVER kde-base/kfind) -java? ( >=virtual/jre-1.4 )" - -KMCOPYLIB="libkonq libkonq" -KMEXTRACTONLY=kdesktop/KDesktopIface.h diff --git a/kde-base/konqueror/konqueror-3.5.6-r1.ebuild b/kde-base/konqueror/konqueror-3.5.6-r1.ebuild deleted file mode 100644 index 35fdee819c2a..000000000000 --- a/kde-base/konqueror/konqueror-3.5.6-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/konqueror-3.5.6-r1.ebuild,v 1.1 2007/07/25 17:35:28 carlo Exp $ - -KMNAME=kdebase -# Note: we need >=kdelibs-3.3.2-r1, but we don't want 3.3.3! -MAXKDEVER=$PV -KM_DEPRANGE="$PV $MAXKDEVER" -inherit kde-meta eutils - -SRC_URI="${SRC_URI} - mirror://gentoo/kdebase-3.5-patchset-06.tar.bz2" - -DESCRIPTION="KDE: Web browser, file manager, ..." -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="java kdehiddenvisibility" - -DEPEND=" -$(deprange $PV $MAXKDEVER kde-base/libkonq)" - -RDEPEND="${DEPEND} - $(deprange $PV $MAXKDEVER kde-base/kcontrol) - $(deprange $PV $MAXKDEVER kde-base/kdebase-kioslaves) - $(deprange $PV $MAXKDEVER kde-base/kfind) - java? ( >=virtual/jre-1.4 )" - -KMCOPYLIB="libkonq libkonq" -KMEXTRACTONLY=kdesktop/KDesktopIface.h - -pkg_preinst() { - kde_pkg_preinst - - # We need to symlink here, as kfmclient freaks out completely, - # if it does not find konqueror.desktop in the legacy path. - dodir ${PREFIX}/share/applications/kde - dosym ../../applnk/konqueror.desktop ${PREFIX}/share/applications/kde/konqueror.desktop -} diff --git a/kde-base/konqueror/konqueror-3.5.6.ebuild b/kde-base/konqueror/konqueror-3.5.6.ebuild deleted file mode 100644 index 7b5799880376..000000000000 --- a/kde-base/konqueror/konqueror-3.5.6.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/konqueror-3.5.6.ebuild,v 1.2 2007/04/25 08:26:50 carlo Exp $ - -KMNAME=kdebase -# Note: we need >=kdelibs-3.3.2-r1, but we don't want 3.3.3! -MAXKDEVER=$PV -KM_DEPRANGE="$PV $MAXKDEVER" -inherit kde-meta eutils - -DESCRIPTION="KDE: Web browser, file manager, ..." -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="java kdehiddenvisibility" - -DEPEND=" -$(deprange $PV $MAXKDEVER kde-base/libkonq)" - -RDEPEND="${DEPEND} -$(deprange $PV $MAXKDEVER kde-base/kcontrol) -$(deprange $PV $MAXKDEVER kde-base/kdebase-kioslaves) -$(deprange $PV $MAXKDEVER kde-base/kfind) -java? ( >=virtual/jre-1.4 )" - -KMCOPYLIB="libkonq libkonq" -KMEXTRACTONLY=kdesktop/KDesktopIface.h - -pkg_preinst() { - kde_pkg_preinst - - # We need to symlink here, as kfmclient freaks out completely, - # if it does not find konqueror.desktop in the legacy path. - dodir ${PREFIX}/share/applications/kde - dosym ../../applnk/konqueror.desktop ${PREFIX}/share/applications/kde/konqueror.desktop -} diff --git a/kde-base/konqueror/konqueror-3.5.7-r1.ebuild b/kde-base/konqueror/konqueror-3.5.7-r1.ebuild deleted file mode 100644 index 354331843cb4..000000000000 --- a/kde-base/konqueror/konqueror-3.5.7-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/konqueror-3.5.7-r1.ebuild,v 1.1 2007/07/20 19:50:06 cryos Exp $ - -KMNAME=kdebase -# Note: we need >=kdelibs-3.3.2-r1, but we don't want 3.3.3! -MAXKDEVER=$PV -KM_DEPRANGE="$PV $MAXKDEVER" -inherit kde-meta eutils - -DESCRIPTION="KDE: Web browser, file manager, ..." -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="java kdehiddenvisibility" - -DEPEND=" -$(deprange $PV $MAXKDEVER kde-base/libkonq)" - -RDEPEND="${DEPEND} -$(deprange $PV $MAXKDEVER kde-base/kcontrol) -$(deprange $PV $MAXKDEVER kde-base/kdebase-kioslaves) -$(deprange $PV $MAXKDEVER kde-base/kfind) -java? ( >=virtual/jre-1.4 )" - -PATCHES="${FILESDIR}/${P}-location.patch" - -KMCOPYLIB="libkonq libkonq" -KMEXTRACTONLY=kdesktop/KDesktopIface.h - -pkg_preinst() { - kde_pkg_preinst - - # We need to symlink here, as kfmclient freaks out completely, - # if it does not find konqueror.desktop in the legacy path. - dodir ${PREFIX}/share/applications/kde - dosym ../../applnk/konqueror.desktop ${PREFIX}/share/applications/kde/konqueror.desktop -} - -src_install() { - kde_src_install - - dodir ${PREFIX}/share/services/searchproviders - insinto ${PREFIX}/share/services/searchproviders - doins ${FILESDIR}/*.desktop -} - -pkg_postinst() { - kde_pkg_postinst - - echo - elog "We've added three Gentoo-related web shortcuts:" - elog "- gb Gentoo Bugzilla searching" - elog "- gf Gentoo Forums searching" - elog "- gp Gentoo Package searching" - echo - elog "You'll have to activate them in 'Configure Konqueror...'." - echo - elog "If you can't open new ${PN} windows and get something like" - elog "'WARNING: Outdated database found' when starting ${PN} in a console, run" - elog "kbuildsycoca as the user you're running KDE under." - elog "This is NOT a bug." - echo -} diff --git a/kde-base/konqueror/konqueror-3.5.7-r2.ebuild b/kde-base/konqueror/konqueror-3.5.7-r2.ebuild deleted file mode 100644 index 4bd5d1bfe039..000000000000 --- a/kde-base/konqueror/konqueror-3.5.7-r2.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/konqueror-3.5.7-r2.ebuild,v 1.7 2007/08/11 16:49:56 armin76 Exp $ - -KMNAME=kdebase -# Note: we need >=kdelibs-3.3.2-r1, but we don't want 3.3.3! -MAXKDEVER=$PV -KM_DEPRANGE="$PV $MAXKDEVER" -inherit kde-meta eutils - -SRC_URI="${SRC_URI} - mirror://gentoo/kdebase-3.5-patchset-06.tar.bz2" - -DESCRIPTION="KDE: Web browser, file manager, ..." -KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="branding java kdehiddenvisibility" - -DEPEND=" -$(deprange $PV $MAXKDEVER kde-base/libkonq)" - -RDEPEND="${DEPEND} - $(deprange $PV $MAXKDEVER kde-base/kcontrol) - $(deprange $PV $MAXKDEVER kde-base/kdebase-kioslaves) - $(deprange $PV $MAXKDEVER kde-base/kfind) - java? ( >=virtual/jre-1.4 )" - -KMCOPYLIB="libkonq libkonq" -KMEXTRACTONLY=kdesktop/KDesktopIface.h - -pkg_preinst() { - kde_pkg_preinst - - # We need to symlink here, as kfmclient freaks out completely, - # if it does not find konqueror.desktop in the legacy path. - dodir ${PREFIX}/share/applications/kde - dosym ../../applnk/konqueror.desktop ${PREFIX}/share/applications/kde/konqueror.desktop -} - -src_install() { - kde_src_install - - if use branding ; then - dodir ${PREFIX}/share/services/searchproviders - insinto ${PREFIX}/share/services/searchproviders - doins ${WORKDIR}/patches/*.desktop - fi -} - -pkg_postinst() { - kde_pkg_postinst - - if use branding ; then - echo - elog "We've added three Gentoo-related web shortcuts:" - elog "- gb Gentoo Bugzilla searching" - elog "- gf Gentoo Forums searching" - elog "- gp Gentoo Package searching" - echo - elog "You'll have to activate them in 'Configure Konqueror...'." - echo - elog "If you can't open new ${PN} windows and get something like" - elog "'WARNING: Outdated database found' when starting ${PN} in a console, run" - elog "kbuildsycoca as the user you're running KDE under." - elog "This is NOT a bug." - echo - fi -} diff --git a/kde-base/konqueror/konqueror-3.5.7-r3.ebuild b/kde-base/konqueror/konqueror-3.5.7-r3.ebuild deleted file mode 100644 index 5f0c891645a6..000000000000 --- a/kde-base/konqueror/konqueror-3.5.7-r3.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/konqueror-3.5.7-r3.ebuild,v 1.6 2007/09/26 10:37:26 armin76 Exp $ - -KMNAME=kdebase -# Note: we need >=kdelibs-3.3.2-r1, but we don't want 3.3.3! -MAXKDEVER=$PV -KM_DEPRANGE="$PV $MAXKDEVER" -inherit kde-meta eutils - -SRC_URI="${SRC_URI} - mirror://gentoo/kdebase-3.5-patchset-06.tar.bz2" - -DESCRIPTION="KDE: Web browser, file manager, ..." -KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="branding java kdehiddenvisibility" - -DEPEND=" -$(deprange $PV $MAXKDEVER kde-base/libkonq)" - -RDEPEND="${DEPEND} - $(deprange $PV $MAXKDEVER kde-base/kcontrol) - $(deprange $PV $MAXKDEVER kde-base/kdebase-kioslaves) - $(deprange $PV $MAXKDEVER kde-base/kfind) - java? ( >=virtual/jre-1.4 )" - -KMCOPYLIB="libkonq libkonq" -KMEXTRACTONLY=kdesktop/KDesktopIface.h - -PATCHES="${FILESDIR}/${P}-185603-spoofing.diff" - -pkg_preinst() { - kde_pkg_preinst - - # We need to symlink here, as kfmclient freaks out completely, - # if it does not find konqueror.desktop in the legacy path. - dodir ${PREFIX}/share/applications/kde - dosym ../../applnk/konqueror.desktop ${PREFIX}/share/applications/kde/konqueror.desktop -} - -src_install() { - kde_src_install - - if use branding ; then - dodir ${PREFIX}/share/services/searchproviders - insinto ${PREFIX}/share/services/searchproviders - doins ${WORKDIR}/patches/*.desktop - fi -} - -pkg_postinst() { - kde_pkg_postinst - - if use branding ; then - echo - elog "We've added three Gentoo-related web shortcuts:" - elog "- gb Gentoo Bugzilla searching" - elog "- gf Gentoo Forums searching" - elog "- gp Gentoo Package searching" - echo - elog "You'll have to activate them in 'Configure Konqueror...'." - fi - echo - elog "If you can't open new ${PN} windows and get something like" - elog "'WARNING: Outdated database found' when starting ${PN} in a console, run" - elog "kbuildsycoca as the user you're running KDE under." - elog "This is NOT a bug." - echo -} diff --git a/kde-base/konqueror/konqueror-3.5.7.ebuild b/kde-base/konqueror/konqueror-3.5.7.ebuild deleted file mode 100644 index f70ac876a952..000000000000 --- a/kde-base/konqueror/konqueror-3.5.7.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/konqueror-3.5.7.ebuild,v 1.3 2007/06/23 18:08:23 philantrop Exp $ - -KMNAME=kdebase -# Note: we need >=kdelibs-3.3.2-r1, but we don't want 3.3.3! -MAXKDEVER=$PV -KM_DEPRANGE="$PV $MAXKDEVER" -inherit kde-meta eutils - -DESCRIPTION="KDE: Web browser, file manager, ..." -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="java kdehiddenvisibility" - -DEPEND=" -$(deprange $PV $MAXKDEVER kde-base/libkonq)" - -RDEPEND="${DEPEND} -$(deprange $PV $MAXKDEVER kde-base/kcontrol) -$(deprange $PV $MAXKDEVER kde-base/kdebase-kioslaves) -$(deprange $PV $MAXKDEVER kde-base/kfind) -java? ( >=virtual/jre-1.4 )" - -KMCOPYLIB="libkonq libkonq" -KMEXTRACTONLY=kdesktop/KDesktopIface.h - -pkg_preinst() { - kde_pkg_preinst - - # We need to symlink here, as kfmclient freaks out completely, - # if it does not find konqueror.desktop in the legacy path. - dodir ${PREFIX}/share/applications/kde - dosym ../../applnk/konqueror.desktop ${PREFIX}/share/applications/kde/konqueror.desktop -} - -src_install() { - kde_src_install - - dodir ${PREFIX}/share/services/searchproviders - insinto ${PREFIX}/share/services/searchproviders - doins ${FILESDIR}/*.desktop -} - -pkg_postinst() { - kde_pkg_postinst - - echo - elog "We've added three Gentoo-related web shortcuts:" - elog "- gb Gentoo Bugzilla searching" - elog "- gf Gentoo Forums searching" - elog "- gp Gentoo Package searching" - echo - elog "You'll have to activate them in 'Configure Konqueror...'." - echo - elog "If you can't open new ${PN} windows and get something like" - elog "'WARNING: Outdated database found' when starting ${PN} in a console, run" - elog "kbuildsycoca as the user you're running KDE under." - elog "This is NOT a bug." - echo -} diff --git a/kde-base/konqueror/konqueror-4.0.0.ebuild b/kde-base/konqueror/konqueror-4.0.0.ebuild deleted file mode 100644 index 7bacd7195269..000000000000 --- a/kde-base/konqueror/konqueror-4.0.0.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# 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 -} |