1 |
commit: dbb2feb6b7c9e2ae81437dfbbda2eb87b7b03872 |
2 |
Author: Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Feb 1 00:14:28 2012 +0000 |
4 |
Commit: Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 1 00:14:28 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=dbb2feb6 |
7 |
|
8 |
qting-edge -> qt overlay |
9 |
|
10 |
--- |
11 |
Documentation/maintainers/bump-live-qt | 9 ++++----- |
12 |
Documentation/maintainers/bump-python-revisions | 6 +++--- |
13 |
Documentation/maintainers/bump-qt-overlay | 9 ++++----- |
14 |
Documentation/maintainers/bump-qt-release | 2 +- |
15 |
README.rst | 6 +++--- |
16 |
eclass/qt4-build-edge.eclass | 6 +++--- |
17 |
eclass/qt4-edge.eclass | 4 ++-- |
18 |
profiles/package.mask | 2 +- |
19 |
profiles/use.desc | 2 +- |
20 |
sets.conf | 4 ++-- |
21 |
10 files changed, 24 insertions(+), 26 deletions(-) |
22 |
|
23 |
diff --git a/Documentation/maintainers/bump-live-qt b/Documentation/maintainers/bump-live-qt |
24 |
index 1a54893..bea698e 100755 |
25 |
--- a/Documentation/maintainers/bump-live-qt |
26 |
+++ b/Documentation/maintainers/bump-live-qt |
27 |
@@ -13,9 +13,8 @@ moto(){ |
28 |
# overlay packages as base. Version 0.0.1 # |
29 |
# Usefull for bumping qt releases e.g. # |
30 |
# 4.6.9999 -> 4.7.9999 on overlay. # |
31 |
- # Markos Chandras # |
32 |
- # hwoarang@g.o # |
33 |
- # qting-edge overlay # |
34 |
+ # Markos Chandras <hwoarang@g.o> # |
35 |
+ # qt overlay # |
36 |
############################################## |
37 |
""" |
38 |
} |
39 |
@@ -23,10 +22,10 @@ moto(){ |
40 |
usage(){ |
41 |
echo """ |
42 |
##################### USAGE ##################### |
43 |
- # E.g # |
44 |
+ # E.g # |
45 |
# ./bump-qt-overlay 4.5.1 4.5.2 will copy 4.5.1 # |
46 |
# packages from portage and bump them to 4.5.2 # |
47 |
- # on qting-edge overlay # |
48 |
+ # on qt overlay # |
49 |
################################################# |
50 |
""" |
51 |
} |
52 |
|
53 |
diff --git a/Documentation/maintainers/bump-python-revisions b/Documentation/maintainers/bump-python-revisions |
54 |
index d565ec7..d3ee96b 100755 |
55 |
--- a/Documentation/maintainers/bump-python-revisions |
56 |
+++ b/Documentation/maintainers/bump-python-revisions |
57 |
@@ -6,7 +6,7 @@ PVER="4.9" # PyQt4 current working version |
58 |
SVER="4.13.1" #$ Sip current working version |
59 |
DATE="$(date +%F|sed 's/-//g')" # date to be added to ebuilds |
60 |
TARGET="www.gentoo-el.org:~/public_html/distfiles/" |
61 |
-TEMP="/tmp/qting-edge-python-bump/" |
62 |
+TEMP="/tmp/qt-python-bump/" |
63 |
OVERLAY="../../" # ugly but hey dont shoot me |
64 |
#################################################################### |
65 |
|
66 |
@@ -128,9 +128,9 @@ getrevisions(){ |
67 |
|
68 |
einfo """ |
69 |
########################################################### |
70 |
- # Automatic PyQt4/sip bumping tool for qting-edge overlay # |
71 |
+ # Automatic PyQt4/sip bumping tool for qt overlay # |
72 |
# Author: Markos Chandras <hwoarang@g.o> # |
73 |
- # # |
74 |
+ # # |
75 |
# Use ./bump-python-revisions -h for a usage example # |
76 |
########################################################### |
77 |
""" |
78 |
|
79 |
diff --git a/Documentation/maintainers/bump-qt-overlay b/Documentation/maintainers/bump-qt-overlay |
80 |
index f71c0f1..9bfc511 100755 |
81 |
--- a/Documentation/maintainers/bump-qt-overlay |
82 |
+++ b/Documentation/maintainers/bump-qt-overlay |
83 |
@@ -13,10 +13,9 @@ moto(){ |
84 |
# Tool for bumping qt packages using portage # |
85 |
# packages as base. Version 0.0.1 # |
86 |
# Usefull for bumping qt releases e.g. 4.5.1 # |
87 |
- # -> 4.5.2 on overlay. # |
88 |
- # Markos Chandras # |
89 |
- # hwoarang@g.o # |
90 |
- # qting-edge overlay # |
91 |
+ # -> 4.5.2 on overlay. # |
92 |
+ # Markos Chandras <hwoarang@g.o> # |
93 |
+ # qt overlay # |
94 |
############################################## |
95 |
""" |
96 |
} |
97 |
@@ -27,7 +26,7 @@ usage(){ |
98 |
# E.g # |
99 |
# ./bump-qt-overlay 4.5.1 4.5.2 will copy 4.5.1 # |
100 |
# packages from portage and bump them to 4.5.2 # |
101 |
- # on qting-edge overlay # |
102 |
+ # on qt overlay # |
103 |
################################################# |
104 |
""" |
105 |
} |
106 |
|
107 |
diff --git a/Documentation/maintainers/bump-qt-release b/Documentation/maintainers/bump-qt-release |
108 |
index f2e1218..73dd6b9 100755 |
109 |
--- a/Documentation/maintainers/bump-qt-release |
110 |
+++ b/Documentation/maintainers/bump-qt-release |
111 |
@@ -4,7 +4,7 @@ |
112 |
# make sure you take care of any new patches before running this script |
113 |
# this does not include the qt meta ebuild |
114 |
|
115 |
-EdgeDir="~/overlay/qting-edge" |
116 |
+EdgeDir="~/overlay/qt" |
117 |
RelVer="4.5.2" |
118 |
|
119 |
echo |
120 |
|
121 |
diff --git a/README.rst b/README.rst |
122 |
index f5c8f1b..4876ccd 100644 |
123 |
--- a/README.rst |
124 |
+++ b/README.rst |
125 |
@@ -1,5 +1,5 @@ |
126 |
-Welcome to the qting-edge overlay! |
127 |
-================================== |
128 |
+Welcome to the qt overlay! |
129 |
+========================== |
130 |
|
131 |
This is where the Gentoo Qt team develops and maintains ebuilds for |
132 |
experimental Qt4 versions (pre-releases and "live" code from git or svn) and |
133 |
@@ -53,7 +53,7 @@ If you have questions, you can find us on IRC in #gentoo-qt on Freenode or at |
134 |
qt@g.o. |
135 |
|
136 |
Bugs should be reported on https://bugs.gentoo.org. Be sure to include |
137 |
-[qting-edge] in the summary of your bug report. |
138 |
+[qt overlay] in the summary of your bug report. |
139 |
|
140 |
Users wanting to contribute should first read the `Qt4 ebuild guide |
141 |
<http://www.gentoo.org/proj/en/desktop/qt/qt4-based-ebuild-howto.xml>`_. |
142 |
|
143 |
diff --git a/eclass/qt4-build-edge.eclass b/eclass/qt4-build-edge.eclass |
144 |
index e07e65d..649e441 100644 |
145 |
--- a/eclass/qt4-build-edge.eclass |
146 |
+++ b/eclass/qt4-build-edge.eclass |
147 |
@@ -5,7 +5,7 @@ |
148 |
# @ECLASS: qt4-build-edge.eclass |
149 |
# @MAINTAINER: |
150 |
# Qt herd <qt@g.o> |
151 |
-# @BLURB: Eclass for Qt4 split ebuilds in qting-edge overlay. |
152 |
+# @BLURB: Eclass for Qt4 split ebuilds in qt overlay. |
153 |
# @DESCRIPTION: |
154 |
# This eclass contains various functions that are used when building Qt4. |
155 |
|
156 |
@@ -58,8 +58,8 @@ qt4-build-edge_pkg_setup() { |
157 |
if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then |
158 |
echo |
159 |
ewarn "Please file bugs on bugs.gentoo.org and prepend the summary" |
160 |
- ewarn "with [qting-edge]. Alternatively, contact <qt@g.o>." |
161 |
- ewarn "Thank you for using qting-edge overlay." |
162 |
+ ewarn "with [qt overlay]. Alternatively, contact <qt@g.o>." |
163 |
+ ewarn "Thank you for using qt overlay." |
164 |
ewarn |
165 |
case "${MY_PV_EXTRA}" in |
166 |
4.?.9999 | 4.9999) |
167 |
|
168 |
diff --git a/eclass/qt4-edge.eclass b/eclass/qt4-edge.eclass |
169 |
index 9a3450f..58bbea0 100644 |
170 |
--- a/eclass/qt4-edge.eclass |
171 |
+++ b/eclass/qt4-edge.eclass |
172 |
@@ -18,8 +18,8 @@ qt4-edge_pkg_setup() { |
173 |
if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then |
174 |
ewarn |
175 |
ewarn "Please file bugs on bugs.gentoo.org and prepend the summary with" |
176 |
- ewarn "[qting-edge]. Alternatively, contact qt@g.o." |
177 |
- ewarn "Thank you for using qting-edge overlay." |
178 |
+ ewarn "[qt overlay]. Alternatively, contact qt@g.o." |
179 |
+ ewarn "Thank you for using qt overlay." |
180 |
ewarn |
181 |
fi |
182 |
} |
183 |
|
184 |
diff --git a/profiles/package.mask b/profiles/package.mask |
185 |
index 6207f6e..08d7840 100644 |
186 |
--- a/profiles/package.mask |
187 |
+++ b/profiles/package.mask |
188 |
@@ -1,4 +1,4 @@ |
189 |
-# qting-edge/profiles/package.mask |
190 |
+# qt/profiles/package.mask |
191 |
# Add your name and the date, as well as an explanation for the mask |
192 |
# Make sure the atoms you add are valid! |
193 |
|
194 |
|
195 |
diff --git a/profiles/use.desc b/profiles/use.desc |
196 |
index a441417..69e06b2 100644 |
197 |
--- a/profiles/use.desc |
198 |
+++ b/profiles/use.desc |
199 |
@@ -1,4 +1,4 @@ |
200 |
-# qting-edge/profiles/use.desc |
201 |
+# qt/profiles/use.desc |
202 |
# Please keep alphabetically sorted |
203 |
|
204 |
custom-cxxflags - Allows building with user set CXXFLAGS |
205 |
|
206 |
diff --git a/sets.conf b/sets.conf |
207 |
index 6841d3e..31fb98b 100644 |
208 |
--- a/sets.conf |
209 |
+++ b/sets.conf |
210 |
@@ -1,4 +1,4 @@ |
211 |
-[qting-edge sets] |
212 |
+[qt sets] |
213 |
class = portage.sets.files.StaticFileSet |
214 |
multiset = true |
215 |
-directory = ${repository:qting-edge}/sets/ |
216 |
+directory = ${repository:qt}/sets/ |