summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-03-28 08:57:45 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-03-28 08:57:45 +0000
commit1a78beb81b01ec55b496a6a4c65d841c0fdf0046 (patch)
tree3695abda338b56ac9f2bcf53f0da7e39929b8da5 /dev-java/java-config
parentInstall 10-svxlink.rules to /lib/udev instead of /etc/udev. (diff)
downloadgentoo-2-1a78beb81b01ec55b496a6a4c65d841c0fdf0046.tar.gz
gentoo-2-1a78beb81b01ec55b496a6a4c65d841c0fdf0046.tar.bz2
gentoo-2-1a78beb81b01ec55b496a6a4c65d841c0fdf0046.zip
Don't install deprecated x-java-jnlp-file.desktop to /usr/share/mimelnk wrt #350459. Signed off by Alistair Bush.
(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)
Diffstat (limited to 'dev-java/java-config')
-rw-r--r--dev-java/java-config/ChangeLog7
-rw-r--r--dev-java/java-config/java-config-2.1.11-r3.ebuild3
2 files changed, 8 insertions, 2 deletions
diff --git a/dev-java/java-config/ChangeLog b/dev-java/java-config/ChangeLog
index d1bf28d7623c..bf6698787ec1 100644
--- a/dev-java/java-config/ChangeLog
+++ b/dev-java/java-config/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-java/java-config
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.262 2011/01/25 04:58:07 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.263 2011/03/28 08:57:45 ssuominen Exp $
+
+ 28 Mar 2011; Samuli Suominen <ssuominen@gentoo.org>
+ java-config-2.1.11-r3.ebuild:
+ Don't install deprecated x-java-jnlp-file.desktop to /usr/share/mimelnk wrt
+ #350459. Signed off by Alistair Bush.
25 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org>
java-config-2.1.11-r3.ebuild:
diff --git a/dev-java/java-config/java-config-2.1.11-r3.ebuild b/dev-java/java-config/java-config-2.1.11-r3.ebuild
index f5d927cac9fc..129519ec651e 100644
--- a/dev-java/java-config/java-config-2.1.11-r3.ebuild
+++ b/dev-java/java-config/java-config-2.1.11-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/java-config-2.1.11-r3.ebuild,v 1.5 2011/01/25 04:58:07 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/java-config-2.1.11-r3.ebuild,v 1.6 2011/03/28 08:57:45 ssuominen Exp $
EAPI="2"
PYTHON_DEPEND="*:2.6"
@@ -42,6 +42,7 @@ src_test() {
src_install() {
distutils_src_install
+ rm -rf "${D}"/usr/share/mimelnk #350459
insinto /usr/share/java-config-2/config/
newins config/jdk-defaults-${ARCH}.conf jdk-defaults.conf || die "arch config not found"