Gentoo Archives: gentoo-commits

From: Davide Pesavento <pesa@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: media-gfx/screenie/files/, media-gfx/screenie/, sets/
Date: Sat, 31 May 2014 13:29:09
Message-Id: 1401542872.fbd9afbe298fa8978af904eee9b65aaa2561a136.pesa@gentoo
1 commit: fbd9afbe298fa8978af904eee9b65aaa2561a136
2 Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 31 13:27:52 2014 +0000
4 Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
5 CommitDate: Sat May 31 13:27:52 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=fbd9afbe
7
8 [media-gfx/screenie] Remove package.
9
10 No interest. No official releases. Last upstream commit more than 3 years ago.
11
12 ---
13 media-gfx/screenie/files/screenie-9999-build.patch | 32 ------------------
14 .../screenie/files/screenie-9999-desktop.patch | 33 ------------------
15 media-gfx/screenie/metadata.xml | 5 ---
16 media-gfx/screenie/screenie-9999.ebuild | 39 ----------------------
17 sets/qt-extras-live | 1 -
18 5 files changed, 110 deletions(-)
19
20 diff --git a/media-gfx/screenie/files/screenie-9999-build.patch b/media-gfx/screenie/files/screenie-9999-build.patch
21 deleted file mode 100644
22 index d1987f1..0000000
23 --- a/media-gfx/screenie/files/screenie-9999-build.patch
24 +++ /dev/null
25 @@ -1,32 +0,0 @@
26 -From b39c4a03503aa1449efaae0c827fd207d8c96992 Mon Sep 17 00:00:00 2001
27 -From: Michael <kensington@×××××××××××.net>
28 -Date: Thu, 5 Apr 2012 21:58:03 +1000
29 -Subject: [PATCH 1/2] Avoid collision with minor/major macro definitions in
30 - glibc.
31 -
32 ----
33 - src/Utils/src/Version.cpp | 8 ++++++++
34 - 1 file changed, 8 insertions(+)
35 -
36 -diff --git a/src/Utils/src/Version.cpp b/src/Utils/src/Version.cpp
37 -index a41116b..5f4c2a6 100644
38 ---- a/src/Utils/src/Version.cpp
39 -+++ b/src/Utils/src/Version.cpp
40 -@@ -22,6 +22,14 @@
41 - #include <QtCore/QRegExp>
42 - #include "Version.h"
43 -
44 -+#ifdef minor
45 -+#undef minor
46 -+#endif
47 -+
48 -+#ifdef major
49 -+#undef major
50 -+#endif
51 -+
52 - class VersionPrivate
53 - {
54 - public:
55 ---
56 -1.7.12
57 -
58
59 diff --git a/media-gfx/screenie/files/screenie-9999-desktop.patch b/media-gfx/screenie/files/screenie-9999-desktop.patch
60 deleted file mode 100644
61 index 7bb70b7..0000000
62 --- a/media-gfx/screenie/files/screenie-9999-desktop.patch
63 +++ /dev/null
64 @@ -1,33 +0,0 @@
65 -From 5320cf9b5c764d621b7135a13d84d1cd9f63e2df Mon Sep 17 00:00:00 2001
66 -From: Michael <kensington@×××××××××××.net>
67 -Date: Thu, 5 Apr 2012 22:05:37 +1000
68 -Subject: [PATCH 2/2] Fix screenie.desktop to pass validation.
69 -
70 ----
71 - src/Screenie/res/screenie.desktop | 7 +++----
72 - 1 file changed, 3 insertions(+), 4 deletions(-)
73 -
74 -diff --git a/src/Screenie/res/screenie.desktop b/src/Screenie/res/screenie.desktop
75 -index aa316d3..d2f6988 100644
76 ---- a/src/Screenie/res/screenie.desktop
77 -+++ b/src/Screenie/res/screenie.desktop
78 -@@ -1,5 +1,5 @@
79 - [Desktop Entry]
80 --Version=0.1.0
81 -+Version=1.0
82 - Type=Application
83 - Name=Screenie
84 - GenericName=Screenshot composer
85 -@@ -8,7 +8,6 @@ Exec=Screenie %U
86 - TryExec=Screenie
87 - Icon=screenie
88 - Terminal=false
89 --Categories=Graphics;2DGraphics;RasterGraphics;Qt
90 -+Categories=Graphics;2DGraphics;RasterGraphics;Qt;
91 - StartupNotify=true
92 --MimeType=application/x-xsc
93 --
94 -+MimeType=application/x-xsc;
95 ---
96 -1.7.12
97 -
98
99 diff --git a/media-gfx/screenie/metadata.xml b/media-gfx/screenie/metadata.xml
100 deleted file mode 100644
101 index dc439f7..0000000
102 --- a/media-gfx/screenie/metadata.xml
103 +++ /dev/null
104 @@ -1,5 +0,0 @@
105 -<?xml version="1.0" encoding="UTF-8"?>
106 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
107 -<pkgmetadata>
108 -<herd>qt</herd>
109 -</pkgmetadata>
110
111 diff --git a/media-gfx/screenie/screenie-9999.ebuild b/media-gfx/screenie/screenie-9999.ebuild
112 deleted file mode 100644
113 index dcb5510..0000000
114 --- a/media-gfx/screenie/screenie-9999.ebuild
115 +++ /dev/null
116 @@ -1,39 +0,0 @@
117 -# Copyright 1999-2014 Gentoo Foundation
118 -# Distributed under the terms of the GNU General Public License v2
119 -# $Header: $
120 -
121 -EAPI=4
122 -
123 -inherit qt4-r2 git-2
124 -
125 -DESCRIPTION="A small Qt-based tool to allow you to compose fancy and stylish screenshots"
126 -HOMEPAGE="http://code.google.com/p/screenie"
127 -EGIT_REPO_URI="git://github.com/ariya/screenie.git"
128 -
129 -LICENSE="GPL-2 GPL-3"
130 -SLOT="0"
131 -KEYWORDS=""
132 -IUSE=""
133 -
134 -DEPEND="dev-qt/qtgui:4"
135 -RDEPEND="${DEPEND}"
136 -
137 -PATCHES=(
138 - "${FILESDIR}/${P}-build.patch"
139 - "${FILESDIR}/${P}-desktop.patch"
140 -)
141 -
142 -src_prepare () {
143 - qt4-r2_src_prepare
144 - sed -i -e "/^Exec/s:Screenie:${PN}:" -e "/^TryExec/s:Screenie:${PN}:" \
145 - "${S}"/src/Screenie/res/${PN}.desktop || die
146 -}
147 -
148 -src_install() {
149 - # The package uses generic library names that may cause collisions
150 - # in the future. They need to be moved to a subfolder
151 - dolib.so "${S}"/bin/release/*.so*
152 - newbin "${S}"/bin/release/Screenie ${PN}
153 - newicon "${S}"/src/Resources/img/application-icon.png ${PN}.png
154 - domenu "${S}"/src/Screenie/res/${PN}.desktop
155 -}
156
157 diff --git a/sets/qt-extras-live b/sets/qt-extras-live
158 index 6671c99..8cdea00 100644
159 --- a/sets/qt-extras-live
160 +++ b/sets/qt-extras-live
161 @@ -12,7 +12,6 @@
162 ~dev-vcs/hgview-9999
163 ~dev-vcs/qgit-9999
164 ~media-gfx/photivo-9999
165 -~media-gfx/screenie-9999
166 ~media-sound/mp3diags-9999
167 ~media-sound/qpitch-9999
168 ~media-sound/qtmpc-9999