[gentoo-commits] gentoo-x86 commit in media-gfx/dispcalgui: dispcalgui-1.1.2.1.ebuild dispcalgui-1.1.0.0.ebuild dispcalgui-0.9.9.1.ebuild ChangeLog dispcalgui-1.0.7.7.ebuild

[Markos Chandras (hwoarang)]

hwoarang    12/11/02 22:15:41

  Modified:             dispcalgui-1.1.0.0.ebuild dispcalgui-0.9.9.1.ebuild
                        ChangeLog
  Added:                dispcalgui-1.1.2.1.ebuild
  Removed:              dispcalgui-1.0.7.7.ebuild
  Log:
  Version bump. Fix old ebuilds to not install udev rules in order to avoid collisions with media-gfx/argyllcms. Thanks to Marios Andreopoulos <opensource@×××××××××.com>. Bug #440932. Remove old
  
  (Portage version: 2.1.11.30/cvs/Linux x86_64, signed Manifest commit with key B4AFF2C2)

Revision  Changes    Path
1.2                  media-gfx/dispcalgui/dispcalgui-1.1.0.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/dispcalgui/dispcalgui-1.1.0.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/dispcalgui/dispcalgui-1.1.0.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/dispcalgui/dispcalgui-1.1.0.0.ebuild?r1=1.1&r2=1.2

Index: dispcalgui-1.1.0.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/dispcalgui/dispcalgui-1.1.0.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dispcalgui-1.1.0.0.ebuild	23 Sep 2012 09:55:57 -0000	1.1
+++ dispcalgui-1.1.0.0.ebuild	2 Nov 2012 22:15:41 -0000	1.2
@@ -1,6 +1,6 @@
 # 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.0.0.ebuild,v 1.1 2012/09/23 09:55:57 hwoarang Exp $
+# $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 $
 
 EAPI="2"
 PYTHON_DEPEND="2"
@@ -45,13 +45,6 @@
 	-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"
 
-#	Set udev rules to install at /lib/udev/rules.d
-	cd "${S}" || die "Cannot cd to work directory."
-	for offendingFile in $(grep -r -l "/etc/udev/rules.d" .); do
-		sed -e 's|/etc/udev/rules\.d|/lib/udev/rules\.d|g' -i "${offendingFile}" || \
-		die "setting udev rules' destination directory failed"
-	done
-
 #	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
@@ -62,6 +55,12 @@
 	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



1.4                  media-gfx/dispcalgui/dispcalgui-0.9.9.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/dispcalgui/dispcalgui-0.9.9.1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/dispcalgui/dispcalgui-0.9.9.1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/dispcalgui/dispcalgui-0.9.9.1.ebuild?r1=1.3&r2=1.4

Index: dispcalgui-0.9.9.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/dispcalgui/dispcalgui-0.9.9.1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dispcalgui-0.9.9.1.ebuild	2 Aug 2012 21:20:07 -0000	1.3
+++ dispcalgui-0.9.9.1.ebuild	2 Nov 2012 22:15:41 -0000	1.4
@@ -1,6 +1,6 @@
 # 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-0.9.9.1.ebuild,v 1.3 2012/08/02 21:20:07 hwoarang Exp $
+# $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 $
 
 EAPI="2"
 PYTHON_DEPEND="2"
@@ -45,16 +45,15 @@
 	-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"
 
-#	Set udev rules to install at /lib/udev/rules.d
-	cd "${S}" || die "Cannot cd to work directory."
-	for offendingFile in $(grep -r -l "/etc/udev/rules.d" *); do
-		sed -e 's|/etc/udev/rules\.d|/lib/udev/rules\.d|g' -i "${offendingFile}" || \
-		die "setting udev rules' destination directory 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



1.17                 media-gfx/dispcalgui/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/dispcalgui/ChangeLog?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/dispcalgui/ChangeLog?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/dispcalgui/ChangeLog?r1=1.16&r2=1.17

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/dispcalgui/ChangeLog,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ChangeLog	23 Sep 2012 09:55:57 -0000	1.16
+++ ChangeLog	2 Nov 2012 22:15:41 -0000	1.17
@@ -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.16 2012/09/23 09:55:57 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/dispcalgui/ChangeLog,v 1.17 2012/11/02 22:15:41 hwoarang Exp $
+
+*dispcalgui-1.1.2.1 (02 Nov 2012)
+
+  02 Nov 2012; Markos Chandras <hwoarang@g.o> +dispcalgui-1.1.2.1.ebuild,
+  -dispcalgui-1.0.7.7.ebuild, dispcalgui-0.9.9.1.ebuild,
+  dispcalgui-1.1.0.0.ebuild:
+  Version bump. Fix old ebuilds to not install udev rules in order to avoid
+  collisions with media-gfx/argyllcms. Thanks to Marios Andreopoulos
+  <opensource@×××××××××.com>. Bug #440932. Remove old
 
 *dispcalgui-1.1.0.0 (23 Sep 2012)
 



1.1                  media-gfx/dispcalgui/dispcalgui-1.1.2.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/dispcalgui/dispcalgui-1.1.2.1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/dispcalgui/dispcalgui-1.1.2.1.ebuild?rev=1.1&content-type=text/plain

Index: dispcalgui-1.1.2.1.ebuild
===================================================================
# 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
}