Version bump. Thanks to Marios Andreopoulos <opensource@andmarios.com>. Fixes bug #449302

(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key C2BA7F3C!)

6 files changed, 39 insertions, 91 deletions

diff --git a/media-gfx/dispcalgui/ChangeLog b/media-gfx/dispcalgui/ChangeLog
index 5832ba7b7cf3..33343571006a 100644
--- a/media-gfx/dispcalgui/ChangeLog
+++ b/media-gfx/dispcalgui/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-gfx/dispcalgui
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/dispcalgui/ChangeLog,v 1.18 2012/12/14 11:57:32 jlec Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/dispcalgui/ChangeLog,v 1.19 2013/05/10 23:31:00 hwoarang Exp $
+
+*dispcalgui-1.2.7.0 (10 May 2013)
+
+  10 May 2013; Markos Chandras <hwoarang@gentoo.org> +dispcalgui-1.2.7.0.ebuild,
+  +files/dispcalgui-1.2.7.0-wxversion-select.patch, -dispcalgui-1.1.0.0.ebuild,
+  -dispcalgui-1.1.2.1.ebuild, dispcalgui-0.9.9.1.ebuild,
+  dispcalgui-1.1.2.9.ebuild:
+  Version bump. Thanks to Marios Andreopoulos <opensource@andmarios.com>. Fixes
+  bug #449302
 
 *dispcalgui-1.1.2.9 (14 Dec 2012)
 
diff --git a/media-gfx/dispcalgui/dispcalgui-0.9.9.1.ebuild b/media-gfx/dispcalgui/dispcalgui-0.9.9.1.ebuild
index beb0aa13e5bf..4f7783a4814a 100644
--- a/media-gfx/dispcalgui/dispcalgui-0.9.9.1.ebuild
+++ b/media-gfx/dispcalgui/dispcalgui-0.9.9.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/dispcalgui/dispcalgui-0.9.9.1.ebuild,v 1.4 2012/11/02 22:15:41 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/dispcalgui/dispcalgui-0.9.9.1.ebuild,v 1.5 2013/05/10 23:31:00 hwoarang Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2"
@@ -22,7 +22,8 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=">=media-gfx/argyllcms-1.1.0
-	>=dev-python/wxpython-2.8.10.1
+	dev-python/wxpython:2.8
+	!dev-python/wxpython:2.9
 	>=x11-libs/libX11-1.3.3
 	>=x11-apps/xrandr-1.3.2
 	>=x11-libs/libXxf86vm-1.1.0
@@ -51,7 +52,7 @@ src_prepare() {
 src_install() {
 	distutils_src_install
 	#remove udev files
-	rm "${D}"/etc/udev/rules.d/55-Argyll.rules || die
+	rm -rf "${D}"/etc/udev/rules.d
 }
 
 pkg_postinst() {
diff --git a/media-gfx/dispcalgui/dispcalgui-1.1.2.1.ebuild b/media-gfx/dispcalgui/dispcalgui-1.1.2.1.ebuild
deleted file mode 100644
index cd8b46b74ba0..000000000000
--- a/media-gfx/dispcalgui/dispcalgui-1.1.2.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/dispcalgui/dispcalgui-1.1.2.1.ebuild,v 1.1 2012/11/02 22:15:41 hwoarang Exp $
-
-EAPI="2"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.* *-jython 2.7-pypy-*"
-
-inherit distutils fdo-mime
-
-MY_PN="dispcalGUI"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Display Calibration and Characterization powered by Argyll CMS"
-HOMEPAGE="http://dispcalgui.hoech.net/"
-SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-gfx/argyllcms-1.1.0
-	>=dev-python/wxpython-2.8.10.1
-	>=x11-libs/libX11-1.3.3
-	>=x11-apps/xrandr-1.3.2
-	>=x11-libs/libXxf86vm-1.1.0
-	>=x11-proto/xineramaproto-1.2
-	>=x11-libs/libXinerama-1.1"
-RDEPEND="${DEPEND}
-	>=dev-python/numpy-1.2.1"
-
-# Just in case someone renames the ebuild
-S=${WORKDIR}/${MY_P}
-
-DOCS=(
-	README.html
-)
-
-src_prepare() {
-#	Prohibit setup from running xdg-* programs, resulting to sandbox violation
-	cd "${S}/dispcalGUI" || die "Cannot cd to source directory."
-	sed -e 's/if which(\"xdg-icon-resource\"):/if which(\"xdg-icon-resource-non-existant\"):/' \
-	-e 's/if which(\"xdg-desktop-menu\"):/if which(\"xdg-desktop-menu-non-existant\"):/' \
-	-i postinstall.py || die "sed'ing out the xdg-* setup functions failed"
-
-#	Remove deprecated Encoding key from .desktop file
-	cd "${S}" || die "Cannot cd to work directory."
-	for offendingFile in $(grep -r -l "Encoding=UTF-8" .); do
-		sed -e '/Encoding=UTF-8/d' -i "${offendingFile}" || \
-		die "removing deprecated Encoding key from .desktop files failed"
-	done
-
-	distutils_src_prepare
-}
-
-src_install() {
-	distutils_src_install
-	#remove udev files
-	rm "${D}"/etc/udev/rules.d/55-Argyll.rules || die
-}
-
-pkg_postinst() {
-#	Run xdg-* programs the Gentoo way since we removed this functionality from the original package
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-	distutils_pkg_postinst
-}
-
-pkg_postrm() {
-#	Run xdg-* programs the Gentoo way since we removed this functionality from the original package
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-	distutils_pkg_postrm
-}
diff --git a/media-gfx/dispcalgui/dispcalgui-1.1.2.9.ebuild b/media-gfx/dispcalgui/dispcalgui-1.1.2.9.ebuild
index dcee7bcd6eb5..71a8a7854019 100644
--- a/media-gfx/dispcalgui/dispcalgui-1.1.2.9.ebuild
+++ b/media-gfx/dispcalgui/dispcalgui-1.1.2.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/dispcalgui/dispcalgui-1.1.2.9.ebuild,v 1.1 2012/12/14 11:57:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/dispcalgui/dispcalgui-1.1.2.9.ebuild,v 1.2 2013/05/10 23:31:00 hwoarang Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2"
@@ -22,7 +22,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=media-gfx/argyllcms-1.1.0
-	>=dev-python/wxpython-2.8.10.1
+	dev-python/wxpython:2.8
+	!dev-python/wxpython:2.9
 	>=x11-libs/libX11-1.3.3
 	>=x11-apps/xrandr-1.3.2
 	>=x11-libs/libXxf86vm-1.1.0
@@ -58,7 +59,7 @@ src_prepare() {
 src_install() {
 	distutils_src_install
 	#remove udev files
-	rm "${D}"/etc/udev/rules.d/55-Argyll.rules || die
+	rm -rf "${D}"/etc/udev/rules.d
 }
 
 pkg_postinst() {
diff --git a/media-gfx/dispcalgui/dispcalgui-1.1.0.0.ebuild b/media-gfx/dispcalgui/dispcalgui-1.2.7.0.ebuild
index f0b00afb67a3..ba2d0b69a1eb 100644
--- a/media-gfx/dispcalgui/dispcalgui-1.1.0.0.ebuild
+++ b/media-gfx/dispcalgui/dispcalgui-1.2.7.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/dispcalgui/dispcalgui-1.1.0.0.ebuild,v 1.2 2012/11/02 22:15:41 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/dispcalgui/dispcalgui-1.2.7.0.ebuild,v 1.1 2013/05/10 23:31:00 hwoarang Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="2.4 3.* *-jython 2.7-pypy-*"
 
-inherit distutils fdo-mime
+inherit distutils fdo-mime eutils
 
 MY_PN="dispcalGUI"
 MY_P="${MY_PN}-${PV}"
@@ -22,7 +22,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=media-gfx/argyllcms-1.1.0
-	>=dev-python/wxpython-2.8.10.1
+	dev-python/wxpython:2.8
 	>=x11-libs/libX11-1.3.3
 	>=x11-apps/xrandr-1.3.2
 	>=x11-libs/libXxf86vm-1.1.0
@@ -39,6 +39,8 @@ DOCS=(
 )
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-wxversion-select.patch
+
 #	Prohibit setup from running xdg-* programs, resulting to sandbox violation
 	cd "${S}/dispcalGUI" || die "Cannot cd to source directory."
 	sed -e 's/if which(\"xdg-icon-resource\"):/if which(\"xdg-icon-resource-non-existant\"):/' \
@@ -58,7 +60,7 @@ src_prepare() {
 src_install() {
 	distutils_src_install
 	#remove udev files
-	rm "${D}"/etc/udev/rules.d/55-Argyll.rules || die
+    rm -rf "${D}"/etc/udev/rules.d
 }
 
 pkg_postinst() {
diff --git a/media-gfx/dispcalgui/files/dispcalgui-1.2.7.0-wxversion-select.patch b/media-gfx/dispcalgui/files/dispcalgui-1.2.7.0-wxversion-select.patch
new file mode 100644
index 000000000000..8343b2be07c5
--- /dev/null
+++ b/media-gfx/dispcalgui/files/dispcalgui-1.2.7.0-wxversion-select.patch
@@ -0,0 +1,11 @@
+--- dispcalGUI/dispcalGUI.py.old	2013-04-19 01:04:23.663520256 +0300
++++ dispcalGUI/dispcalGUI.py	2013-04-19 01:06:49.561884072 +0300
+@@ -40,6 +40,9 @@
+
+ # Standard modules
+
++import wxversion
++wxversion.select("2.8")
++
+ import ConfigParser
+ ConfigParser.DEFAULTSECT = "Default"