bump; rm old, fixes bug #541590

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

5 files changed, 34 insertions, 166 deletions

diff --git a/sys-apps/roccat-tools/ChangeLog b/sys-apps/roccat-tools/ChangeLog
index bf37ad078003..fb66ce9499f4 100644
--- a/sys-apps/roccat-tools/ChangeLog
+++ b/sys-apps/roccat-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/roccat-tools
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/roccat-tools/ChangeLog,v 1.14 2015/02/21 14:28:25 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/roccat-tools/ChangeLog,v 1.15 2015/03/10 08:09:25 idella4 Exp $
+
+*roccat-tools-3.1.0 (10 Mar 2015)
+
+  10 Mar 2015; Ian Delaney <idella4@gentoo.org> +roccat-tools-3.1.0.ebuild,
+  -roccat-tools-2.0.0.ebuild, -roccat-tools-2.1.0.ebuild,
+  -roccat-tools-2.2.0.ebuild, metadata.xml:
+  bump; rm old, fixes bug #541590
 
 *roccat-tools-3.0.0 (21 Feb 2015)
 
diff --git a/sys-apps/roccat-tools/metadata.xml b/sys-apps/roccat-tools/metadata.xml
index 6c0474ad26fc..6a6ed325e890 100644
--- a/sys-apps/roccat-tools/metadata.xml
+++ b/sys-apps/roccat-tools/metadata.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>proxy-maintainers</herd>
-<maintainer>
-<email>dpisklov@gmail.com</email>
-<name>Dmitry Pisklov</name>
-<description>Proxy maintainer. Assign bugs to him</description>
-</maintainer>
+	<maintainer>
+		<email>dpisklov@gmail.com</email>
+		<name>Dmitry Pisklov</name>
+		<description>Proxy maintainer. Assign bugs to him</description>
+	</maintainer>
 <use>
        <flag name="lua">Build support for Lua scripting for RyosMKPro ripple effects</flag>
 </use>
diff --git a/sys-apps/roccat-tools/roccat-tools-2.1.0.ebuild b/sys-apps/roccat-tools/roccat-tools-2.1.0.ebuild
deleted file mode 100644
index 7d2d515a8d48..000000000000
--- a/sys-apps/roccat-tools/roccat-tools-2.1.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/roccat-tools/roccat-tools-2.1.0.ebuild,v 1.2 2015/02/21 14:28:25 hwoarang Exp $
-
-EAPI=5
-
-inherit readme.gentoo cmake-utils gnome2-utils udev user
-
-DESCRIPTION="Utility for advanced configuration of Roccat devices"
-
-HOMEPAGE="http://roccat.sourceforge.net/"
-SRC_URI="mirror://sourceforge/roccat/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE_INPUT_DEVICES="
-	input_devices_roccat_arvo
-	input_devices_roccat_isku
-	input_devices_roccat_iskufx
-	input_devices_roccat_kone
-	input_devices_roccat_koneplus
-	input_devices_roccat_konepure
-	input_devices_roccat_konepuremilitary
-	input_devices_roccat_konepureoptical
-	input_devices_roccat_konextd
-	input_devices_roccat_konextdoptical
-	input_devices_roccat_kovaplus
-	input_devices_roccat_lua
-	input_devices_roccat_pyra
-	input_devices_roccat_savu
-	input_devices_roccat_ryosmk
-"
-IUSE="${IUSE_INPUT_DEVICES}"
-
-RDEPEND="
-	>=dev-libs/libgaminggear-0.4
-	x11-libs/gtk+:2
-	x11-libs/libnotify
-	media-libs/libcanberra
-	virtual/libusb:1
-	dev-libs/dbus-glib
-	virtual/libgudev:=
-"
-
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	enewgroup roccat
-}
-
-src_configure() {
-	local UDEVDIR="$(get_udevdir)"/rules.d
-	local MODELS=${INPUT_DEVICES//roccat_/}
-	MODELS=${MODELS/ryosmk/ryos}
-	mycmakeargs=( -DDEVICES=${MODELS// /;} \
-	-DUDEVDIR="${UDEVDIR/"//"//}" )
-	cmake-utils_src_configure
-}
-src_install() {
-	cmake-utils_src_install
-	local stat_dir=/var/lib/roccat
-	keepdir $stat_dir
-	fowners root:roccat $stat_dir
-	fperms 2770 $stat_dir
-	readme.gentoo_src_install
-}
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-pkg_postinst() {
-	gnome2_icon_cache_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/sys-apps/roccat-tools/roccat-tools-2.2.0.ebuild b/sys-apps/roccat-tools/roccat-tools-2.2.0.ebuild
deleted file mode 100644
index 6c64785f8458..000000000000
--- a/sys-apps/roccat-tools/roccat-tools-2.2.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/roccat-tools/roccat-tools-2.2.0.ebuild,v 1.2 2015/02/21 14:28:25 hwoarang Exp $
-
-EAPI=5
-
-inherit readme.gentoo cmake-utils gnome2-utils udev user
-
-DESCRIPTION="Utility for advanced configuration of Roccat devices"
-
-HOMEPAGE="http://roccat.sourceforge.net/"
-SRC_URI="mirror://sourceforge/roccat/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE_INPUT_DEVICES="
-	input_devices_roccat_arvo
-	input_devices_roccat_isku
-	input_devices_roccat_iskufx
-	input_devices_roccat_kone
-	input_devices_roccat_koneplus
-	input_devices_roccat_konepure
-	input_devices_roccat_konepuremilitary
-	input_devices_roccat_konepureoptical
-	input_devices_roccat_konextd
-	input_devices_roccat_konextdoptical
-	input_devices_roccat_kovaplus
-	input_devices_roccat_lua
-	input_devices_roccat_pyra
-	input_devices_roccat_savu
-	input_devices_roccat_ryosmk
-"
-IUSE="${IUSE_INPUT_DEVICES}"
-
-RDEPEND="
-	>=dev-libs/libgaminggear-0.5
-	x11-libs/gtk+:2
-	x11-libs/libnotify
-	media-libs/libcanberra
-	virtual/libusb:1
-	dev-libs/dbus-glib
-	virtual/libgudev:=
-"
-
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	enewgroup roccat
-}
-
-src_configure() {
-	local UDEVDIR="$(get_udevdir)"/rules.d
-	local MODELS=${INPUT_DEVICES//roccat_/}
-	MODELS=${MODELS/ryosmk/ryos}
-	mycmakeargs=( -DDEVICES=${MODELS// /;} \
-	-DUDEVDIR="${UDEVDIR/"//"//}" )
-	cmake-utils_src_configure
-}
-src_install() {
-	cmake-utils_src_install
-	local stat_dir=/var/lib/roccat
-	keepdir $stat_dir
-	fowners root:roccat $stat_dir
-	fperms 2770 $stat_dir
-	readme.gentoo_src_install
-}
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-pkg_postinst() {
-	gnome2_icon_cache_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/sys-apps/roccat-tools/roccat-tools-2.0.0.ebuild b/sys-apps/roccat-tools/roccat-tools-3.1.0.ebuild
index 81cd44c7610b..c2c1e0314702 100644
--- a/sys-apps/roccat-tools/roccat-tools-2.0.0.ebuild
+++ b/sys-apps/roccat-tools/roccat-tools-3.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/roccat-tools/roccat-tools-2.0.0.ebuild,v 1.3 2015/02/21 14:28:25 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/roccat-tools/roccat-tools-3.1.0.ebuild,v 1.1 2015/03/10 08:09:25 idella4 Exp $
 
 EAPI=5
 
@@ -29,11 +29,16 @@ IUSE_INPUT_DEVICES="
 	input_devices_roccat_pyra
 	input_devices_roccat_savu
 	input_devices_roccat_ryosmk
+	input_devices_roccat_ryostkl
+	input_devices_roccat_tyon
+"
+IUSE="${IUSE_INPUT_DEVICES} lua"
+REQUIRED_USE="
+	lua? ( input_devices_roccat_ryosmk )
 "
-IUSE="${IUSE_INPUT_DEVICES}"
 
 RDEPEND="
-	>=dev-libs/libgaminggear-0.3
+	>=dev-libs/libgaminggear-0.6
 	x11-libs/gtk+:2
 	x11-libs/libnotify
 	media-libs/libcanberra
@@ -51,9 +56,11 @@ pkg_setup() {
 src_configure() {
 	local UDEVDIR="$(get_udevdir)"/rules.d
 	local MODELS=${INPUT_DEVICES//roccat_/}
-	MODELS=${MODELS/ryosmk/ryos}
-	mycmakeargs=( -DDEVICES=${MODELS// /;} \
-	-DUDEVDIR="${UDEVDIR/"//"//}" )
+	mycmakeargs=(
+		-DDEVICES=${MODELS// /;} \
+		-DUDEVDIR="${UDEVDIR/"//"//}"
+		$(cmake-utils_use_with lua LUA)
+	)
 	cmake-utils_src_configure
 }
 src_install() {
@@ -70,6 +77,14 @@ pkg_preinst() {
 pkg_postinst() {
 	gnome2_icon_cache_update
 	readme.gentoo_print_elog
+	ewarn
+	ewarn "Starting from version 3.0.0, executables were renamed and now prefixed with 'roccat',"
+	ewarn "so konextdconfig is now roccatkonextdconfig and so on"
+	ewarn "Everything that was ryos is now ryosmk to distinguish it from the ryostkl product range"
+	ewarn
+	ewarn "In version ${P} the support for Python as a scripting language for RyosMKPro"
+	ewarn "ripple effects was dropped and replaced with Lua. Use USE=lua to enable it"
+	ewarn
 }
 
 pkg_postrm() {