commit: c935e15638b547a48b2dc85f317bf8f2229a67d6 Author: Craig Inches <craig <AT> craiginches <DOT> com> AuthorDate: Mon May 16 19:53:07 2016 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Mon May 16 21:18:10 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c935e156
media-gfx/displaycal: Version Bump, Rename, and removal of old versions. Gentoo-Bug: https://bugs.gentoo.org/576440 Gentoo-Bug: https://bugs.gentoo.org/532008 Closes: https://github.com/gentoo/gentoo/pull/1477 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> media-gfx/dispcalgui/Manifest | 5 -- media-gfx/dispcalgui/dispcalgui-1.2.7.0.ebuild | 78 ---------------------- media-gfx/dispcalgui/dispcalgui-2.5.0.0.ebuild | 72 -------------------- media-gfx/dispcalgui/dispcalgui-2.6.0.0.ebuild | 72 -------------------- .../dispcalgui-1.2.7.0-wxversion-select.patch | 11 --- .../dispcalgui-2.0.0.0-wxversion-select.patch | 13 ---- media-gfx/displaycal/Manifest | 2 + .../displaycal-3.0.6.0.ebuild} | 2 +- .../displaycal-3.1.2.0.ebuild} | 33 +++++---- media-gfx/{dispcalgui => displaycal}/metadata.xml | 0 profiles/updates/2Q-2016 | 1 + 11 files changed, 23 insertions(+), 266 deletions(-) diff --git a/media-gfx/dispcalgui/Manifest b/media-gfx/dispcalgui/Manifest deleted file mode 100644 index e38d411..0000000 --- a/media-gfx/dispcalgui/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -DIST dispcalGUI-1.2.7.0.tar.gz 3302318 SHA256 8032b71ced4d7f718f8aa50a5dfc92595150334b572d6828c797426d8d63ba0b SHA512 7ae2c14c0fa50cb28284a24269c2d73bf5197326581cceb7436f1263f8097eb57c7cafbfaa811f1b387e4b7235fe8eda0a8f48ef939ec7710ca5555090ca53c3 WHIRLPOOL 106da953f564b2c4f6cdfefffc7952248b17793cd42e267c41f6bb3e56864b36d87f584df7b47f06ec131693c5de10e4f8630d77b12bdb82b318e61b4dec62d6 -DIST dispcalGUI-2.0.0.0.tar.gz 5914050 SHA256 fad516999bd663cf870fad2869fc63a23f93820dffff9dbd1029369417a6b650 SHA512 14e1a5d921ed4aaa07bd96d2c4256ce080bc6201d7a5b2a6fa69ae9ac25b8d34c9b0f3b3dac3d2e9a7d4c5faa97682e10a4b15205098a454623ecdb4e09eb8a5 WHIRLPOOL 1c88bb5da2dcddc1848249ba76057e1e33480e8fc344af6c3348d933c9752cc09f91a03a61f18f71cae27473956ae0e518b85864b5a2eb6ce9caf074d59f167c -DIST dispcalGUI-2.5.0.0.tar.gz 6392054 SHA256 036a01a11551d990a6b84e241d131ca0b07d810d552b28332907aa6fb3cd4777 SHA512 d5cb2263739f9c46676222d20e570c161897af58bb359ed569a7690b6fc1ed83ce7e9862e7d69b1afb599b8035ca4f4abfccef83b877d98a34956535d2dd729b WHIRLPOOL 725de21d2d320ec74b6a7840cf5f251885b62946e20cfc7bed480f663c77116c9bac61b2df7e7ddfe7a0e7557269d864f0b88569e52463499eb310279fe66b7d -DIST dispcalGUI-2.6.0.0.tar.gz 6722168 SHA256 3087facf1fd7941b04df327903eb9a49511987a9b7afaada9ee8ca4600d0109f SHA512 0f7b1952588ee8e5c49f3ce3be41e53c0dd746b6fd660107e78ec16b392ebda9f8bc45550a119371b2197fd370f0e28e05aee47c71e26cfb8f648a6d66277454 WHIRLPOOL 84f050ed73200054b7dad53730a86490e44e751ab96ef4ef3faea279ac692ef76685c8992135085c43c3e258e2fc44c5a276217443adc67560eb23b376d535d7 -DIST dispcalGUI-3.0.6.0.tar.gz 9048298 SHA256 6432d47734ad18abccd4ef236eb7b721d7233529057da507fa36ccaf80de6d6a SHA512 cd91960b5ef00bb9f4e60000cc9117ffd6c8236e8b8dc65a76a4690da1c17eb5216385fbc1467ea842119fdbdc2d6937990b07ac999d193a0353249be8b8d795 WHIRLPOOL 629db4a3c293c93918b665b28246d047e1defcbafd82f96a8c662aabf4077b33a1492e37e9e1a5cbbe018b92048a98fcfa872057acad30df1d1a915222428a02 diff --git a/media-gfx/dispcalgui/dispcalgui-1.2.7.0.ebuild b/media-gfx/dispcalgui/dispcalgui-1.2.7.0.ebuild deleted file mode 100644 index 3ba275b..0000000 --- a/media-gfx/dispcalgui/dispcalgui-1.2.7.0.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="2" -PYTHON_DEPEND="2" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="2.4 3.* *-jython 2.7-pypy-*" - -inherit distutils fdo-mime eutils - -MY_PN="dispcalGUI" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Display Calibration and Characterization powered by Argyll CMS" -HOMEPAGE="http://dispcalgui.hoech.net/"; -SRC_URI="https://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 - >=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() { - 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\"):/' \ - -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 -rf "${D}"/etc/udev/rules.d -} - -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-2.5.0.0.ebuild b/media-gfx/dispcalgui/dispcalgui-2.5.0.0.ebuild deleted file mode 100644 index 9f015e0..0000000 --- a/media-gfx/dispcalgui/dispcalgui-2.5.0.0.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 fdo-mime eutils - -MY_PN="dispcalGUI" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Display Calibration and Characterization powered by Argyll CMS" -HOMEPAGE="http://dispcalgui.hoech.net/"; -SRC_URI="mirror://sourceforge/${PN}/${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 - >=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-r1_src_prepare -} - -src_install() { - distutils-r1_src_install - #remove udev files - rm -rf "${D}"/etc/udev/rules.d -} - -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 -} - -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 -} diff --git a/media-gfx/dispcalgui/dispcalgui-2.6.0.0.ebuild b/media-gfx/dispcalgui/dispcalgui-2.6.0.0.ebuild deleted file mode 100644 index 44a9160..0000000 --- a/media-gfx/dispcalgui/dispcalgui-2.6.0.0.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 fdo-mime eutils - -MY_PN="dispcalGUI" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Display Calibration and Characterization powered by Argyll CMS" -HOMEPAGE="http://dispcalgui.hoech.net/"; -SRC_URI="mirror://sourceforge/${PN}/${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 - >=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-r1_src_prepare -} - -src_install() { - distutils-r1_src_install - #remove udev files - rm -rf "${D}"/etc/udev/rules.d -} - -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 -} - -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 -} 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 deleted file mode 100644 index 8343b2b..0000000 --- a/media-gfx/dispcalgui/files/dispcalgui-1.2.7.0-wxversion-select.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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" diff --git a/media-gfx/dispcalgui/files/dispcalgui-2.0.0.0-wxversion-select.patch b/media-gfx/dispcalgui/files/dispcalgui-2.0.0.0-wxversion-select.patch deleted file mode 100644 index dd3815d..0000000 --- a/media-gfx/dispcalgui/files/dispcalgui-2.0.0.0-wxversion-select.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- dispcalGUI/main.py.orig 2014-03-04 20:44:41.266561455 +0200 -+++ dispcalGUI/main.py 2014-03-04 20:44:24.194511770 +0200 -@@ -19,6 +19,10 @@ if pyver < py_minversion or pyver > py_m - ".".join(str(n) for n in py_maxversion), - sys.version.split()[0])) - -+# Gentoo compatibility module -+import wxversion -+wxversion.select("2.8") -+ - from config import (autostart_home, datahome, enc, exe, exe_ext, exedir, - exename, fs_enc, isapp, isexe, pydir, pyname, pypath, - runtype) diff --git a/media-gfx/displaycal/Manifest b/media-gfx/displaycal/Manifest new file mode 100644 index 0000000..60fffe1 --- /dev/null +++ b/media-gfx/displaycal/Manifest @@ -0,0 +1,2 @@ +DIST DisplayCAL-3.0.6.0.tar.gz 16228 SHA256 ff19c4299e33a587103ab475d136e446bfc7a5b631c8b90563227fe6b9898077 SHA512 003110ddb26b01e1517a2605d341649600b64dfa4b55c3cb8e38b5160c5d2b0d876ae76e6a5b4571740b0030c3c713958bc1d7723d5c0c31e626ac4c702e91ee WHIRLPOOL 30ebaf130f0ae3765fd2ada8852d4bd9443ce24b3b53cdd3c111abe9d5b4715e42214ddf69747b2dc806f119106f93436d3f894fc0dcf00c5748b701f08af8a7 +DIST DisplayCAL-3.1.2.0.tar.gz 9361108 SHA256 78dbfd2be1cf7542657cc0f5ed9e16e27558206a4878ffae5ce68bd62460680d SHA512 2c14ed0230e6bdd6f8876a5e8887498e3005941e2f68aedad2926f9b8dda642e909f9aa70205977123b1b7c1376dd3f361ad08ecc5015bfae77342ff1b848837 WHIRLPOOL 74f311618190974e6e9c0c5b895ab7f0dba18de06e52dcf1cca4df0373a278b4c4e170b6add51bdf550b21499ff1ecf249cae6f2eb2f3e0813c666bd0bc4f941 diff --git a/media-gfx/dispcalgui/dispcalgui-3.0.6.0.ebuild b/media-gfx/displaycal/displaycal-3.0.6.0.ebuild similarity index 99% rename from media-gfx/dispcalgui/dispcalgui-3.0.6.0.ebuild rename to media-gfx/displaycal/displaycal-3.0.6.0.ebuild index e0d0597..5fd3dff 100644 --- a/media-gfx/dispcalgui/dispcalgui-3.0.6.0.ebuild +++ b/media-gfx/displaycal/displaycal-3.0.6.0.ebuild @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 ) inherit distutils-r1 fdo-mime eutils -MY_PN="dispcalGUI" +MY_PN="DisplayCAL" MY_P="${MY_PN}-${PV}" DESCRIPTION="Display Calibration and Characterization powered by Argyll CMS" diff --git a/media-gfx/dispcalgui/dispcalgui-2.0.0.0.ebuild b/media-gfx/displaycal/displaycal-3.1.2.0.ebuild similarity index 55% rename from media-gfx/dispcalgui/dispcalgui-2.0.0.0.ebuild rename to media-gfx/displaycal/displaycal-3.1.2.0.ebuild index 4cebac9..0d69de9 100644 --- a/media-gfx/dispcalgui/dispcalgui-2.0.0.0.ebuild +++ b/media-gfx/displaycal/displaycal-3.1.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -7,12 +7,12 @@ PYTHON_COMPAT=( python2_7 ) inherit distutils-r1 fdo-mime eutils -MY_PN="dispcalGUI" +MY_PN="DisplayCAL" MY_P="${MY_PN}-${PV}" -DESCRIPTION="Display Calibration and Characterization powered by Argyll CMS" -HOMEPAGE="http://dispcalgui.hoech.net/"; -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" +DESCRIPTION="Display calibration and characterization powered by Argyll CMS" +HOMEPAGE="https://displaycal.net/"; +SRC_URI="mirror://sourceforge/dispcalgui/${MY_P}.tar.gz" LICENSE="GPL-3" SLOT="0" @@ -37,21 +37,24 @@ 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." + # Prohibit setup from running xdg-* programs, resulting to sandbox violation + cd "${S}/DisplayCAL" || 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" + -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 + # 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 + # Remove x-world Media Type + cd "${S}/misc" || die "Cannot cd to misc directory." + sed -e 's/x\-world\/x\-vrml\;//g' -i "displaycal-vrml-to-x3d-converter.desktop" \ + || die "removing x-world media type failed" + distutils-r1_src_prepare } @@ -62,13 +65,15 @@ src_install() { } pkg_postinst() { -# Run xdg-* programs the Gentoo way since we removed this functionality from the original package + # 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 } pkg_postrm() { -# Run xdg-* programs the Gentoo way since we removed this functionality from the original package + # 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 } diff --git a/media-gfx/dispcalgui/metadata.xml b/media-gfx/displaycal/metadata.xml similarity index 100% rename from media-gfx/dispcalgui/metadata.xml rename to media-gfx/displaycal/metadata.xml diff --git a/profiles/updates/2Q-2016 b/profiles/updates/2Q-2016 index d6f9a63..1038c89 100644 --- a/profiles/updates/2Q-2016 +++ b/profiles/updates/2Q-2016 @@ -23,3 +23,4 @@ move dev-perl/text-wrapper dev-perl/Text-Wrapper move dev-perl/tie-encryptedhash dev-perl/Tie-EncryptedHash move dev-perl/yaml dev-perl/YAML move app-dicts/myspell-de-alt app-dicts/myspell-de_1901 +move media-gfx/dispcalgui media-gfx/displaycal
