Gentoo Archives: gentoo-commits

From: Ian Delaney <idella4@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/dispcalgui/
Date: Sun, 03 Jan 2016 11:42:14
Message-Id: 1451821205.9540e77a97772ab95b3bca7d538980b5a65d2180.idella4@gentoo
1 commit: 9540e77a97772ab95b3bca7d538980b5a65d2180
2 Author: Ian Delaney <idella4 <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 3 11:08:33 2016 +0000
4 Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 3 11:40:05 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9540e77a
7
8 media-gfx/dispcalgui: corrections to white soace issues in vn. 3.0.6.0
9
10 Also set to new proxy maintainer 'xayto' in metadata
11 Closes the gentoo bug
12
13 Gentoo bug: #559512
14
15 Package-Manager: portage-2.2.26
16
17 media-gfx/dispcalgui/dispcalgui-3.0.6.0.ebuild | 21 ++++++++++++---------
18 media-gfx/dispcalgui/metadata.xml | 11 +++--------
19 2 files changed, 15 insertions(+), 17 deletions(-)
20
21 diff --git a/media-gfx/dispcalgui/dispcalgui-3.0.6.0.ebuild b/media-gfx/dispcalgui/dispcalgui-3.0.6.0.ebuild
22 index 946362d..854a19b 100644
23 --- a/media-gfx/dispcalgui/dispcalgui-3.0.6.0.ebuild
24 +++ b/media-gfx/dispcalgui/dispcalgui-3.0.6.0.ebuild
25 @@ -37,22 +37,23 @@ DOCS=(
26 )
27
28 src_prepare() {
29 -# Prohibit setup from running xdg-* programs, resulting to sandbox violation
30 + # Prohibit setup from running xdg-* programs, resulting to sandbox violation
31 cd "${S}/dispcalGUI" || die "Cannot cd to source directory."
32 sed -e 's/if which(\"xdg-icon-resource\"):/if which(\"xdg-icon-resource-non-existant\"):/' \
33 - -e 's/if which(\"xdg-desktop-menu\"):/if which(\"xdg-desktop-menu-non-existant\"):/' \
34 - -i postinstall.py || die "sed'ing out the xdg-* setup functions failed"
35 + -e 's/if which(\"xdg-desktop-menu\"):/if which(\"xdg-desktop-menu-non-existant\"):/' \
36 + -i postinstall.py || die "sed'ing out the xdg-* setup functions failed"
37
38 -# Remove deprecated Encoding key from .desktop file
39 + # Remove deprecated Encoding key from .desktop file
40 cd "${S}" || die "Cannot cd to work directory."
41 for offendingFile in $(grep -r -l "Encoding=UTF-8" .); do
42 sed -e '/Encoding=UTF-8/d' -i "${offendingFile}" || \
43 die "removing deprecated Encoding key from .desktop files failed"
44 done
45
46 -# Remove x-world Media Type
47 - cd "${S}/misc" || die "Cannot cd to misc directory."
48 - sed -e 's/x\-world\/x\-vrml\;//g' -i "dispcalGUI-VRML-to-X3D-converter.desktop" || die "removing x-world media type failed"
49 + # Remove x-world Media Type
50 + cd "${S}/misc" || die "Cannot cd to misc directory."
51 + sed -e 's/x\-world\/x\-vrml\;//g' -i "dispcalGUI-VRML-to-X3D-converter.desktop" \
52 + || die "removing x-world media type failed"
53
54 distutils-r1_src_prepare
55 }
56 @@ -64,13 +65,15 @@ src_install() {
57 }
58
59 pkg_postinst() {
60 -# Run xdg-* programs the Gentoo way since we removed this functionality from the original package
61 + # Run xdg-* programs the Gentoo way since we removed this
62 + # functionality from the original package
63 fdo-mime_mime_database_update
64 fdo-mime_desktop_database_update
65 }
66
67 pkg_postrm() {
68 -# Run xdg-* programs the Gentoo way since we removed this functionality from the original package
69 + # Run xdg-* programs the Gentoo way since we removed this
70 + # functionality from the original package
71 fdo-mime_mime_database_update
72 fdo-mime_desktop_database_update
73 }
74
75 diff --git a/media-gfx/dispcalgui/metadata.xml b/media-gfx/dispcalgui/metadata.xml
76 index 3a8ed72..8d4a696 100644
77 --- a/media-gfx/dispcalgui/metadata.xml
78 +++ b/media-gfx/dispcalgui/metadata.xml
79 @@ -3,14 +3,9 @@
80 <pkgmetadata>
81 <herd>proxy-maintainers</herd>
82 <maintainer>
83 - <email>opensource@×××××××××.com</email>
84 - <name>Marios Andreopoulos</name>
85 - <description>Maintainer.</description>
86 - </maintainer>
87 - <maintainer>
88 - <email>hwoarang@g.o</email>
89 - <name>Markos Chandras</name>
90 - <description>Proxy maintainer.</description>
91 + <email>gentoo@×××××.net</email>
92 + <name>Craig Inches</name>
93 + <description>Proxied maintainer; set to assignee in all bugs</description>
94 </maintainer>
95 <longdescription lang="en">
96 </longdescription>