Spring cleaning.

Package-Manager: portage-2.1.4.4

12 files changed, 10 insertions, 286 deletions

diff --git a/kde-base/nsplugins/ChangeLog b/kde-base/nsplugins/ChangeLog
index f3ab2ede726d..2d504d2b0e60 100644
--- a/kde-base/nsplugins/ChangeLog
+++ b/kde-base/nsplugins/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for kde-base/nsplugins
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/ChangeLog,v 1.104 2008/02/07 00:12:50 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/ChangeLog,v 1.105 2008/02/17 01:54:15 ingmar Exp $
+
+  16 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  -files/nsplugins-3.5.5-npapi-64bit.patch,
+  -files/nsplugins-3.5.6-keyboard-handler.diff, -nsplugins-3.5.5.ebuild,
+  -nsplugins-3.5.5-r1.ebuild, -nsplugins-3.5.5-r2.ebuild,
+  -nsplugins-3.5.6.ebuild, -nsplugins-3.5.6-r1.ebuild,
+  -nsplugins-3.5.6-r2.ebuild, -nsplugins-3.5.7.ebuild,
+  -nsplugins-3.5.8.ebuild, -nsplugins-4.0.0.ebuild:
+  Spring cleaning
 
 *nsplugins-4.0.1 (06 Feb 2008)
 
diff --git a/kde-base/nsplugins/files/nsplugins-3.5.5-npapi-64bit.patch b/kde-base/nsplugins/files/nsplugins-3.5.5-npapi-64bit.patch
deleted file mode 100644
index 090219caa0b4..000000000000
--- a/kde-base/nsplugins/files/nsplugins-3.5.5-npapi-64bit.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- kdebase-3.4.2/nsplugins/sdk/npapi.h.npapi-64bit-fixes	2005-05-23 14:14:25.000000000 +0200
-+++ kdebase-3.4.2/nsplugins/sdk/npapi.h	2006-11-13 10:49:45.000000000 +0100
-@@ -58,7 +58,7 @@
- typedef unsigned short uint16;
- #endif
- #ifndef _UINT32
--#if defined(__alpha)
-+#if defined(__alpha) || defined(_AIX) || defined(__x86_64__) || defined(__LP64__)
- typedef unsigned int uint32;
- #else /* __alpha */
- typedef unsigned long uint32;
-@@ -68,7 +68,7 @@ typedef unsigned long uint32;
- typedef short int16;
- #endif
- #ifndef _INT32
--#if defined(__alpha) || defined(_AIX)
-+#if defined(__alpha) || defined(_AIX) || defined(__x86_64__) || defined(__LP64__)
- typedef int int32;
- #else /* __alpha || _AIX */
- typedef long int32;
diff --git a/kde-base/nsplugins/files/nsplugins-3.5.6-keyboard-handler.diff b/kde-base/nsplugins/files/nsplugins-3.5.6-keyboard-handler.diff
deleted file mode 100644
index 8d301d6d4e69..000000000000
--- a/kde-base/nsplugins/files/nsplugins-3.5.6-keyboard-handler.diff
+++ /dev/null
@@ -1,77 +0,0 @@
-------------------------------------------------------------------------
-r652585 | lunakl | 2007-04-11 16:26:32 +0200 (Wed, 11 Apr 2007) | 3 lines
-Changed paths:
-   M /branches/KDE/3.5/kdebase/nsplugins/viewer/qxteventloop.cpp
-
-Fix keyboard events handling.
-
-
-------------------------------------------------------------------------
-Index: nsplugins/viewer/qxteventloop.cpp
-===================================================================
---- nsplugins/viewer/qxteventloop.cpp	(revision 652584)
-+++ nsplugins/viewer/qxteventloop.cpp	(revision 652585)
-@@ -32,12 +32,16 @@
- ** not clear to you.
- **
- **********************************************************************/
-+
-+#include <config.h>
-+
- #include "qxteventloop.h"
- 
- #if QT_VERSION >= 0x030100
- 
- #include <qapplication.h>
- #include <qwidgetintdict.h>
-+#include <kglobal.h>
- 
- // resolve the conflict between X11's FocusIn and QEvent::FocusIn
- const int XFocusOut = FocusOut;
-@@ -52,6 +56,8 @@ const int XKeyRelease = KeyRelease;
- 
- Boolean qmotif_event_dispatcher( XEvent *event );
- 
-+static void handle_xquerykeymap( Display* dpy, XEvent* event );
-+
- class QXtEventLoopPrivate
- {
- public:
-@@ -147,6 +153,7 @@ void QXtEventLoopPrivate::unhook()
- extern bool qt_try_modal( QWidget *, XEvent * ); // defined in qapplication_x11.cpp
- Boolean qmotif_event_dispatcher( XEvent *event )
- {
-+    handle_xquerykeymap( qt_xdisplay(), event );
-     QApplication::sendPostedEvents();
- 
-     QWidgetIntDict *mapper = &static_d->mapper;
-@@ -462,6 +469,29 @@ bool QXtEventLoop::processEvents( Proces
-     return ( (flags & WaitForMore) || ( pendingmask != 0 ) || nevents > 0 );
- }
- 
-+#include <dlfcn.h>
-+
-+static char xquerykeymap_data[ 32 ];
-+static int (*real_xquerykeymap)( Display*, char[32] ) = NULL;
-+
-+static void handle_xquerykeymap( Display* dpy, XEvent* event )
-+{
-+    if( real_xquerykeymap == NULL )
-+        real_xquerykeymap = (int (*)( Display*, char[32] )) dlsym( RTLD_NEXT, "XQueryKeymap" );
-+    if( event->type == XFocusIn || event->type == XKeyPress || event->type == XKeyRelease )
-+        real_xquerykeymap( dpy, xquerykeymap_data );
-+    if( event->type == XFocusOut )
-+        memset( xquerykeymap_data, 0, 32 );
-+}
-+
-+extern "C" KDE_EXPORT
-+int XQueryKeymap( Display* , char k[32] )
-+{
-+    memcpy( k, xquerykeymap_data, 32 );
-+    return 1;
-+}
-+
-+
- #include "qxteventloop.moc"
- 
- #endif
diff --git a/kde-base/nsplugins/nsplugins-3.5.5-r1.ebuild b/kde-base/nsplugins/nsplugins-3.5.5-r1.ebuild
deleted file mode 100644
index b14aa417b72e..000000000000
--- a/kde-base/nsplugins/nsplugins-3.5.5-r1.ebuild
+++ /dev/null
@@ -1,22 +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/nsplugins/nsplugins-3.5.5-r1.ebuild,v 1.8 2007/03/26 20:47:59 armin76 Exp $
-
-KMNAME=kdebase
-MAXKDEVER=$PV
-KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta eutils
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/kdebase-3.5-patchset-03.tar.bz2"
-
-DESCRIPTION="Netscape plugins support for Konqueror."
-KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="kdehiddenvisibility"
-
-PATCHES="${FILESDIR}/${P}-npapi-64bit.patch"
-
-src_unpack() {
-	kde-meta_src_unpack
-	sed -i -e "s:SUBDIRS = viewer test:SUBDIRS = viewer:" ${S}/nsplugins/Makefile.am || die "sed failed"
-}
diff --git a/kde-base/nsplugins/nsplugins-3.5.5-r2.ebuild b/kde-base/nsplugins/nsplugins-3.5.5-r2.ebuild
deleted file mode 100644
index 47b1b0092518..000000000000
--- a/kde-base/nsplugins/nsplugins-3.5.5-r2.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-base/nsplugins/nsplugins-3.5.5-r2.ebuild,v 1.8 2007/06/05 16:20:53 dertobi123 Exp $
-
-KMNAME=kdebase
-MAXKDEVER=$PV
-KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta eutils
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/kdebase-3.5-patchset-03.tar.bz2"
-
-DESCRIPTION="Netscape plugins support for Konqueror."
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="kdehiddenvisibility"
-
-PATCHES="${FILESDIR}/${P}-npapi-64bit.patch
-	${FILESDIR}/nsplugins-3.5.6-keyboard-handler.diff"
-
-src_unpack() {
-	kde-meta_src_unpack
-	sed -i -e "s:SUBDIRS = viewer test:SUBDIRS = viewer:" ${S}/nsplugins/Makefile.am || die "sed failed"
-}
diff --git a/kde-base/nsplugins/nsplugins-3.5.5.ebuild b/kde-base/nsplugins/nsplugins-3.5.5.ebuild
deleted file mode 100644
index 29f1f6ba66aa..000000000000
--- a/kde-base/nsplugins/nsplugins-3.5.5.ebuild
+++ /dev/null
@@ -1,20 +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/nsplugins/nsplugins-3.5.5.ebuild,v 1.10 2007/02/04 08:21:14 mr_bones_ Exp $
-
-KMNAME=kdebase
-MAXKDEVER=$PV
-KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta eutils
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/kdebase-3.5-patchset-03.tar.bz2"
-
-DESCRIPTION="Netscape plugins support for Konqueror."
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="kdehiddenvisibility"
-
-src_unpack() {
-	kde-meta_src_unpack
-	sed -i -e "s:SUBDIRS = viewer test:SUBDIRS = viewer:" ${S}/nsplugins/Makefile.am || die "sed failed"
-}
diff --git a/kde-base/nsplugins/nsplugins-3.5.6-r1.ebuild b/kde-base/nsplugins/nsplugins-3.5.6-r1.ebuild
deleted file mode 100644
index 6b03c6bb00b5..000000000000
--- a/kde-base/nsplugins/nsplugins-3.5.6-r1.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-base/nsplugins/nsplugins-3.5.6-r1.ebuild,v 1.1 2007/04/19 16:20:26 carlo Exp $
-
-KMNAME=kdebase
-MAXKDEVER=$PV
-KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta eutils
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/kdebase-3.5-patchset-03.tar.bz2"
-
-DESCRIPTION="Netscape plugins support for Konqueror."
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="kdehiddenvisibility"
-
-PATCHES="${FILESDIR}/${PN}-3.5.5-npapi-64bit.patch
-	${FILESDIR}/nsplugins-3.5.6-keyboard-handler.diff"
-
-src_unpack() {
-	kde-meta_src_unpack
-	sed -i -e "s:SUBDIRS = viewer test:SUBDIRS = viewer:" ${S}/nsplugins/Makefile.am || die "sed failed"
-}
diff --git a/kde-base/nsplugins/nsplugins-3.5.6-r2.ebuild b/kde-base/nsplugins/nsplugins-3.5.6-r2.ebuild
deleted file mode 100644
index 3675f2c7ff4a..000000000000
--- a/kde-base/nsplugins/nsplugins-3.5.6-r2.ebuild
+++ /dev/null
@@ -1,20 +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/nsplugins/nsplugins-3.5.6-r2.ebuild,v 1.1 2007/04/30 20:11:43 carlo Exp $
-
-KMNAME=kdebase
-MAXKDEVER=$PV
-KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta eutils
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/kdebase-3.5-patchset-04.tar.bz2"
-
-DESCRIPTION="Netscape plugins support for Konqueror."
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="kdehiddenvisibility"
-
-src_unpack() {
-	kde-meta_src_unpack
-	sed -i -e "s:SUBDIRS = viewer test:SUBDIRS = viewer:" ${S}/nsplugins/Makefile.am || die "sed failed"
-}
diff --git a/kde-base/nsplugins/nsplugins-3.5.6.ebuild b/kde-base/nsplugins/nsplugins-3.5.6.ebuild
deleted file mode 100644
index 517edc9caadb..000000000000
--- a/kde-base/nsplugins/nsplugins-3.5.6.ebuild
+++ /dev/null
@@ -1,22 +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/nsplugins/nsplugins-3.5.6.ebuild,v 1.3 2007/02/04 08:21:14 mr_bones_ Exp $
-
-KMNAME=kdebase
-MAXKDEVER=$PV
-KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta eutils
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/kdebase-3.5-patchset-03.tar.bz2"
-
-DESCRIPTION="Netscape plugins support for Konqueror."
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="kdehiddenvisibility"
-
-PATCHES="${FILESDIR}/${PN}-3.5.5-npapi-64bit.patch"
-
-src_unpack() {
-	kde-meta_src_unpack
-	sed -i -e "s:SUBDIRS = viewer test:SUBDIRS = viewer:" ${S}/nsplugins/Makefile.am || die "sed failed"
-}
diff --git a/kde-base/nsplugins/nsplugins-3.5.7.ebuild b/kde-base/nsplugins/nsplugins-3.5.7.ebuild
deleted file mode 100644
index 33148b76bf75..000000000000
--- a/kde-base/nsplugins/nsplugins-3.5.7.ebuild
+++ /dev/null
@@ -1,20 +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/nsplugins/nsplugins-3.5.7.ebuild,v 1.8 2007/08/11 16:26:34 armin76 Exp $
-
-KMNAME=kdebase
-MAXKDEVER=$PV
-KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta eutils
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/kdebase-3.5-patchset-05.tar.bz2"
-
-DESCRIPTION="Netscape plugins support for Konqueror."
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="kdehiddenvisibility"
-
-src_unpack() {
-	kde-meta_src_unpack
-	sed -i -e "s:SUBDIRS = viewer test:SUBDIRS = viewer:" ${S}/nsplugins/Makefile.am || die "sed failed"
-}
diff --git a/kde-base/nsplugins/nsplugins-3.5.8.ebuild b/kde-base/nsplugins/nsplugins-3.5.8.ebuild
deleted file mode 100644
index 874d4404a521..000000000000
--- a/kde-base/nsplugins/nsplugins-3.5.8.ebuild
+++ /dev/null
@@ -1,20 +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/nsplugins/nsplugins-3.5.8.ebuild,v 1.1 2007/10/19 23:56:37 philantrop Exp $
-
-KMNAME=kdebase
-MAXKDEVER=$PV
-KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta eutils
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/kdebase-3.5-patchset-05.tar.bz2"
-
-DESCRIPTION="Netscape plugins support for Konqueror."
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="kdehiddenvisibility"
-
-src_unpack() {
-	kde-meta_src_unpack
-	sed -i -e "s:SUBDIRS = viewer test:SUBDIRS = viewer:" "${S}/nsplugins/Makefile.am" || die "sed failed"
-}
diff --git a/kde-base/nsplugins/nsplugins-4.0.0.ebuild b/kde-base/nsplugins/nsplugins-4.0.0.ebuild
deleted file mode 100644
index 1983385b4ed2..000000000000
--- a/kde-base/nsplugins/nsplugins-4.0.0.ebuild
+++ /dev/null
@@ -1,18 +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/nsplugins/nsplugins-4.0.0.ebuild,v 1.1 2008/01/18 01:46:49 ingmar Exp $
-
-EAPI="1"
-
-KMNAME=kdebase
-KMMODULE=apps/${PN}
-inherit kde4-meta
-
-DESCRIPTION="Netscape plugins support for Konqueror."
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="
-	>=kde-base/konqueror-${PV}:${SLOT}
-	x11-libs/libXt"
-RDEPEND="${DEPEND}"