Old.

(Portage version: 2.1.4.4)

5 files changed, 6 insertions, 267 deletions

diff --git a/kde-misc/kerry/ChangeLog b/kde-misc/kerry/ChangeLog
index 6fa94fdd0609..1413f9e0996c 100644
--- a/kde-misc/kerry/ChangeLog
+++ b/kde-misc/kerry/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-misc/kerry
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kerry/ChangeLog,v 1.12 2008/02/18 22:37:51 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kerry/ChangeLog,v 1.13 2008/02/18 22:39:50 ingmar Exp $
+
+  18 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -files/kerry-0.1-ebuilds-2.patch, -files/kerry-0.09-del-shortcut.patch,
+  -kerry-0.1-r2.ebuild, -kerry-0.1.90.ebuild:
+  Old.
 
   18 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> kerry-0.2.1.ebuild:
   Update kde-base/* dependencies so that KDE 4 doesn't satisfy it. bug 206571.
diff --git a/kde-misc/kerry/files/kerry-0.09-del-shortcut.patch b/kde-misc/kerry/files/kerry-0.09-del-shortcut.patch
deleted file mode 100644
index a96574456687..000000000000
--- a/kde-misc/kerry/files/kerry-0.09-del-shortcut.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- kerry/src.orig/kerryapp.cpp	2006-02-10 14:59:58.000000000 +0100
-+++ kerry/src/kerryapp.cpp	2006-03-21 10:35:07.000000000 +0100
-@@ -110,8 +110,7 @@
-   KGlobalAccel* keys = globalKeys;
-   keys->insert( "Program:kerry", i18n("Kerry Beagle Search") );
- 
--  KShortcut showDialogShortcut = KShortcut(Key_F12);
--  showDialogShortcut.append( KKey( ALT+Key_Space) );
-+  KShortcut showDialogShortcut = KShortcut(ALT+Key_Space);
-   keys->insert( "Show Kerry Dialog", i18n("Show Search Dialog"), QString::null, showDialogShortcut, showDialogShortcut, hitListWindow, SLOT(showSearchDialog()) );
-   keys->insert( "Search Primary Selection with Kerry", i18n("Search Primary Selection"), QString::null, CTRL+ALT+Key_Space, CTRL+ALT+Key_Space, this, SLOT(searchPrimarySelection()) );
-   globalKeys->readSettings();
diff --git a/kde-misc/kerry/files/kerry-0.1-ebuilds-2.patch b/kde-misc/kerry/files/kerry-0.1-ebuilds-2.patch
deleted file mode 100644
index e3bf056add04..000000000000
--- a/kde-misc/kerry/files/kerry-0.1-ebuilds-2.patch
+++ /dev/null
@@ -1,205 +0,0 @@
-diff -ru kerry-0.1/src/beaglesearch.cpp kerry-0.1-double/src/beaglesearch.cpp
---- kerry-0.1/src/beaglesearch.cpp	2006-04-03 10:50:47.000000000 -0500
-+++ kerry-0.1-double/src/beaglesearch.cpp	2006-04-07 17:01:50.000000000 -0500
-@@ -83,6 +83,14 @@
-        { BeagleSearch::Website, "dc:title", 0 },
-        { BeagleSearch::Website, "Title", 0 },
-        { BeagleSearch::Note, "dc:title", 0 },
-+// Gentoo ebuilds
-+       { BeagleSearch::Ebuilds, "dc:title", I18N_NOOP("Title: %1")"<br>" },
-+       { BeagleSearch::Ebuilds, "dc:description", 0 },
-+       { BeagleSearch::Ebuilds, "fixme:version", I18N_NOOP("Version: %1")"<br>" },
-+       { BeagleSearch::Ebuilds, "dc:source", 0 },
-+       { BeagleSearch::Ebuilds, "fixme:download_size", 0 },
-+       { BeagleSearch::Ebuilds, "fixme:install_time", 0 },
-+       { BeagleSearch::Ebuilds, "fixme:contents_byte_count", 0 },
-        { BeagleSearch::Unknown, "dc:author", I18N_NOOP("Author: %1")"<br>" },
-        { BeagleSearch::Unknown, "dc:title", I18N_NOOP("Title: %1")"<br>" },
- // Calendar
-@@ -148,6 +156,7 @@
-        { BeagleSearch::Website, 0, "Google", 0 },
-        { BeagleSearch::Website, 0, "WebHistory", 0 },
-        { BeagleSearch::Website, 0, 0, "beagle/x-konq-cache" },
-+       { BeagleSearch::Ebuilds, "*.ebuild", 0, 0 },
-        { BeagleSearch::Unknown, "file://", "File", 0 },  // mimetype wildcard must be last
-        { 0, 0, 0, 0}
- };
-Only in kerry-0.1-double/src: beaglesearch.cpp.orig
-diff -ru kerry-0.1/src/beaglesearch.h kerry-0.1-double/src/beaglesearch.h
---- kerry-0.1/src/beaglesearch.h	2006-02-14 05:07:44.000000000 -0600
-+++ kerry-0.1-double/src/beaglesearch.h	2006-04-07 16:59:14.000000000 -0500
-@@ -51,7 +51,8 @@
- 	Conversations,  // in combo box
- 	Website,        // in combo box
- 	Feed,
--	Note
-+	Note,
-+	Ebuilds
- };
- 
- typedef QValueList<QString> PropertyList;
-diff -ru kerry-0.1/src/searchdlg.cpp kerry-0.1-double/src/searchdlg.cpp
---- kerry-0.1/src/searchdlg.cpp	2006-03-13 04:40:58.000000000 -0600
-+++ kerry-0.1-double/src/searchdlg.cpp	2006-04-08 19:52:37.000000000 -0500
-@@ -548,6 +548,82 @@
-         item->insertHeaderWidget(0,headerFileLabel);
-         connect(headerFileLabel, SIGNAL(leftClickedURL()), SLOT(slotOpen()));
-       }
-+      else if (result->tilegroup == BeagleSearch::Ebuilds) {
-+        item->icon->setPixmap(KGlobal::iconLoader()->loadIcon("kuroo", KIcon::NoGroup, KIcon::SizeLarge));
-+    
-+        KerryLabel *headerFileLabel = new KerryLabel(item);
-+        headerFileLabel->setText(url.fileName());
-+        headerFileLabel->setTipText(url.prettyURL());
-+        headerFileLabel->setUseTips();
-+        headerFileLabel->setURL(*(result->uri));
-+        item->insertHeaderWidget(0,headerFileLabel);
-+        connect(headerFileLabel, SIGNAL(leftClickedURL()), SLOT(slotOpen()));
-+    
-+        QLabel *headerLabel = new QLabel(item);
-+        headerLabel->setText(i18n(" from "));
-+        headerLabel->setAlignment(headerLabel->alignment() | Qt::SingleLine);
-+        item->insertHeaderWidget(1,headerLabel);
-+    
-+        QStringList _properties(result->properties);
-+        QString homepage = takeProperty("dc:source",_properties);
-+	if (!homepage.isEmpty())
-+	{
-+		KerryLabel *headerFileLabel = new KerryLabel(item);
-+		headerFileLabel->setText(homepage);
-+		headerFileLabel->setAlignment(headerFileLabel->alignment() | Qt::SingleLine);
-+		headerFileLabel->setURL(homepage);
-+		item->insertHeaderWidget(2,headerFileLabel);
-+		connect(headerFileLabel, SIGNAL(leftClickedURL(const QString&)), SLOT(slotOpenURL(const QString&)));
-+	}
-+
-+        item->setDescriptionText(takeProperty("dc:description", _properties));
-+    
-+        QString properties;
-+	QString install_time_str = takeProperty("fixme:install_time", _properties);
-+	if (!install_time_str.isEmpty())
-+	{
-+            properties=properties+i18n("Installed On: %1").arg(KGlobal::locale()->formatDateTime(datetimeFromString(install_time_str),false))+"<br>";
-+	}
-+
-+	QString install_size_str = takeProperty("fixme:contents_byte_count", _properties);
-+	if (!install_size_str.isEmpty())
-+	{
-+            properties=properties+i18n("Installed Size: %1").arg(formatBytes(install_size_str))+"<br>";
-+	}
-+
-+	QString download_size_str = takeProperty("fixme:download_size", _properties);
-+	if (!download_size_str.isEmpty())
-+	{
-+            properties=properties+i18n("Download Size: %1").arg(formatBytes(download_size_str))+"<br>";
-+	}
-+		
-+        BeagleSearch::PropertyList::iterator it;
-+        for ( it = _properties.begin(); it != _properties.end(); ++it )
-+	{
-+                properties=properties+(*it);
-+	}
-+
-+        if (result->snippet) {
-+          if (!properties.isEmpty())
-+             properties=properties+"<br>";
-+          properties=properties+*(result->snippet);
-+        }
-+   
-+        if (!properties.isEmpty())
-+            item->setPropertiesText("<qt>"+properties+"</qt>");
-+    
-+
-+        item->insertHitSpacing(2,10);
-+        buttonGo = new KURLLabel(item);
-+        buttonGo->setPixmap(SmallIcon("kfm"));
-+        item->insertHitWidget(3,buttonGo);
-+        connect(buttonGo, SIGNAL(leftClickedURL()), SLOT(slotOpenDir()));
-+    
-+        buttonGo = new KURLLabel(item);
-+        buttonGo->setText(i18n("Reveal in File Manager"));
-+        item->insertHitWidget(4,buttonGo);
-+        connect(buttonGo, SIGNAL(leftClickedURL()), SLOT(slotOpenDir()));
-+      }
-       else {
-         KFileItem *fileitem=new KFileItem(*(result->uri),*(result->mime_type),KFileItem::Unknown);
-         item->icon->setPixmap(fileitem->pixmap(KIcon::SizeHuge, KIcon::DefaultState));
-@@ -669,6 +745,9 @@
-           case Website:
- 		show = ( result->tilegroup == BeagleSearch::Website);
- 		break;
-+          case Ebuilds:
-+		show = ( result->tilegroup == BeagleSearch::Ebuilds);
-+		break;
-           default:
- 		break;
-         }
-@@ -780,6 +859,24 @@
-     }
- }
- 
-+void SearchDlg::slotOpenURL(const QString& url)
-+{
-+    KURL urlObj(url);
-+    //KRun run(urlObj);
-+    //run.setAutoDelete(false);
-+    KRun::runURL(url, "text/html", false, true);
-+}
-+
-+QString SearchDlg::formatBytes(QString& bytesStr) const
-+{
-+        static double kilobyte = 1024.0;
-+        static double megabyte = 1024.0*1024.0;
-+	double bytes = KGlobal::locale()->readNumber(bytesStr);
-+        if (bytes < megabyte)
-+                return KGlobal::locale()->formatNumber(bytes/kilobyte, 2) + "K";
-+        return KGlobal::locale()->formatNumber(bytes/megabyte, 2) + "M";
-+}
-+
- void SearchDlg::slotStartBeagle()
- {
-     if (cb_beagleStart->isChecked()) {
-diff -ru kerry-0.1/src/searchdlg.h kerry-0.1-double/src/searchdlg.h
---- kerry-0.1/src/searchdlg.h	2006-01-10 10:13:29.000000000 -0600
-+++ kerry-0.1-double/src/searchdlg.h	2006-04-08 19:50:37.000000000 -0500
-@@ -42,7 +42,8 @@
- 		Conversations,
- 		Images,
- 		Media,
--                Website
-+                Website,
-+		Ebuilds
- 	};
- 
- 	enum SortType {
-@@ -85,6 +86,7 @@
-     void slotOpenDir();
-     void slotMailTo(const QString&);
-     void slotOpenEvolution(const QString&);
-+    void slotOpenURL(const QString&);
-     void slotContextMenu( int row, int col, const QPoint & pos );
-     void slotPreview(const KFileItem *, const QPixmap &);
-     void slotPreviewResult();
-@@ -99,6 +101,7 @@
-     void fillTableHits();
-     void updateStatus();
-     void showQuickTips();
-+    QString formatBytes(QString& bytesStr) const;
-     QCheckBox* cb_beagleStart;
- 
-     void displayResults(BeagleSearch::BeagleResultList &items);
-diff -ru kerry-0.1/src/searchdlg_layout.ui kerry-0.1-double/src/searchdlg_layout.ui
---- kerry-0.1/src/searchdlg_layout.ui	2006-03-24 02:58:25.000000000 -0600
-+++ kerry-0.1-double/src/searchdlg_layout.ui	2006-04-07 16:59:14.000000000 -0500
-@@ -250,6 +250,11 @@
-                             <string>Web Pages</string>
-                         </property>
- 		    </item>
-+                    <item>
-+                        <property name="text">
-+                            <string>Ebuilds</string>
-+                        </property>
-+		    </item>
-                     <property name="name">
-                         <cstring>comboShow</cstring>
-                     </property>
diff --git a/kde-misc/kerry/kerry-0.1-r2.ebuild b/kde-misc/kerry/kerry-0.1-r2.ebuild
deleted file mode 100644
index b995fd537b26..000000000000
--- a/kde-misc/kerry/kerry-0.1-r2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kerry/kerry-0.1-r2.ebuild,v 1.3 2007/07/13 05:55:28 mr_bones_ Exp $
-
-inherit kde
-
-DESCRIPTION="Kerry Beagle is a KDE frontend for the Beagle desktop search daemon"
-HOMEPAGE="http://en.opensuse.org/Kerry"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-SRC_URI="http://developer.kde.org/~binner/kerry/${P}.tar.bz2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=app-misc/beagle-0.2"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	|| ( kde-base/libkonq kde-base/kdebase )"
-
-S=${WORKDIR}/${PN}
-
-need-kde 3.4
-
-PATCHES="${FILESDIR}/${P}-ebuilds-2.patch
-	${FILESDIR}/${PN}-0.09-del-shortcut.patch"
diff --git a/kde-misc/kerry/kerry-0.1.90.ebuild b/kde-misc/kerry/kerry-0.1.90.ebuild
deleted file mode 100644
index 0ee2c3318c36..000000000000
--- a/kde-misc/kerry/kerry-0.1.90.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kerry/kerry-0.1.90.ebuild,v 1.3 2007/07/13 05:55:28 mr_bones_ Exp $
-
-inherit kde
-
-DESCRIPTION="Kerry Beagle is a KDE frontend for the Beagle desktop search daemon"
-HOMEPAGE="http://en.opensuse.org/Kerry"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-SRC_URI="http://developer.kde.org/~binner/kerry/${P}.tar.bz2"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=app-misc/beagle-0.2.5"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	|| ( kde-base/libkonq kde-base/kdebase )"
-
-need-kde 3.4
-
-PATCHES="${FILESDIR}/${PN}-0.09-del-shortcut.patch"