1 |
ssuominen 10/01/03 15:57:01 |
2 |
|
3 |
Modified: nvclock-9999.ebuild ChangeLog |
4 |
nvclock-0.8_beta4-r4.ebuild |
5 |
Log: |
6 |
Remove USE="qt3" support wrt bug #284046. |
7 |
(Portage version: 2.2_rc61/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.2 media-video/nvclock/nvclock-9999.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/nvclock/nvclock-9999.ebuild?rev=1.2&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/nvclock/nvclock-9999.ebuild?rev=1.2&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/nvclock/nvclock-9999.ebuild?r1=1.1&r2=1.2 |
15 |
|
16 |
Index: nvclock-9999.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/media-video/nvclock/nvclock-9999.ebuild,v |
19 |
retrieving revision 1.1 |
20 |
retrieving revision 1.2 |
21 |
diff -u -r1.1 -r1.2 |
22 |
--- nvclock-9999.ebuild 28 Jul 2009 17:14:17 -0000 1.1 |
23 |
+++ nvclock-9999.ebuild 3 Jan 2010 15:57:01 -0000 1.2 |
24 |
@@ -1,6 +1,6 @@ |
25 |
-# Copyright 1999-2009 Gentoo Foundation |
26 |
+# Copyright 1999-2010 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/nvclock-9999.ebuild,v 1.1 2009/07/28 17:14:17 jer Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/nvclock-9999.ebuild,v 1.2 2010/01/03 15:57:01 ssuominen Exp $ |
30 |
|
31 |
EAPI="2" |
32 |
|
33 |
@@ -17,11 +17,10 @@ |
34 |
LICENSE="GPL-2" |
35 |
SLOT="0" |
36 |
KEYWORDS="" |
37 |
-IUSE="gtk qt3" |
38 |
+IUSE="gtk" |
39 |
|
40 |
RDEPEND=" |
41 |
gtk? ( x11-libs/gtk+:2 ) |
42 |
- qt3? ( x11-libs/qt:3 ) |
43 |
" |
44 |
DEPEND="${RDEPEND}" |
45 |
|
46 |
@@ -32,11 +31,7 @@ |
47 |
} |
48 |
|
49 |
src_configure() { |
50 |
- # Needed to ensure it compiles against Qt3 rather than Qt4 |
51 |
- export QTDIR=/usr/qt/3 |
52 |
- export MOC=${QTDIR}/bin/moc |
53 |
- |
54 |
- econf $(use_enable qt3 qt) $(use_enable gtk) || die "econf failed" |
55 |
+ econf --disable-qt $(use_enable gtk) || die "econf failed" |
56 |
} |
57 |
|
58 |
src_compile() { |
59 |
|
60 |
|
61 |
|
62 |
1.43 media-video/nvclock/ChangeLog |
63 |
|
64 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/nvclock/ChangeLog?rev=1.43&view=markup |
65 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/nvclock/ChangeLog?rev=1.43&content-type=text/plain |
66 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/nvclock/ChangeLog?r1=1.42&r2=1.43 |
67 |
|
68 |
Index: ChangeLog |
69 |
=================================================================== |
70 |
RCS file: /var/cvsroot/gentoo-x86/media-video/nvclock/ChangeLog,v |
71 |
retrieving revision 1.42 |
72 |
retrieving revision 1.43 |
73 |
diff -u -r1.42 -r1.43 |
74 |
--- ChangeLog 15 Dec 2009 07:51:57 -0000 1.42 |
75 |
+++ ChangeLog 3 Jan 2010 15:57:01 -0000 1.43 |
76 |
@@ -1,6 +1,10 @@ |
77 |
# ChangeLog for media-video/nvclock |
78 |
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
79 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/ChangeLog,v 1.42 2009/12/15 07:51:57 vapier Exp $ |
80 |
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
81 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/ChangeLog,v 1.43 2010/01/03 15:57:01 ssuominen Exp $ |
82 |
+ |
83 |
+ 03 Jan 2010; Samuli Suominen <ssuominen@g.o> |
84 |
+ nvclock-0.8_beta4-r4.ebuild, nvclock-9999.ebuild: |
85 |
+ Remove USE="qt3" support wrt bug #284046. |
86 |
|
87 |
15 Dec 2009; Mike Frysinger <vapier@g.o> |
88 |
nvclock-0.8_beta4-r4.ebuild, +files/nvclock-0.8_beta4-headers.patch: |
89 |
|
90 |
|
91 |
|
92 |
1.6 media-video/nvclock/nvclock-0.8_beta4-r4.ebuild |
93 |
|
94 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/nvclock/nvclock-0.8_beta4-r4.ebuild?rev=1.6&view=markup |
95 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/nvclock/nvclock-0.8_beta4-r4.ebuild?rev=1.6&content-type=text/plain |
96 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/nvclock/nvclock-0.8_beta4-r4.ebuild?r1=1.5&r2=1.6 |
97 |
|
98 |
Index: nvclock-0.8_beta4-r4.ebuild |
99 |
=================================================================== |
100 |
RCS file: /var/cvsroot/gentoo-x86/media-video/nvclock/nvclock-0.8_beta4-r4.ebuild,v |
101 |
retrieving revision 1.5 |
102 |
retrieving revision 1.6 |
103 |
diff -u -r1.5 -r1.6 |
104 |
--- nvclock-0.8_beta4-r4.ebuild 15 Dec 2009 07:51:57 -0000 1.5 |
105 |
+++ nvclock-0.8_beta4-r4.ebuild 3 Jan 2010 15:57:01 -0000 1.6 |
106 |
@@ -1,6 +1,6 @@ |
107 |
-# Copyright 1999-2009 Gentoo Foundation |
108 |
+# Copyright 1999-2010 Gentoo Foundation |
109 |
# Distributed under the terms of the GNU General Public License v2 |
110 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/nvclock-0.8_beta4-r4.ebuild,v 1.5 2009/12/15 07:51:57 vapier Exp $ |
111 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvclock/nvclock-0.8_beta4-r4.ebuild,v 1.6 2010/01/03 15:57:01 ssuominen Exp $ |
112 |
|
113 |
EAPI="2" |
114 |
|
115 |
@@ -15,16 +15,11 @@ |
116 |
LICENSE="GPL-2" |
117 |
SLOT="0" |
118 |
KEYWORDS="amd64 ppc x86" |
119 |
-IUSE="gtk qt3" |
120 |
+IUSE="gtk" |
121 |
|
122 |
-RDEPEND="gtk? ( =x11-libs/gtk+-2* ) |
123 |
- qt3? ( =x11-libs/qt-3* )" |
124 |
+RDEPEND="gtk? ( =x11-libs/gtk+-2* )" |
125 |
|
126 |
src_prepare() { |
127 |
- # Patch to fix broken autoconf macro "--with-qt-libs" needed below |
128 |
- # Submitted upstream, hopefully fixed in a later version |
129 |
- use qt3 && epatch "${FILESDIR}"/nvclock_acinclude_qtlibs.patch |
130 |
- |
131 |
# Bug #240846: |
132 |
epatch "${FILESDIR}"/${P}-flags.patch |
133 |
epatch "${FILESDIR}"/${P}-as-needed.patch |
134 |
@@ -39,24 +34,18 @@ |
135 |
|
136 |
src_configure() { |
137 |
tc-export CC CXX |
138 |
- # Needed to ensure it compiles against Qt3 rather than Qt4 |
139 |
- export QTDIR=/usr/qt/3 |
140 |
- export MOC=${QTDIR}/bin/moc |
141 |
|
142 |
local myconf |
143 |
|
144 |
myconf="--bindir=/usr/bin" |
145 |
|
146 |
- # Qt3 package doesn't install symlinks from ${QTDIR}/lib64 to ${QTDIR}/lib |
147 |
- use amd64 && myconf="${myconf} --with-qt-libs=${QTDIR}/lib64" |
148 |
- |
149 |
- if use gtk || use qt3; then |
150 |
+ if use gtk; then |
151 |
myconf="${myconf} --enable-nvcontrol" |
152 |
else |
153 |
myconf="${myconf} --disable-nvcontrol" |
154 |
fi |
155 |
|
156 |
- econf $(use_enable qt3 qt) $(use_enable gtk) ${myconf} || die |
157 |
+ econf --disable-qt $(use_enable gtk) ${myconf} || die |
158 |
} |
159 |
|
160 |
src_compile() { |