Blacklist xpi files, bug 408695

Package-Manager: portage-2.1.10.54/cvs/Linux x86_64

4 files changed, 63 insertions, 10 deletions

diff --git a/www-plugins/kpartsplugin/ChangeLog b/www-plugins/kpartsplugin/ChangeLog
index fa58248e2306..b3263cc184ea 100644
--- a/www-plugins/kpartsplugin/ChangeLog
+++ b/www-plugins/kpartsplugin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-plugins/kpartsplugin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/kpartsplugin/ChangeLog,v 1.7 2012/02/24 16:39:48 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/kpartsplugin/ChangeLog,v 1.8 2012/04/03 21:26:09 dilfridge Exp $
+
+*kpartsplugin-20110823-r1 (03 Apr 2012)
+
+  03 Apr 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kpartsplugin-20110823-r1.ebuild, +files/kpartsplugin-20110823-xpi.patch:
+  Blacklist xpi files, bug 408695
 
   24 Feb 2012; Johannes Huber <johu@gentoo.org> -kpartsplugin-20101216.ebuild:
   Remove old.
diff --git a/www-plugins/kpartsplugin/Manifest b/www-plugins/kpartsplugin/Manifest
index 0f082128adcb..921061b76266 100644
--- a/www-plugins/kpartsplugin/Manifest
+++ b/www-plugins/kpartsplugin/Manifest
@@ -1,18 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX kpartsplugin-20110823-xpi.patch 1705 RMD160 55326a56fbcef4d96040ff9d46324fc479c40fd0 SHA1 5640660e97ace1083785912ee8f398b9f7a51fb9 SHA256 da134398c7a457f12e9eb1b2b5658b51a4650877ea3185d0d248bfa7043a4208
 DIST kpartsplugin-20110823.tar.bz2 30362 RMD160 b3a731ecc2b44b0a49b381b3b8f3b35cf7824f82 SHA1 3f873d7c795c68440bb2fc3fc96017134a16cf61 SHA256 ce90547b3db1a02e8b93d8b851ca70c1e97eb04895cd655f0153d7c7d71c0c4a
+EBUILD kpartsplugin-20110823-r1.ebuild 754 RMD160 29179253065e788530d00f97c812343fe9292d4a SHA1 5a2c41193054beba4d907cbefe943a75bb453b8b SHA256 1e4d572cc58fda38dbef758aa1055f2a42412a286a5f8759afeccf5be2177029
 EBUILD kpartsplugin-20110823.ebuild 708 RMD160 7a6576160565890bf7c85e93ed862cb19b257dd6 SHA1 59f7997087603bd1304475b00814b25d91d9bc84 SHA256 760140296c2f9f111660ff13d19ce41b3b4e8b43d5fe20d59c6a3dbd0d926359
-MISC ChangeLog 1237 RMD160 9e332ec7e85ea9059cc9be007406ef7437509048 SHA1 efb75f8784a712fa34bb39c266f334f0b2b28d01 SHA256 9feed96142e2a570cdd0f708e79cf2229cfd652e3598bcb6e81f1fb6b072517d
+MISC ChangeLog 1451 RMD160 dcba12194fc9a2299384ecec749eae7adf34dbc8 SHA1 f761d00862b5d64c89e376428e0506ec14708c92 SHA256 d0efac21ef77e984dda1dd0e602043cbfed3fd51c3fad0adfe5e160d38e7b63f
 MISC metadata.xml 217 RMD160 4cb5affe25728eb50f3d0673d4250b8c430b3eee SHA1 6648290d2f2dc2e1e8f60eb46e4b032c01bfa228 SHA256 3a0411219bca7f796a0465b9b1469987cbb4aa33bdf8dbacf7a9e3994bc8f311
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPR754AAoJEO+t9ga+3I3aFkMH/2pnEilQyGuJW6DJPeCWu3Pi
-8wtxDIqmXUXFs5qtLz2um/OPpOvDihsJIFLvQxRWN/sBOTvxkoXwFhGS2lfY7Ovz
-7qJ46vB+OKzGOVI/qQyztEwxQMFev95PWQJE3mCiCeWW1/P+BeR2QTkXT2tGOaYb
-r07PksoDjkAJ2lEhDHyhtK7dhzz/ocunLhjuFbUuHLLuZl5g4dDFuPG37DRvWtyX
-ZNddT6D7bpkS/SVA3mixT1JTu1z69KlLb2xijKWkps1Uty3OcGtgbiZngEQQ9QiB
-Znb0D072lbMynsLeqaJnEkPZHEo3xzsR3qCl0AaVmsqiIL9KuTW0YKwsrADK9sE=
-=tYkW
+iQIcBAEBCgAGBQJPe2r3AAoJENwGBM22xffezhUP/AijX48A3IwB4MO9ee9GL5op
+BiCTexX7yM7s63Y2U1lWQ9kFFeumkeqULQq+D+DrlwNcKyEeFlb3Xt0UzLFrJJZF
+l+e/XEix55jbJiTSxinDb6/4jzJWLOqp7b30iwwzJr7sG+PvtsQfBAKNUp6O5EyK
+1DIBHc8CVlwXfarEvBbf8sQu0XfIZVkFnnWgTQbFiqkrkkwUKjK8C4pEtYoOJzLO
+FEFTTwexCZJGrXLZirHn9m7iWJ1Y4P2UAzBH3yJQzG5bs5BzTPNDz7zTjS1rrpS2
+XKCRTwnql2z1f7I4EJZReS1C+BCBJ9sFZ4bkZn+esFVHKOE+nnGHNNfR/ogE9moe
+gOp8O+yVxPLXJ6aYthz/K+deHAk3l1ZkGWh5GmXLltgr+z6QmzqMi+CXDXlMrRBp
+IK99mI6MtOuKQnqRZNBPzaEbblI94ITVwYz0JS4ul7jB++v7LDhvFSM6sJaJsACB
+TX9GuHElUbCvgFYFDA+wVb0ox39n16KtDl5YOuzgSjoGv2Pte14Ulrmsg4THmUrX
+wzmgaaZlUokiiwIexZ82F/H2nfpM0SYL+8l9GkHZZp2ac1lzBE73pOtLxUZAqBRd
+QLc7lfw8EWWH1JvCt1rMQ4pdRR1BrefSMvOkNIFfKe8N9A53Woz8NefMYMHHlR+y
+fD8znQ+f7TiXxHEaTq5R
+=vSoY
 -----END PGP SIGNATURE-----
diff --git a/www-plugins/kpartsplugin/files/kpartsplugin-20110823-xpi.patch b/www-plugins/kpartsplugin/files/kpartsplugin-20110823-xpi.patch
new file mode 100644
index 000000000000..f030b58b21d3
--- /dev/null
+++ b/www-plugins/kpartsplugin/files/kpartsplugin-20110823-xpi.patch
@@ -0,0 +1,16 @@
+diff -ruN kpartsplugin-20110823.orif/src/kpartsplugin.cpp kpartsplugin-20110823/src/kpartsplugin.cpp
+--- kpartsplugin-20110823.orif/src/kpartsplugin.cpp	2011-08-23 10:50:41.000000000 +0200
++++ kpartsplugin-20110823/src/kpartsplugin.cpp	2012-04-03 23:21:50.632024095 +0200
+@@ -59,7 +59,11 @@
+ 
+ /// built-in list of mime types that should never be loaded with this plugin
+ /// comparison is done with "startsWith", so "inode/" covers e.g. "inode/directory"
+-static const QStringList builtinBlacklisted = QStringList() << QLatin1String("all/") << QLatin1String("x-") << QLatin1String("inode/") << QLatin1String("application/x-shockwave") << QLatin1String("application/futuresplash") << QLatin1String("application/force-download") << QLatin1String("application/x-force-download") << QLatin1String("application/googletalk") << QLatin1String("interface/") << QLatin1String("message/") << QLatin1String("multipart/") << QLatin1String("application/x-java") << QLatin1String("application/java-archive") << QLatin1String("video/x-javafx");
++static const QStringList builtinBlacklisted = QStringList() << QLatin1String("all/") << QLatin1String("x-") << QLatin1String("inode/") 
++  << QLatin1String("application/x-shockwave") <<  QLatin1String("application/futuresplash") << QLatin1String("application/force-download") 
++  << QLatin1String("application/x-force-download") << QLatin1String("application/googletalk") << QLatin1String("interface/") 
++  << QLatin1String("message/") << QLatin1String("multipart/") <<  QLatin1String("application/x-java") << QLatin1String("application/java-archive") 
++  << QLatin1String("video/x-javafx") << QLatin1String("application/x-xpinstall");
+ 
+ static void initAllMimeTypes()
+ {
diff --git a/www-plugins/kpartsplugin/kpartsplugin-20110823-r1.ebuild b/www-plugins/kpartsplugin/kpartsplugin-20110823-r1.ebuild
new file mode 100644
index 000000000000..609128ed1e7b
--- /dev/null
+++ b/www-plugins/kpartsplugin/kpartsplugin-20110823-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/kpartsplugin/kpartsplugin-20110823-r1.ebuild,v 1.1 2012/04/03 21:26:09 dilfridge Exp $
+
+EAPI=3
+inherit kde4-base nsplugins
+
+DESCRIPTION="Plugin using KDE's KParts technology to embed file viewers into non-KDE browsers"
+HOMEPAGE="http://www.unix-ag.uni-kl.de/~fischer/kpartsplugin/"
+SRC_URI="http://www.unix-ag.uni-kl.de/~fischer/kpartsplugin/${P}.tar.bz2"
+
+LICENSE="GPL-3 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+PATCHES=( "${FILESDIR}/${P}-xpi.patch" )
+
+src_prepare() {
+	echo "set( PLUGIN_INSTALL_DIR \"/usr/$(get_libdir)/${PLUGINS_DIR}/\" )" >> CMakeLists.txt || die
+	kde4-base_src_prepare
+}