aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo Chatzimichos <tampakrap@gentoo.org>2012-02-01 00:14:28 (GMT)
committerTheo Chatzimichos <tampakrap@gentoo.org>2012-02-01 00:14:28 (GMT)
commitdbb2feb6b7c9e2ae81437dfbbda2eb87b7b03872 (patch)
tree312736e7fd469828728374be9df5e1e483b55d0a
parentqt4-build-edge: Eclass now supports EAPI4 as well (diff)
downloadqt-dbb2feb6.zip
qt-dbb2feb6.tar.gz
qt-dbb2feb6.tar.bz2
qting-edge -> qt overlay
-rwxr-xr-xDocumentation/maintainers/bump-live-qt9
-rwxr-xr-xDocumentation/maintainers/bump-python-revisions6
-rwxr-xr-xDocumentation/maintainers/bump-qt-overlay9
-rwxr-xr-xDocumentation/maintainers/bump-qt-release2
-rw-r--r--README.rst6
-rw-r--r--eclass/qt4-build-edge.eclass6
-rw-r--r--eclass/qt4-edge.eclass4
-rw-r--r--profiles/package.mask2
-rw-r--r--profiles/use.desc2
-rw-r--r--sets.conf4
10 files changed, 24 insertions, 26 deletions
diff --git a/Documentation/maintainers/bump-live-qt b/Documentation/maintainers/bump-live-qt
index 1a54893..bea698e 100755
--- a/Documentation/maintainers/bump-live-qt
+++ b/Documentation/maintainers/bump-live-qt
@@ -13,9 +13,8 @@ moto(){
# overlay packages as base. Version 0.0.1 #
# Usefull for bumping qt releases e.g. #
# 4.6.9999 -> 4.7.9999 on overlay. #
- # Markos Chandras #
- # hwoarang@gentoo.org #
- # qting-edge overlay #
+ # Markos Chandras <hwoarang@gentoo.org> #
+ # qt overlay #
##############################################
"""
}
@@ -23,10 +22,10 @@ moto(){
usage(){
echo """
##################### USAGE #####################
- # E.g #
+ # E.g #
# ./bump-qt-overlay 4.5.1 4.5.2 will copy 4.5.1 #
# packages from portage and bump them to 4.5.2 #
- # on qting-edge overlay #
+ # on qt overlay #
#################################################
"""
}
diff --git a/Documentation/maintainers/bump-python-revisions b/Documentation/maintainers/bump-python-revisions
index d565ec7..d3ee96b 100755
--- a/Documentation/maintainers/bump-python-revisions
+++ b/Documentation/maintainers/bump-python-revisions
@@ -6,7 +6,7 @@ PVER="4.9" # PyQt4 current working version
SVER="4.13.1" #$ Sip current working version
DATE="$(date +%F|sed 's/-//g')" # date to be added to ebuilds
TARGET="www.gentoo-el.org:~/public_html/distfiles/"
-TEMP="/tmp/qting-edge-python-bump/"
+TEMP="/tmp/qt-python-bump/"
OVERLAY="../../" # ugly but hey dont shoot me
####################################################################
@@ -128,9 +128,9 @@ getrevisions(){
einfo """
###########################################################
- # Automatic PyQt4/sip bumping tool for qting-edge overlay #
+ # Automatic PyQt4/sip bumping tool for qt overlay #
# Author: Markos Chandras <hwoarang@gentoo.org> #
- # #
+ # #
# Use ./bump-python-revisions -h for a usage example #
###########################################################
"""
diff --git a/Documentation/maintainers/bump-qt-overlay b/Documentation/maintainers/bump-qt-overlay
index f71c0f1..9bfc511 100755
--- a/Documentation/maintainers/bump-qt-overlay
+++ b/Documentation/maintainers/bump-qt-overlay
@@ -13,10 +13,9 @@ moto(){
# Tool for bumping qt packages using portage #
# packages as base. Version 0.0.1 #
# Usefull for bumping qt releases e.g. 4.5.1 #
- # -> 4.5.2 on overlay. #
- # Markos Chandras #
- # hwoarang@gentoo.org #
- # qting-edge overlay #
+ # -> 4.5.2 on overlay. #
+ # Markos Chandras <hwoarang@gentoo.org> #
+ # qt overlay #
##############################################
"""
}
@@ -27,7 +26,7 @@ usage(){
# E.g #
# ./bump-qt-overlay 4.5.1 4.5.2 will copy 4.5.1 #
# packages from portage and bump them to 4.5.2 #
- # on qting-edge overlay #
+ # on qt overlay #
#################################################
"""
}
diff --git a/Documentation/maintainers/bump-qt-release b/Documentation/maintainers/bump-qt-release
index f2e1218..73dd6b9 100755
--- a/Documentation/maintainers/bump-qt-release
+++ b/Documentation/maintainers/bump-qt-release
@@ -4,7 +4,7 @@
# make sure you take care of any new patches before running this script
# this does not include the qt meta ebuild
-EdgeDir="~/overlay/qting-edge"
+EdgeDir="~/overlay/qt"
RelVer="4.5.2"
echo
diff --git a/README.rst b/README.rst
index f5c8f1b..4876ccd 100644
--- a/README.rst
+++ b/README.rst
@@ -1,5 +1,5 @@
-Welcome to the qting-edge overlay!
-==================================
+Welcome to the qt overlay!
+==========================
This is where the Gentoo Qt team develops and maintains ebuilds for
experimental Qt4 versions (pre-releases and "live" code from git or svn) and
@@ -53,7 +53,7 @@ If you have questions, you can find us on IRC in #gentoo-qt on Freenode or at
qt@gentoo.org.
Bugs should be reported on https://bugs.gentoo.org. Be sure to include
-[qting-edge] in the summary of your bug report.
+[qt overlay] in the summary of your bug report.
Users wanting to contribute should first read the `Qt4 ebuild guide
<http://www.gentoo.org/proj/en/desktop/qt/qt4-based-ebuild-howto.xml>`_.
diff --git a/eclass/qt4-build-edge.eclass b/eclass/qt4-build-edge.eclass
index e07e65d..649e441 100644
--- a/eclass/qt4-build-edge.eclass
+++ b/eclass/qt4-build-edge.eclass
@@ -5,7 +5,7 @@
# @ECLASS: qt4-build-edge.eclass
# @MAINTAINER:
# Qt herd <qt@gentoo.org>
-# @BLURB: Eclass for Qt4 split ebuilds in qting-edge overlay.
+# @BLURB: Eclass for Qt4 split ebuilds in qt overlay.
# @DESCRIPTION:
# This eclass contains various functions that are used when building Qt4.
@@ -58,8 +58,8 @@ qt4-build-edge_pkg_setup() {
if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
echo
ewarn "Please file bugs on bugs.gentoo.org and prepend the summary"
- ewarn "with [qting-edge]. Alternatively, contact <qt@gentoo.org>."
- ewarn "Thank you for using qting-edge overlay."
+ ewarn "with [qt overlay]. Alternatively, contact <qt@gentoo.org>."
+ ewarn "Thank you for using qt overlay."
ewarn
case "${MY_PV_EXTRA}" in
4.?.9999 | 4.9999)
diff --git a/eclass/qt4-edge.eclass b/eclass/qt4-edge.eclass
index 9a3450f..58bbea0 100644
--- a/eclass/qt4-edge.eclass
+++ b/eclass/qt4-edge.eclass
@@ -18,8 +18,8 @@ qt4-edge_pkg_setup() {
if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]]; then
ewarn
ewarn "Please file bugs on bugs.gentoo.org and prepend the summary with"
- ewarn "[qting-edge]. Alternatively, contact qt@gentoo.org."
- ewarn "Thank you for using qting-edge overlay."
+ ewarn "[qt overlay]. Alternatively, contact qt@gentoo.org."
+ ewarn "Thank you for using qt overlay."
ewarn
fi
}
diff --git a/profiles/package.mask b/profiles/package.mask
index 6207f6e..08d7840 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,4 +1,4 @@
-# qting-edge/profiles/package.mask
+# qt/profiles/package.mask
# Add your name and the date, as well as an explanation for the mask
# Make sure the atoms you add are valid!
diff --git a/profiles/use.desc b/profiles/use.desc
index a441417..69e06b2 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -1,4 +1,4 @@
-# qting-edge/profiles/use.desc
+# qt/profiles/use.desc
# Please keep alphabetically sorted
custom-cxxflags - Allows building with user set CXXFLAGS
diff --git a/sets.conf b/sets.conf
index 6841d3e..31fb98b 100644
--- a/sets.conf
+++ b/sets.conf
@@ -1,4 +1,4 @@
-[qting-edge sets]
+[qt sets]
class = portage.sets.files.StaticFileSet
multiset = true
-directory = ${repository:qting-edge}/sets/
+directory = ${repository:qt}/sets/