Rename USE=jp2k to the standard USE=jpeg2k #539690 by jannis.

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

8 files changed, 42 insertions, 44 deletions

diff --git a/dev-libs/efl/ChangeLog b/dev-libs/efl/ChangeLog
index 29956e9434c3..b1fcae39d176 100644
--- a/dev-libs/efl/ChangeLog
+++ b/dev-libs/efl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/efl
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/ChangeLog,v 1.23 2014/12/28 14:28:23 tommy Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/ChangeLog,v 1.24 2015/02/14 04:35:08 vapier Exp $
+
+  14 Feb 2015; Mike Frysinger <vapier@gentoo.org> efl-1.10.1.ebuild,
+  efl-1.11.2.ebuild, efl-1.12.2.ebuild, efl-1.8.5.ebuild, efl-1.8.6.ebuild,
+  efl-1.9.4.ebuild, efl-1.9.5.ebuild:
+  Rename USE=jp2k to the standard USE=jpeg2k #539690 by jannis.
 
   28 Dec 2014; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   -files/efl-1.12.2-lauch_via_logind_or_root_privilege.patch, efl-1.12.2.ebuild:
diff --git a/dev-libs/efl/efl-1.10.1.ebuild b/dev-libs/efl/efl-1.10.1.ebuild
index e10bce35116a..63215f718224 100644
--- a/dev-libs/efl/efl-1.10.1.ebuild
+++ b/dev-libs/efl/efl-1.10.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/efl-1.10.1.ebuild,v 1.2 2014/08/08 14:48:02 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/efl-1.10.1.ebuild,v 1.3 2015/02/14 04:35:08 vapier Exp $
 
 EAPI="5"
 
@@ -24,8 +24,7 @@ DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
 KEYWORDS="~amd64 ~arm ~x86"
-
-IUSE="+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jp2k +jpeg oldlua opengl ssl physics pixman +png +ppm +psd pulseaudio scim sdl sound systemd tga tiff tslib v4l2 wayland webp X xim xine xpm"
+IUSE="+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus +jpeg jpeg2k oldlua opengl ssl physics pixman +png +ppm +psd pulseaudio scim sdl sound systemd tga tiff tslib v4l2 wayland webp X xim xine xpm"
 
 REQUIRED_USE="
 	pulseaudio?	( sound )
@@ -54,8 +53,8 @@ RDEPEND="
 	)
 	harfbuzz? ( media-libs/harfbuzz )
 	ibus? ( app-i18n/ibus )
-	jp2k? ( media-libs/openjpeg )
 	jpeg? ( virtual/jpeg )
+	jpeg2k? ( media-libs/openjpeg )
 	!oldlua? ( >=dev-lang/luajit-2.0.0 )
 	oldlua? ( dev-lang/lua )
 	physics? ( >=sci-physics/bullet-2.80 )
@@ -212,8 +211,8 @@ src_configure() {
 	$(use_enable harfbuzz)
 	$(use_enable ico image-loader-ico)
 	$(use_enable ibus)
-	$(use_enable jp2k image-loader-jp2k)
 	$(use_enable jpeg image-loader-jpeg)
+	$(use_enable jpeg2k image-loader-jp2k)
 	$(use_enable nls)
 	$(use_enable oldlua lua-old)
 	$(use_enable physics)
diff --git a/dev-libs/efl/efl-1.11.2.ebuild b/dev-libs/efl/efl-1.11.2.ebuild
index ac0559ed229c..b692bf1659bc 100644
--- a/dev-libs/efl/efl-1.11.2.ebuild
+++ b/dev-libs/efl/efl-1.11.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/efl-1.11.2.ebuild,v 1.1 2014/10/07 18:59:04 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/efl-1.11.2.ebuild,v 1.2 2015/02/14 04:35:08 vapier Exp $
 
 EAPI="5"
 
@@ -24,8 +24,7 @@ DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
 KEYWORDS="~amd64 ~arm ~x86"
-
-IUSE="+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jp2k +jpeg oldlua opengl ssl physics pixman +png +ppm +psd pulseaudio scim sdl sound systemd tga tiff tslib v4l2 wayland webp X xim xine xpm"
+IUSE="+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus +jpeg jpeg2k oldlua opengl ssl physics pixman +png +ppm +psd pulseaudio scim sdl sound systemd tga tiff tslib v4l2 wayland webp X xim xine xpm"
 
 REQUIRED_USE="
 	pulseaudio?	( sound )
@@ -54,8 +53,8 @@ RDEPEND="
 	)
 	harfbuzz? ( media-libs/harfbuzz )
 	ibus? ( app-i18n/ibus )
-	jp2k? ( media-libs/openjpeg )
 	jpeg? ( virtual/jpeg )
+	jpeg2k? ( media-libs/openjpeg )
 	!oldlua? ( >=dev-lang/luajit-2.0.0 )
 	oldlua? ( dev-lang/lua )
 	physics? ( >=sci-physics/bullet-2.80 )
@@ -212,8 +211,8 @@ src_configure() {
 	$(use_enable harfbuzz)
 	$(use_enable ico image-loader-ico)
 	$(use_enable ibus)
-	$(use_enable jp2k image-loader-jp2k)
 	$(use_enable jpeg image-loader-jpeg)
+	$(use_enable jpeg2k image-loader-jp2k)
 	$(use_enable nls)
 	$(use_enable oldlua lua-old)
 	$(use_enable physics)
diff --git a/dev-libs/efl/efl-1.12.2.ebuild b/dev-libs/efl/efl-1.12.2.ebuild
index 6254be035ca6..73481246e019 100644
--- a/dev-libs/efl/efl-1.12.2.ebuild
+++ b/dev-libs/efl/efl-1.12.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/efl-1.12.2.ebuild,v 1.3 2014/12/28 14:28:23 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/efl-1.12.2.ebuild,v 1.4 2015/02/14 04:35:08 vapier Exp $
 
 EAPI="5"
 
@@ -26,8 +26,7 @@ DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
 KEYWORDS="~amd64 ~arm ~x86"
-
-IUSE="+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jp2k neon oldlua opengl ssl physics pixman +png +ppm +psd pulseaudio scim sdl sound systemd tga tiff tslib v4l2 wayland webp X xim xine xpm"
+IUSE="+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jpeg2k neon oldlua opengl ssl physics pixman +png +ppm +psd pulseaudio scim sdl sound systemd tga tiff tslib v4l2 wayland webp X xim xine xpm"
 
 REQUIRED_USE="
 	pulseaudio?	( sound )
@@ -55,7 +54,7 @@ RDEPEND="
 	)
 	harfbuzz? ( media-libs/harfbuzz )
 	ibus? ( app-i18n/ibus )
-	jp2k? ( media-libs/openjpeg )
+	jpeg2k? ( media-libs/openjpeg )
 	!oldlua? ( >=dev-lang/luajit-2.0.0 )
 	oldlua? ( dev-lang/lua )
 	physics? ( >=sci-physics/bullet-2.80 )
@@ -221,7 +220,7 @@ src_configure() {
 	$(use_enable harfbuzz)
 	$(use_enable ico image-loader-ico)
 	$(use_enable ibus)
-	$(use_enable jp2k image-loader-jp2k)
+	$(use_enable jpeg2k image-loader-jp2k)
 	$(use_enable neon)
 	$(use_enable nls)
 	$(use_enable oldlua lua-old)
diff --git a/dev-libs/efl/efl-1.8.5.ebuild b/dev-libs/efl/efl-1.8.5.ebuild
index cc139b3b3788..ad64f8b2baba 100644
--- a/dev-libs/efl/efl-1.8.5.ebuild
+++ b/dev-libs/efl/efl-1.8.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/efl-1.8.5.ebuild,v 1.8 2014/05/15 18:06:01 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/efl-1.8.5.ebuild,v 1.9 2015/02/14 04:35:08 vapier Exp $
 
 EAPI="5"
 
@@ -20,8 +20,7 @@ DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
 KEYWORDS="amd64 ~arm x86"
-
-IUSE="+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jp2k +jpeg opengl ssl physics pixman +png +ppm +psd pulseaudio scim sdl sound systemd tga tiff tslib v4l2 wayland webp X xcb xim xine xpm"
+IUSE="+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus +jpeg jpeg2k opengl ssl physics pixman +png +ppm +psd pulseaudio scim sdl sound systemd tga tiff tslib v4l2 wayland webp X xcb xim xine xpm"
 
 REQUIRED_USE="
 	X?		( !xcb )
@@ -50,8 +49,8 @@ RDEPEND="
 	)
 	harfbuzz? ( media-libs/harfbuzz )
 	ibus? ( app-i18n/ibus )
-	jp2k? ( media-libs/openjpeg )
 	jpeg? ( virtual/jpeg )
+	jpeg2k? ( media-libs/openjpeg )
 	physics? ( sci-physics/bullet )
 	pixman? ( x11-libs/pixman )
 	png? ( media-libs/libpng:0= )
@@ -224,8 +223,8 @@ src_configure() {
 	$(use_enable harfbuzz)
 	$(use_enable ico image-loader-ico)
 	$(use_enable ibus)
-	$(use_enable jp2k image-loader-jp2k)
 	$(use_enable jpeg image-loader-jpeg)
+	$(use_enable jpeg2k image-loader-jp2k)
 	$(use_enable nls)
 	$(use_enable physics)
 	$(use_enable pixman)
diff --git a/dev-libs/efl/efl-1.8.6.ebuild b/dev-libs/efl/efl-1.8.6.ebuild
index a5830692b171..60b4fbee2ed7 100644
--- a/dev-libs/efl/efl-1.8.6.ebuild
+++ b/dev-libs/efl/efl-1.8.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/efl-1.8.6.ebuild,v 1.2 2014/05/15 18:06:01 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/efl-1.8.6.ebuild,v 1.3 2015/02/14 04:35:08 vapier Exp $
 
 EAPI="5"
 
@@ -20,8 +20,7 @@ DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
 KEYWORDS="~amd64 ~arm ~x86"
-
-IUSE="+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jp2k +jpeg opengl ssl physics pixman +png +ppm +psd pulseaudio scim sdl sound systemd tga tiff tslib v4l2 wayland webp X xcb xim xine xpm"
+IUSE="+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus +jpeg jpeg2k opengl ssl physics pixman +png +ppm +psd pulseaudio scim sdl sound systemd tga tiff tslib v4l2 wayland webp X xcb xim xine xpm"
 
 REQUIRED_USE="
 	X?		( !xcb )
@@ -50,8 +49,8 @@ RDEPEND="
 	)
 	harfbuzz? ( media-libs/harfbuzz )
 	ibus? ( app-i18n/ibus )
-	jp2k? ( media-libs/openjpeg )
 	jpeg? ( virtual/jpeg )
+	jpeg2k? ( media-libs/openjpeg )
 	physics? ( sci-physics/bullet )
 	pixman? ( x11-libs/pixman )
 	png? ( media-libs/libpng:0= )
@@ -224,8 +223,8 @@ src_configure() {
 	$(use_enable harfbuzz)
 	$(use_enable ico image-loader-ico)
 	$(use_enable ibus)
-	$(use_enable jp2k image-loader-jp2k)
 	$(use_enable jpeg image-loader-jpeg)
+	$(use_enable jpeg2k image-loader-jp2k)
 	$(use_enable nls)
 	$(use_enable physics)
 	$(use_enable pixman)
diff --git a/dev-libs/efl/efl-1.9.4.ebuild b/dev-libs/efl/efl-1.9.4.ebuild
index 4a8ce62bdd4d..b51d6fa78346 100644
--- a/dev-libs/efl/efl-1.9.4.ebuild
+++ b/dev-libs/efl/efl-1.9.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/efl-1.9.4.ebuild,v 1.1 2014/06/01 13:03:12 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/efl-1.9.4.ebuild,v 1.2 2015/02/14 04:35:08 vapier Exp $
 
 EAPI="5"
 
@@ -24,8 +24,7 @@ DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
 KEYWORDS="~amd64 ~arm ~x86"
-
-IUSE="+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jp2k +jpeg oldlua opengl ssl physics pixman +png +ppm +psd pulseaudio scim sdl sound systemd tga tiff tslib v4l2 wayland webp X xim xine xpm"
+IUSE="+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus +jpeg jpeg2k oldlua opengl ssl physics pixman +png +ppm +psd pulseaudio scim sdl sound systemd tga tiff tslib v4l2 wayland webp X xim xine xpm"
 
 REQUIRED_USE="
 	pulseaudio?	( sound )
@@ -53,8 +52,8 @@ RDEPEND="
 	)
 	harfbuzz? ( media-libs/harfbuzz )
 	ibus? ( app-i18n/ibus )
-	jp2k? ( media-libs/openjpeg )
 	jpeg? ( virtual/jpeg )
+	jpeg2k? ( media-libs/openjpeg )
 	!oldlua? ( >=dev-lang/luajit-2.0.0 )
 	oldlua? ( dev-lang/lua )
 	physics? ( >=sci-physics/bullet-2.80 )
@@ -211,8 +210,8 @@ src_configure() {
 	$(use_enable harfbuzz)
 	$(use_enable ico image-loader-ico)
 	$(use_enable ibus)
-	$(use_enable jp2k image-loader-jp2k)
 	$(use_enable jpeg image-loader-jpeg)
+	$(use_enable jpeg2k image-loader-jp2k)
 	$(use_enable nls)
 	$(use_enable oldlua lua-old)
 	$(use_enable physics)
diff --git a/dev-libs/efl/efl-1.9.5.ebuild b/dev-libs/efl/efl-1.9.5.ebuild
index f3d2f09882e3..7b886a14095c 100644
--- a/dev-libs/efl/efl-1.9.5.ebuild
+++ b/dev-libs/efl/efl-1.9.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/efl-1.9.5.ebuild,v 1.1 2014/06/09 09:53:26 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/efl-1.9.5.ebuild,v 1.2 2015/02/14 04:35:08 vapier Exp $
 
 EAPI="5"
 
@@ -24,8 +24,7 @@ DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
 KEYWORDS="~amd64 ~arm ~x86"
-
-IUSE="+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jp2k +jpeg oldlua opengl ssl physics pixman +png +ppm +psd pulseaudio scim sdl sound systemd tga tiff tslib v4l2 wayland webp X xim xine xpm"
+IUSE="+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus +jpeg jpeg2k oldlua opengl ssl physics pixman +png +ppm +psd pulseaudio scim sdl sound systemd tga tiff tslib v4l2 wayland webp X xim xine xpm"
 
 REQUIRED_USE="
 	pulseaudio?	( sound )
@@ -53,8 +52,8 @@ RDEPEND="
 	)
 	harfbuzz? ( media-libs/harfbuzz )
 	ibus? ( app-i18n/ibus )
-	jp2k? ( media-libs/openjpeg )
 	jpeg? ( virtual/jpeg )
+	jpeg2k? ( media-libs/openjpeg )
 	!oldlua? ( >=dev-lang/luajit-2.0.0 )
 	oldlua? ( dev-lang/lua )
 	physics? ( >=sci-physics/bullet-2.80 )
@@ -211,8 +210,8 @@ src_configure() {
 	$(use_enable harfbuzz)
 	$(use_enable ico image-loader-ico)
 	$(use_enable ibus)
-	$(use_enable jp2k image-loader-jp2k)
 	$(use_enable jpeg image-loader-jpeg)
+	$(use_enable jpeg2k image-loader-jp2k)
 	$(use_enable nls)
 	$(use_enable oldlua lua-old)
 	$(use_enable physics)