* [gentoo-commits] proj/qt:master commit in: Documentation/maintainers/
@ 2012-03-18 11:00 Markos Chandras
0 siblings, 0 replies; 26+ messages in thread
From: Markos Chandras @ 2012-03-18 11:00 UTC (permalink / raw
To: gentoo-commits
commit: daf2b7c12ac8ac1d482ca5eb04ea0f710dc9dee3
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 18 10:59:23 2012 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sun Mar 18 10:59:23 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=daf2b7c1
maintainers/bump-python-revisions: Make script a bit smarter
---
Documentation/maintainers/bump-python-revisions | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/Documentation/maintainers/bump-python-revisions b/Documentation/maintainers/bump-python-revisions
index af57af2..fe6cee9 100755
--- a/Documentation/maintainers/bump-python-revisions
+++ b/Documentation/maintainers/bump-python-revisions
@@ -2,8 +2,6 @@
source /etc/init.d/functions.sh
########################## VARIABLES ############################
-PVER="4.9.2" # PyQt4 current working version
-SVER="4.13.3" #$ 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/qt-python-bump/"
@@ -13,13 +11,8 @@ OVERLAY="../../" # ugly but hey dont shoot me
usage() {
echo """
-./bump-python-revisions <PyQt4-rev> <sip-rev>
-
-Example: ./bump-python-revisions 11cc33 22bba4
+./bump-python-revisions
-This will bump PyQt4 ebuild to 11cc33 revision,
-and Sip ebuild to snapshot to 22bba4 revision
-
Use -h option to display this message
Use -c option to skip bumping operation and do
directly the merge operation
@@ -94,13 +87,15 @@ getrevisions(){
pushd ${OVERLAY}/dev-python/PyQt4/ >> /dev/null
pyqt4_tomove=$(find '.' -type f -name "PyQt4-*_pre*.ebuild"|tail -1)
pyqt4_revision=$(grep ^REVISION ${pyqt4_tomove}|sed "s:^REVISION=::")
+ PVER=$(cat ${pyqt4_tomove}|sed "s:PyQt4-\(.*\)_pre.*:\1:")
popd >> /dev/null
pushd ${OVERLAY}/dev-python/sip/ >> /dev/null
sip_tomove=$(find '.' -type f -name "sip-*_pre*.ebuild"|tail -1)
sip_revision=$(grep ^HG_REVISION ${sip_tomove}|sed "s:^HG_REVISION=::")
+ SVER=$(cat ${sip_tomove}|sed "s:sip-\(.*\)_pre.*:\1:")
popd >> /dev/null
- einfo "Old Revisions: PyQt4 ${pyqt4_revision}, SIP: ${sip_revision}"
+ einfo "Old Revisions: PyQt4: ${pyqt4_revision}, SIP: ${sip_revision}"
# Find new revisions
new_pyqt4=$(curl -s http://www.riverbankcomputing.com/software/pyqt/download|grep "x11-gpl-snapshot-.*.tar.gz"|cut -d '/' -f 5|cut -d '-' -f 6|sed "s:\..*::")
@@ -129,8 +124,7 @@ getrevisions(){
einfo """
###########################################################
# Automatic PyQt4/sip bumping tool for qt overlay #
- # Author: Markos Chandras <hwoarang@gentoo.org> #
- # #
+ # Author: Markos Chandras <hwoarang@gentoo.org> #
# Use ./bump-python-revisions -h for a usage example #
###########################################################
"""
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [gentoo-commits] proj/qt:master commit in: Documentation/maintainers/
@ 2012-03-18 11:03 Markos Chandras
0 siblings, 0 replies; 26+ messages in thread
From: Markos Chandras @ 2012-03-18 11:03 UTC (permalink / raw
To: gentoo-commits
commit: 2c460bf94f9e0e1132db9b26d6407be6a6f17313
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 18 11:01:55 2012 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sun Mar 18 11:01:55 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=2c460bf9
maintainers/bump-python-revisions: Replace bogus $(cat) with $(echo)
---
Documentation/maintainers/bump-python-revisions | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/maintainers/bump-python-revisions b/Documentation/maintainers/bump-python-revisions
index fe6cee9..7c42630 100755
--- a/Documentation/maintainers/bump-python-revisions
+++ b/Documentation/maintainers/bump-python-revisions
@@ -87,12 +87,12 @@ getrevisions(){
pushd ${OVERLAY}/dev-python/PyQt4/ >> /dev/null
pyqt4_tomove=$(find '.' -type f -name "PyQt4-*_pre*.ebuild"|tail -1)
pyqt4_revision=$(grep ^REVISION ${pyqt4_tomove}|sed "s:^REVISION=::")
- PVER=$(cat ${pyqt4_tomove}|sed "s:PyQt4-\(.*\)_pre.*:\1:")
+ PVER=$(echo ${pyqt4_tomove}|sed "s:PyQt4-\(.*\)_pre.*:\1:")
popd >> /dev/null
pushd ${OVERLAY}/dev-python/sip/ >> /dev/null
sip_tomove=$(find '.' -type f -name "sip-*_pre*.ebuild"|tail -1)
sip_revision=$(grep ^HG_REVISION ${sip_tomove}|sed "s:^HG_REVISION=::")
- SVER=$(cat ${sip_tomove}|sed "s:sip-\(.*\)_pre.*:\1:")
+ SVER=$(echo ${sip_tomove}|sed "s:sip-\(.*\)_pre.*:\1:")
popd >> /dev/null
einfo "Old Revisions: PyQt4: ${pyqt4_revision}, SIP: ${sip_revision}"
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [gentoo-commits] proj/qt:master commit in: Documentation/maintainers/
@ 2012-03-24 11:08 Markos Chandras
0 siblings, 0 replies; 26+ messages in thread
From: Markos Chandras @ 2012-03-24 11:08 UTC (permalink / raw
To: gentoo-commits
commit: 8fee2710196f88c6521092c45098108ca32f2cfd
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 24 11:05:31 2012 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Mar 24 11:05:31 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=8fee2710
maintainers/bump-python-revisions: Clean up and a few fixes
---
Documentation/maintainers/bump-python-revisions | 53 ++++++++++++-----------
1 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/Documentation/maintainers/bump-python-revisions b/Documentation/maintainers/bump-python-revisions
index f0528fe..1eb6fc6 100755
--- a/Documentation/maintainers/bump-python-revisions
+++ b/Documentation/maintainers/bump-python-revisions
@@ -1,4 +1,7 @@
#!/bin/bash
+
+set -e
+
source /etc/init.d/functions.sh
########################## VARIABLES ############################
@@ -64,23 +67,26 @@ dopyqt4(){
commit() {
-ewarn "Your changes are ready to be merged. However I strongly recommend you to review your changes."
-ewarn ""
-einfo "Press 'r' to review your changes or 'y' to merge them to master branch (default 'r')."
-read choice
-case "$choice" in
- y) ewarn "Your changes will be merged now. Don't break the overlay or I will shoot you down!"
- git commit -a -m "PyQt4/sip: Automatic version bump, remove old" || exit 2
- git push || exit 2
- ;;
-
- r|"") git diff
- ;;
- *) eerror ""
- eerror "Invalid option. Are you stupid or something?"
- eerror ""
- exit 3
-esac
+ ewarn "Your changes are ready to be merged. However I strongly recommend you to review your changes."
+ ewarn ""
+ einfo "Press 'r' to review your changes or 'y' to merge them to master branch (default 'r')."
+ read choice
+ case "$choice" in
+ y)
+ ewarn "Your changes will be merged now. Don't break the overlay or I will shoot you down!"
+ git commit -a -m "PyQt4/sip: Automatic version bump, remove old" || exit 2
+ git push || exit 2
+ ;;
+ r|"")
+ git diff
+ ;;
+ *)
+ eerror ""
+ eerror "Invalid option. Are you stupid or something?"
+ eerror ""
+ exit 3
+ esac
+
}
getrevisions(){
@@ -105,17 +111,14 @@ getrevisions(){
[[ ${pyqt4_revision} != ${new_pyqt4} ]] && dopyqt4 && FOUND=true;
[[ ${sip_revision} != ${new_sip} ]] && dosip && FOUND=true;
- if [[ -n $FOUND ]]; then
+ if [[ -n ${FOUND} ]]; then
commit
# clean up
- ebegin "Cleaning up tarballs..."
- rm ${TEMP}/${SIPKG}.tar.gz || exit
- rm ${TEMP}/${PYPKG}.tar.gz || exit
- rm -r ${TEMP}
dst=$(portageq envvar DISTDIR)
- rm ${dst}/${SIPKG}.tar.gz
- rm ${dst}/${PYPKG}.tar.gz
- eend $?
+ einfo "Cleaning up tarballs..."
+ [[ -n ${SIPKG} ]] && rm ${TEMP}/${SIPKG}.tar.gz && rm ${dst}/${SIPKG}.tar.gz
+ [[ -n ${PYPKG} ]] && rm ${TEMP}/${PYPKG}.tar.gz && rm ${dst}/${PYPKG}.tar.gz
+ rm -r ${TEMP}
fi
exit 0
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [gentoo-commits] proj/qt:master commit in: Documentation/maintainers/
@ 2012-03-24 11:10 Markos Chandras
0 siblings, 0 replies; 26+ messages in thread
From: Markos Chandras @ 2012-03-24 11:10 UTC (permalink / raw
To: gentoo-commits
commit: 2fccf3fc6677de884d2e37d0e30a59bf1cb46e48
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 24 11:07:44 2012 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Mar 24 11:07:44 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=2fccf3fc
maintainers/bump-python-revisions: Fix an English typo
---
Documentation/maintainers/bump-python-revisions | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/maintainers/bump-python-revisions b/Documentation/maintainers/bump-python-revisions
index 1eb6fc6..5d526dc 100755
--- a/Documentation/maintainers/bump-python-revisions
+++ b/Documentation/maintainers/bump-python-revisions
@@ -74,7 +74,7 @@ commit() {
case "$choice" in
y)
ewarn "Your changes will be merged now. Don't break the overlay or I will shoot you down!"
- git commit -a -m "PyQt4/sip: Automatic version bump, remove old" || exit 2
+ git commit -a -m "PyQt4/sip: Automated version bump, remove old" || exit 2
git push || exit 2
;;
r|"")
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [gentoo-commits] proj/qt:master commit in: Documentation/maintainers/
@ 2012-03-25 16:46 Markos Chandras
0 siblings, 0 replies; 26+ messages in thread
From: Markos Chandras @ 2012-03-25 16:46 UTC (permalink / raw
To: gentoo-commits
commit: 474a79daa85196917521c377942dca284f9b96f3
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 25 16:45:53 2012 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sun Mar 25 16:45:53 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=474a79da
maintainers/bump-python-revisions: Minor changes to script output
---
Documentation/maintainers/bump-python-revisions | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/Documentation/maintainers/bump-python-revisions b/Documentation/maintainers/bump-python-revisions
index 5d526dc..8d771fa 100755
--- a/Documentation/maintainers/bump-python-revisions
+++ b/Documentation/maintainers/bump-python-revisions
@@ -101,7 +101,10 @@ getrevisions(){
SVER=$(echo ${sip_tomove/\.\//}|sed "s:sip-\(.*\)_pre.*:\1:")
popd >> /dev/null
- einfo "Old Revisions: PyQt4: ${pyqt4_revision}, SIP: ${sip_revision}"
+ einfo "Old Revisions:"
+ echo
+ einfo "PyQt4: ${pyqt4_revision}"
+ einfo "sip: ${sip_revision}"
# Find new revisions
new_pyqt4=$(curl -s http://www.riverbankcomputing.com/software/pyqt/download|grep "x11-gpl-snapshot-.*.tar.gz"|cut -d '/' -f 5|cut -d '-' -f 6|sed "s:\..*::")
@@ -119,6 +122,10 @@ getrevisions(){
[[ -n ${SIPKG} ]] && rm ${TEMP}/${SIPKG}.tar.gz && rm ${dst}/${SIPKG}.tar.gz
[[ -n ${PYPKG} ]] && rm ${TEMP}/${PYPKG}.tar.gz && rm ${dst}/${PYPKG}.tar.gz
rm -r ${TEMP}
+ else
+ echo
+ einfo "No new snapshots. Sorry :-("
+ echo
fi
exit 0
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [gentoo-commits] proj/qt:master commit in: Documentation/maintainers/
@ 2012-03-29 13:56 Davide Pesavento
0 siblings, 0 replies; 26+ messages in thread
From: Davide Pesavento @ 2012-03-29 13:56 UTC (permalink / raw
To: gentoo-commits
commit: 63ab2ede87a66c07713867f918fd5d0ce1b9d033
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Thu Mar 29 13:55:25 2012 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Mar 29 13:55:25 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=63ab2ede
[maintainers/eclass-checker] Fix KEYWORDS extraction.
---
Documentation/maintainers/eclass-checker | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/Documentation/maintainers/eclass-checker b/Documentation/maintainers/eclass-checker
index 30b031e..3246474 100755
--- a/Documentation/maintainers/eclass-checker
+++ b/Documentation/maintainers/eclass-checker
@@ -57,12 +57,11 @@ function render_head() {
height: 1px;
background: #333;
}
- </STYLE>
+ </STYLE>
</HEAD>
<BODY>
<table cellspacing='0' cellpadding='0' id='mainTable'>
<tr><td style='background: #333; color: white;'>Last update: <strong>$dt</strong> (testing: ${1} | stable: ${2})</td></tr>
-
"
else
echo "The following ebuilds are using the old, deprecated ${eclass}.eclass. (testing: ${1} | stable: ${2})"
@@ -72,7 +71,7 @@ function render_head() {
function render_foot() {
if [[ $html == 1 ]]; then
- echo "
+ echo "
</table>
</BODY>
</HTML>
@@ -84,7 +83,7 @@ function render() {
C=$1;
X=$2;
shift;
-
+
if [[ $html == 1 ]]; then
echo "
<tr><td style='height: 5px'></td></tr>
@@ -137,7 +136,7 @@ function check() {
P=${C/*\/}
C=${C%\/*}
C=${C/*\/}
- KW=$(grep "^KEYWORDS" ${i} | sed -r "s:.*\"(.*)\".*:\1:")
+ KW=$(sed -nre 's:^\s*KEYWORDS="(.+)".*$:\1:p' "${i}")
local stable=0
for j in ${KW};
do
@@ -151,11 +150,11 @@ function check() {
EB_S[${#EB_S[*]}]="$C/$P/$E";
fi
done
-
+
render_head $CNT_T $CNT_S
render $CNT_T "testing" ${EB_T[@]}
render $CNT_S "stable" ${EB_S[@]}
- render_foot
+ render_foot
}
if [[ $upload == 1 ]] || [[ $view == 1 ]]; then
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [gentoo-commits] proj/qt:master commit in: Documentation/maintainers/
@ 2012-05-05 22:14 Markos Chandras
0 siblings, 0 replies; 26+ messages in thread
From: Markos Chandras @ 2012-05-05 22:14 UTC (permalink / raw
To: gentoo-commits
commit: 9c3622b646107bf750fc69cbd688858083aa6e76
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sat May 5 22:14:09 2012 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat May 5 22:14:09 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=9c3622b6
bump-python-revisions: Minor formatting fixes
---
Documentation/maintainers/bump-python-revisions | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/Documentation/maintainers/bump-python-revisions b/Documentation/maintainers/bump-python-revisions
index 8d771fa..4bb1134 100755
--- a/Documentation/maintainers/bump-python-revisions
+++ b/Documentation/maintainers/bump-python-revisions
@@ -102,9 +102,8 @@ getrevisions(){
popd >> /dev/null
einfo "Old Revisions:"
- echo
- einfo "PyQt4: ${pyqt4_revision}"
- einfo "sip: ${sip_revision}"
+ einfo "PyQt4 : ${pyqt4_revision}"
+ einfo "sip : ${sip_revision}"
# Find new revisions
new_pyqt4=$(curl -s http://www.riverbankcomputing.com/software/pyqt/download|grep "x11-gpl-snapshot-.*.tar.gz"|cut -d '/' -f 5|cut -d '-' -f 6|sed "s:\..*::")
@@ -123,9 +122,9 @@ getrevisions(){
[[ -n ${PYPKG} ]] && rm ${TEMP}/${PYPKG}.tar.gz && rm ${dst}/${PYPKG}.tar.gz
rm -r ${TEMP}
else
- echo
- einfo "No new snapshots. Sorry :-("
- echo
+ ewarn ""
+ ewarn "No new snapshots. Sorry :-("
+ ewarn ""
fi
exit 0
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [gentoo-commits] proj/qt:master commit in: Documentation/maintainers/
@ 2012-06-08 20:20 Markos Chandras
0 siblings, 0 replies; 26+ messages in thread
From: Markos Chandras @ 2012-06-08 20:20 UTC (permalink / raw
To: gentoo-commits
commit: 4b662f0a2df9ea741ccb47a7f4535eb967daefd1
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 8 20:08:39 2012 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Fri Jun 8 20:19:32 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=4b662f0a
bump-python-revisions: Multiple fixes
*) Drop -c argument
*) Use getopts to fetch arguments
*) Add quiet mode
---
Documentation/maintainers/bump-python-revisions | 67 +++++++++++++++--------
1 files changed, 44 insertions(+), 23 deletions(-)
diff --git a/Documentation/maintainers/bump-python-revisions b/Documentation/maintainers/bump-python-revisions
index 4bb1134..5c39291 100755
--- a/Documentation/maintainers/bump-python-revisions
+++ b/Documentation/maintainers/bump-python-revisions
@@ -9,6 +9,7 @@ DATE="$(date +%F|sed 's/-//g')" # date to be added to ebuilds
TARGET="www.gentoo-el.org:~/public_html/distfiles/"
TEMP="/tmp/qt-python-bump/"
OVERLAY="../../" # ugly but hey dont shoot me
+QUIET=
####################################################################
usage() {
@@ -16,9 +17,9 @@ usage() {
./bump-python-revisions
-Use -h option to display this message
-Use -c option to skip bumping operation and do
- directly the merge operation
+-h: Display this message
+-q: Quiet mode. No questions. Just bump and commit
+
"""
}
@@ -67,26 +68,29 @@ dopyqt4(){
commit() {
- ewarn "Your changes are ready to be merged. However I strongly recommend you to review your changes."
- ewarn ""
- einfo "Press 'r' to review your changes or 'y' to merge them to master branch (default 'r')."
- read choice
- case "$choice" in
- y)
- ewarn "Your changes will be merged now. Don't break the overlay or I will shoot you down!"
- git commit -a -m "PyQt4/sip: Automated version bump, remove old" || exit 2
- git push || exit 2
- ;;
- r|"")
- git diff
- ;;
- *)
- eerror ""
- eerror "Invalid option. Are you stupid or something?"
- eerror ""
- exit 3
- esac
-
+ if [[ -z ${QUIET} ]]; then
+ ewarn "Your changes are ready to be merged. However I strongly recommend you to review your changes."
+ ewarn ""
+ einfo "Press 'r' to review your changes or 'y' to merge them to master branch (default 'r')."
+ read choice
+ case "$choice" in
+ y)
+ ewarn "Your changes will be merged now. Don't break the overlay or I will shoot you down!"
+ git commit -a -m "PyQt4/sip: Automated version bump, remove old" || exit 2
+ git push || exit 2
+ ;;
+ r|"")
+ git diff
+ ;;
+ *)
+ eerror ""
+ eerror "Invalid option. Are you stupid or something?"
+ eerror ""
+ exit 3
+ esac
+ else
+ git commit -a -m "PyQt4/sip: Automated version bump, remove old" || exit 2
+ fi
}
getrevisions(){
@@ -137,4 +141,21 @@ einfo """
# Use ./bump-python-revisions -h for a usage example #
###########################################################
"""
+
+while getopts ":hq" opt; do
+ case $opt in
+ h)
+ usage
+ exit 1
+ ;;
+ q)
+ QUIET=1
+ ;;
+ ?)
+ usage
+ exit 1
+ ;;
+ esac
+done
+
getrevisions
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [gentoo-commits] proj/qt:master commit in: Documentation/maintainers/
@ 2012-06-08 20:20 Markos Chandras
0 siblings, 0 replies; 26+ messages in thread
From: Markos Chandras @ 2012-06-08 20:20 UTC (permalink / raw
To: gentoo-commits
commit: f5cbc8398ec233dab4bf47a720bcb0713bd5b1e7
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 8 20:09:43 2012 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Fri Jun 8 20:20:03 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=f5cbc839
bump-python-revisions: Update tree before we touch it
---
Documentation/maintainers/bump-python-revisions | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/Documentation/maintainers/bump-python-revisions b/Documentation/maintainers/bump-python-revisions
index 5c39291..3ffb23e 100755
--- a/Documentation/maintainers/bump-python-revisions
+++ b/Documentation/maintainers/bump-python-revisions
@@ -142,6 +142,11 @@ einfo """
###########################################################
"""
+<<<<<<< HEAD
+ebegin "Updating tree"
+git pull
+eend $?
+
while getopts ":hq" opt; do
case $opt in
h)
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [gentoo-commits] proj/qt:master commit in: Documentation/maintainers/
@ 2012-06-08 20:24 Markos Chandras
0 siblings, 0 replies; 26+ messages in thread
From: Markos Chandras @ 2012-06-08 20:24 UTC (permalink / raw
To: gentoo-commits
commit: 10665df4465a4b51be12ca1d5bbaa00cad49113d
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 8 20:25:15 2012 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Fri Jun 8 20:25:15 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=10665df4
bump-python-revisions: Fix merge leftover
---
Documentation/maintainers/bump-python-revisions | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/Documentation/maintainers/bump-python-revisions b/Documentation/maintainers/bump-python-revisions
index 3ffb23e..f1183ae 100755
--- a/Documentation/maintainers/bump-python-revisions
+++ b/Documentation/maintainers/bump-python-revisions
@@ -142,7 +142,6 @@ einfo """
###########################################################
"""
-<<<<<<< HEAD
ebegin "Updating tree"
git pull
eend $?
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [gentoo-commits] proj/qt:master commit in: Documentation/maintainers/
@ 2012-06-09 8:44 Markos Chandras
0 siblings, 0 replies; 26+ messages in thread
From: Markos Chandras @ 2012-06-09 8:44 UTC (permalink / raw
To: gentoo-commits
commit: 3de754bc8aec053ad9a22d0d104683b948802095
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 9 08:44:31 2012 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Jun 9 08:44:31 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=3de754bc
bump-python-revisions: Add missing 'git push'
---
Documentation/maintainers/bump-python-revisions | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/Documentation/maintainers/bump-python-revisions b/Documentation/maintainers/bump-python-revisions
index f1183ae..ec57e92 100755
--- a/Documentation/maintainers/bump-python-revisions
+++ b/Documentation/maintainers/bump-python-revisions
@@ -90,6 +90,7 @@ commit() {
esac
else
git commit -a -m "PyQt4/sip: Automated version bump, remove old" || exit 2
+ git push || exit 2
fi
}
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [gentoo-commits] proj/qt:master commit in: Documentation/maintainers/
@ 2012-06-23 11:06 Markos Chandras
0 siblings, 0 replies; 26+ messages in thread
From: Markos Chandras @ 2012-06-23 11:06 UTC (permalink / raw
To: gentoo-commits
commit: 6f29a0f5a3607170e27818a6522a45cc5d7c39db
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 23 11:06:25 2012 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Jun 23 11:06:25 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=6f29a0f5
bump-python-revisions: Don't add everything by default
---
Documentation/maintainers/bump-python-revisions | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/maintainers/bump-python-revisions b/Documentation/maintainers/bump-python-revisions
index 02c6b6a..9674efb 100755
--- a/Documentation/maintainers/bump-python-revisions
+++ b/Documentation/maintainers/bump-python-revisions
@@ -76,7 +76,7 @@ commit() {
case "$choice" in
y)
ewarn "Your changes will be merged now. Don't break the overlay or I will shoot you down!"
- git commit -a -m "PyQt4/sip: Automated version bump, remove old" || exit 2
+ git commit -m "PyQt4/sip: Automated version bump, remove old" || exit 2
git push || exit 2
;;
r|"")
@@ -89,7 +89,7 @@ commit() {
exit 3
esac
else
- git commit -a -m "PyQt4/sip: Automated version bump, remove old" || exit 2
+ git commit -m "PyQt4/sip: Automated version bump, remove old" || exit 2
git push || exit 2
fi
}
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [gentoo-commits] proj/qt:master commit in: Documentation/maintainers/
@ 2012-07-04 17:55 Markos Chandras
0 siblings, 0 replies; 26+ messages in thread
From: Markos Chandras @ 2012-07-04 17:55 UTC (permalink / raw
To: gentoo-commits
commit: 8044c5a28423b19c8bbaf77a194087ec036a6846
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 4 17:54:47 2012 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Wed Jul 4 17:54:47 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=8044c5a2
bump-python-revisions: Update code for SIP packages
---
Documentation/maintainers/bump-python-revisions | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/maintainers/bump-python-revisions b/Documentation/maintainers/bump-python-revisions
index 9674efb..47a7771 100755
--- a/Documentation/maintainers/bump-python-revisions
+++ b/Documentation/maintainers/bump-python-revisions
@@ -25,7 +25,7 @@ usage() {
dosip(){
- SIPKG="sip-snapshot-${new_sip}" # Format Sip package
+ SIPKG="sip-${new_sip}" # Format Sip package
ebegin "Downloading ${SIPKG} tarball..."
wget -P ${TEMP} http://www.riverbankcomputing.co.uk/static/Downloads/sip4/${SIPKG}.tar.gz || exit 2
eend $?
@@ -123,9 +123,9 @@ getrevisions(){
new_sip=$(curl -s \
http://www.riverbankcomputing.com/software/sip/download \
| grep "snapshot-.*.tar.gz" \
- | cut -d '/' -f 5 | cut -d '-' -f 6-7 \
+ | cut -d '/' -f 5 | cut -d '-' -f 5-8 \
| sed -e "s@\.tar\.gz.*@@")
- new_sip_rev=$(echo $new_sip | cut -d '-' -f 2)
+ new_sip_rev=$(echo $new_sip | cut -d '-' -f 3)
new_sip_ver=$(echo $new_sip | cut -d '-' -f 1)
[[ -z ${new_sip} ]] || \
einfo "New sip snapshot@rev: ${new_sip}@${new_sip_rev}"
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [gentoo-commits] proj/qt:master commit in: Documentation/maintainers/
@ 2012-07-10 17:23 Markos Chandras
0 siblings, 0 replies; 26+ messages in thread
From: Markos Chandras @ 2012-07-10 17:23 UTC (permalink / raw
To: gentoo-commits
commit: 9ca1c9b46ff2c0c0f19095805d3abf8d1778b6ce
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 10 17:25:29 2012 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Tue Jul 10 17:25:29 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=9ca1c9b4
bump-python-revisions: Make sure old files are gone
---
Documentation/maintainers/bump-python-revisions | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/Documentation/maintainers/bump-python-revisions b/Documentation/maintainers/bump-python-revisions
index 47a7771..3a36f30 100755
--- a/Documentation/maintainers/bump-python-revisions
+++ b/Documentation/maintainers/bump-python-revisions
@@ -37,6 +37,7 @@ dosip(){
tomove=$(find '.' -type f -name "sip-*_pre*.ebuild"|tail -1)
einfo "Previous ebuild: ${tomove#./}"
mv ${tomove#./} sip-${new_sip_ver}_pre${DATE}.ebuild || exit "Failed to bump sip"
+ git rm ${tomove}
ebegin "Changing revision number to: ${new_sip_rev}"
sed -i "/^HG_REVISION/s:=.*:=${new_sip_rev}:" sip-${new_sip_ver}_pre${DATE}.ebuild
eend $?
@@ -57,6 +58,7 @@ dopyqt4(){
tomove=$(find '.' -type f -name "PyQt4-*_pre*.ebuild"|tail -1)
einfo "Previous ebuild: ${tomove#./}"
mv ${tomove#./} PyQt4-${new_pyqt4_ver}_pre${DATE}.ebuild || exit "Failed to bump PyQt4"
+ git rm ${tomove}
ebegin "Changing revision number to: ${new_pyqt4_rev}"
sed -i "/^REVISION/s:=.*:=${new_pyqt4_rev}:" PyQt4-${new_pyqt4_ver}_pre${DATE}.ebuild
eend $?
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [gentoo-commits] proj/qt:master commit in: Documentation/maintainers/
@ 2012-07-12 17:10 Markos Chandras
0 siblings, 0 replies; 26+ messages in thread
From: Markos Chandras @ 2012-07-12 17:10 UTC (permalink / raw
To: gentoo-commits
commit: 9b7f841207411f2cf2a3f009073d1a4403bb58b8
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 12 17:09:59 2012 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Thu Jul 12 17:09:59 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=9b7f8412
bump-python-revisions: Update TARGET to d.g.o
---
Documentation/maintainers/bump-python-revisions | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/maintainers/bump-python-revisions b/Documentation/maintainers/bump-python-revisions
index 3a36f30..e6b5acc 100755
--- a/Documentation/maintainers/bump-python-revisions
+++ b/Documentation/maintainers/bump-python-revisions
@@ -6,7 +6,7 @@ source /etc/init.d/functions.sh
########################## VARIABLES ############################
DATE="$(date +%F|sed 's/-//g')" # date to be added to ebuilds
-TARGET="www.gentoo-el.org:~/public_html/distfiles/"
+TARGET="dev.gentoo.org:~/public_html/distfiles/"
TEMP="/tmp/qt-python-bump/"
OVERLAY="../../" # ugly but hey dont shoot me
QUIET=
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [gentoo-commits] proj/qt:master commit in: Documentation/maintainers/
@ 2012-09-22 12:01 Markos Chandras
0 siblings, 0 replies; 26+ messages in thread
From: Markos Chandras @ 2012-09-22 12:01 UTC (permalink / raw
To: gentoo-commits
commit: 23b750fee7c54ce08ab9a01202580b088c41a6b1
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 22 10:26:40 2012 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Sep 22 12:01:45 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=23b750fe
maintainers: Initial commit for the compare-ebuilds.sh script
---
Documentation/maintainers/compare-ebuilds.sh | 47 ++++++++++++++++++++++++++
1 files changed, 47 insertions(+), 0 deletions(-)
diff --git a/Documentation/maintainers/compare-ebuilds.sh b/Documentation/maintainers/compare-ebuilds.sh
new file mode 100644
index 0000000..fb9002e
--- /dev/null
+++ b/Documentation/maintainers/compare-ebuilds.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+#
+# Script for comparing release ebuilds against live ebuilds
+# Author: Markos Chandras <hwoarang@gentoo.org>
+#
+
+. /etc/init.d/functions.sh
+
+usage() {
+ echo
+ echo "./compare-ebuilds.sh <version you want to compare>"
+ echo
+}
+
+PORTDIR="$(portageq envvar PORTDIR)"
+OVERLAY=
+LIVE_VERSION="4.8.9999" # you normally don't need to change that
+
+#hacky way to find full path for qt overlay
+for prof in $(portageq portdir_overlay); do
+ grep -q "^qt$" ${prof}/profiles/repo_name
+ [[ $? == 0 ]] && OVERLAY=${prof} && break
+done
+
+[[ -z ${OVERLAY} ]] && \
+ echo "Can't find path for your Qt overlay" && \
+ exit 1
+
+[[ -z ${1} ]] && \
+ echo "Wrong number of parameters" && \
+ usage && exit 1
+
+for x in $(find ${PORTDIR}/x11-libs -type f -name "qt-*-${1}*.ebuild" -printf "%h\n"|uniq);do
+ diff -Naur $(find ${x} -type f -name "*-${1}*.ebuild") \
+ ${OVERLAY}/x11-libs/$(basename ${x})/$(basename ${x})-${LIVE_VERSION}.ebuild
+ if [[ $? != 0 ]]; then
+ einfo "Press enter if you want to move to the next ebuild"
+ einfo "or 'n' if you want to stop now!"
+ read resp
+ [[ ${resp} == "n" ]] && exit 1
+ fi
+done
+
+einfo "Sweet! All done!"
+
+exit 0
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [gentoo-commits] proj/qt:master commit in: Documentation/maintainers/
@ 2012-09-22 16:36 Markos Chandras
0 siblings, 0 replies; 26+ messages in thread
From: Markos Chandras @ 2012-09-22 16:36 UTC (permalink / raw
To: gentoo-commits
commit: 6eb7e8cc5ca792f2a558b288f8f6b0c21a6c182d
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 22 16:36:32 2012 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Sep 22 16:36:32 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=6eb7e8cc
compare-ebuilds: Use portageq to get overlay's abs path
---
Documentation/maintainers/compare-ebuilds.sh | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/Documentation/maintainers/compare-ebuilds.sh b/Documentation/maintainers/compare-ebuilds.sh
index fb9002e..ba630e9 100644
--- a/Documentation/maintainers/compare-ebuilds.sh
+++ b/Documentation/maintainers/compare-ebuilds.sh
@@ -18,10 +18,7 @@ OVERLAY=
LIVE_VERSION="4.8.9999" # you normally don't need to change that
#hacky way to find full path for qt overlay
-for prof in $(portageq portdir_overlay); do
- grep -q "^qt$" ${prof}/profiles/repo_name
- [[ $? == 0 ]] && OVERLAY=${prof} && break
-done
+OVERLAY=$(portageq get_repo_path / qt)
[[ -z ${OVERLAY} ]] && \
echo "Can't find path for your Qt overlay" && \
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [gentoo-commits] proj/qt:master commit in: Documentation/maintainers/
@ 2012-09-22 16:43 Markos Chandras
0 siblings, 0 replies; 26+ messages in thread
From: Markos Chandras @ 2012-09-22 16:43 UTC (permalink / raw
To: gentoo-commits
commit: 2c3bfe42ab3bd107a945befae258c1743e791c09
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 22 16:43:46 2012 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Sep 22 16:43:46 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=2c3bfe42
maintainers: Use portageq get_repo_path to find overlay's abs path
---
Documentation/maintainers/bump-live-qt | 2 +-
Documentation/maintainers/bump-python-revisions | 2 +-
Documentation/maintainers/bump-qt-overlay | 2 +-
Documentation/maintainers/bump-qt-release | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Documentation/maintainers/bump-live-qt b/Documentation/maintainers/bump-live-qt
index bea698e..cd1e6d4 100755
--- a/Documentation/maintainers/bump-live-qt
+++ b/Documentation/maintainers/bump-live-qt
@@ -3,7 +3,7 @@
. /etc/init.d/functions.sh
base="${1}"
version="${2}"
-overlay="../../x11-libs/"
+overlay="$(portageq get_repo_path / qt)/x11-libs/"
RED=$'\033[31;01m'
GREEN=$'\e[32;01m'
moto(){
diff --git a/Documentation/maintainers/bump-python-revisions b/Documentation/maintainers/bump-python-revisions
index e6b5acc..fbcb2b9 100755
--- a/Documentation/maintainers/bump-python-revisions
+++ b/Documentation/maintainers/bump-python-revisions
@@ -8,7 +8,7 @@ source /etc/init.d/functions.sh
DATE="$(date +%F|sed 's/-//g')" # date to be added to ebuilds
TARGET="dev.gentoo.org:~/public_html/distfiles/"
TEMP="/tmp/qt-python-bump/"
-OVERLAY="../../" # ugly but hey dont shoot me
+OVERLAY="$(portageq get_repo_path / qt)"
QUIET=
####################################################################
diff --git a/Documentation/maintainers/bump-qt-overlay b/Documentation/maintainers/bump-qt-overlay
index 9bfc511..2a52621 100755
--- a/Documentation/maintainers/bump-qt-overlay
+++ b/Documentation/maintainers/bump-qt-overlay
@@ -4,7 +4,7 @@
base="${1}"
version="${2}"
portdir="$(portageq envvar PORTDIR)/x11-libs/"
-overlay="../../x11-libs/"
+overlay="$(portageq get_repo_path / qt)"
RED=$'\033[31;01m'
GREEN=$'\e[32;01m'
moto(){
diff --git a/Documentation/maintainers/bump-qt-release b/Documentation/maintainers/bump-qt-release
index 73dd6b9..e319b19 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/qt"
+EdgeDir="$(portageq get_repo_path / qt)"
RelVer="4.5.2"
echo
diff --git a/Documentation/maintainers/compare-ebuilds.sh b/Documentation/maintainers/compare-ebuilds.sh
old mode 100644
new mode 100755
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [gentoo-commits] proj/qt:master commit in: Documentation/maintainers/
@ 2012-10-14 21:30 Davide Pesavento
0 siblings, 0 replies; 26+ messages in thread
From: Davide Pesavento @ 2012-10-14 21:30 UTC (permalink / raw
To: gentoo-commits
commit: 17921606c9c4b28690eba0a2df8900690d5bc79b
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun Oct 14 21:28:52 2012 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Oct 14 21:28:52 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=17921606
[bump-python-revisions] Fix script after latest changes to sip ebuild.
---
Documentation/maintainers/bump-python-revisions | 27 ++++++++++------------
1 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/Documentation/maintainers/bump-python-revisions b/Documentation/maintainers/bump-python-revisions
index fbcb2b9..8564167 100755
--- a/Documentation/maintainers/bump-python-revisions
+++ b/Documentation/maintainers/bump-python-revisions
@@ -16,15 +16,14 @@ usage() {
echo """
./bump-python-revisions
-
+
-h: Display this message
-q: Quiet mode. No questions. Just bump and commit
"""
}
-
-dosip(){
+dosip() {
SIPKG="sip-${new_sip}" # Format Sip package
ebegin "Downloading ${SIPKG} tarball..."
wget -P ${TEMP} http://www.riverbankcomputing.co.uk/static/Downloads/sip4/${SIPKG}.tar.gz || exit 2
@@ -39,14 +38,14 @@ dosip(){
mv ${tomove#./} sip-${new_sip_ver}_pre${DATE}.ebuild || exit "Failed to bump sip"
git rm ${tomove}
ebegin "Changing revision number to: ${new_sip_rev}"
- sed -i "/^HG_REVISION/s:=.*:=${new_sip_rev}:" sip-${new_sip_ver}_pre${DATE}.ebuild
+ sed -i -e "/HG_REVISION=/s:=.*:=${new_sip_rev}:" sip-${new_sip_ver}_pre${DATE}.ebuild
eend $?
repoman manifest
git add .
popd
}
-dopyqt4(){
+dopyqt4() {
PYPKG="PyQt-x11-gpl-snapshot-${new_pyqt4}" #Format PyQt4 package
ebegin "Downloading ${PYPKG} tarball..."
wget -P ${TEMP} http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/${PYPKG}.tar.gz || exit 2
@@ -67,8 +66,6 @@ dopyqt4(){
popd
}
-
-
commit() {
if [[ -z ${QUIET} ]]; then
ewarn "Your changes are ready to be merged. However I strongly recommend you to review your changes."
@@ -76,7 +73,7 @@ commit() {
einfo "Press 'r' to review your changes or 'y' to merge them to master branch (default 'r')."
read choice
case "$choice" in
- y)
+ y)
ewarn "Your changes will be merged now. Don't break the overlay or I will shoot you down!"
git commit -m "PyQt4/sip: Automated version bump, remove old" || exit 2
git push || exit 2
@@ -84,7 +81,7 @@ commit() {
r|"")
git diff
;;
- *)
+ *)
eerror ""
eerror "Invalid option. Are you stupid or something?"
eerror ""
@@ -96,17 +93,17 @@ commit() {
fi
}
-getrevisions(){
- pushd ${OVERLAY}/dev-python/PyQt4/ >> /dev/null
+getrevisions() {
+ pushd ${OVERLAY}/dev-python/PyQt4/ > /dev/null
pyqt4_tomove=$(find '.' -type f -name "PyQt4-*_pre*.ebuild"|tail -1)
pyqt4_revision=$(grep ^REVISION ${pyqt4_tomove}|sed "s:^REVISION=::")
PVER=$(echo ${pyqt4_tomove/\.\//}|sed "s:PyQt4-\(.*\)_pre.*:\1:")
- popd >> /dev/null
- pushd ${OVERLAY}/dev-python/sip/ >> /dev/null
+ popd > /dev/null
+ pushd ${OVERLAY}/dev-python/sip/ > /dev/null
sip_tomove=$(find '.' -type f -name "sip-*_pre*.ebuild"|tail -1)
- sip_revision=$(grep ^HG_REVISION ${sip_tomove}|sed "s:^HG_REVISION=::")
+ sip_revision=$(grep "HG_REVISION=" ${sip_tomove}|sed "s:HG_REVISION=::")
SVER=$(echo ${sip_tomove/\.\//}|sed "s:sip-\(.*\)_pre.*:\1:")
- popd >> /dev/null
+ popd > /dev/null
einfo "Old Revisions:"
einfo "PyQt4 : ${pyqt4_revision}"
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [gentoo-commits] proj/qt:master commit in: Documentation/maintainers/
@ 2012-10-16 18:30 Markos Chandras
0 siblings, 0 replies; 26+ messages in thread
From: Markos Chandras @ 2012-10-16 18:30 UTC (permalink / raw
To: gentoo-commits
commit: 9b505a00d48c50e0160f326c6d54527c8faf3735
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 16 18:26:41 2012 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Tue Oct 16 18:26:41 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=9b505a00
bump-python-revisions: Use integer for exit code
---
Documentation/maintainers/bump-python-revisions | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/maintainers/bump-python-revisions b/Documentation/maintainers/bump-python-revisions
index 298b065..6d20199 100755
--- a/Documentation/maintainers/bump-python-revisions
+++ b/Documentation/maintainers/bump-python-revisions
@@ -35,7 +35,7 @@ dosip() {
pushd ${OVERLAY}/dev-python/sip/
tomove=$(find '.' -type f -name "sip-*_pre*.ebuild"|tail -1)
einfo "Previous ebuild: ${tomove#./}"
- mv ${tomove#./} sip-${new_sip_ver}_pre${DATE}.ebuild || exit "Failed to bump sip"
+ mv ${tomove#./} sip-${new_sip_ver}_pre${DATE}.ebuild || exit 1
git rm ${tomove}
ebegin "Changing revision number to: ${new_sip_rev}"
sed -i -e "/HG_REVISION=/s:=.*:=${new_sip_rev}:" sip-${new_sip_ver}_pre${DATE}.ebuild
@@ -56,7 +56,7 @@ dopyqt4() {
pushd ${OVERLAY}/dev-python/PyQt4/
tomove=$(find '.' -type f -name "PyQt4-*_pre*.ebuild"|tail -1)
einfo "Previous ebuild: ${tomove#./}"
- mv ${tomove#./} PyQt4-${new_pyqt4_ver}_pre${DATE}.ebuild || exit "Failed to bump PyQt4"
+ mv ${tomove#./} PyQt4-${new_pyqt4_ver}_pre${DATE}.ebuild || exit 1
git rm ${tomove}
ebegin "Changing revision number to: ${new_pyqt4_rev}"
sed -i "/^REVISION/s:=.*:=${new_pyqt4_rev}:" PyQt4-${new_pyqt4_ver}_pre${DATE}.ebuild
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [gentoo-commits] proj/qt:master commit in: Documentation/maintainers/
@ 2012-10-16 18:30 Markos Chandras
0 siblings, 0 replies; 26+ messages in thread
From: Markos Chandras @ 2012-10-16 18:30 UTC (permalink / raw
To: gentoo-commits
commit: dba1d1bf27554af9828e24214c23f2ca5783e838
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 16 18:24:25 2012 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Tue Oct 16 18:24:25 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=dba1d1bf
bump-python-revisions: exit if repoman fails
---
Documentation/maintainers/bump-python-revisions | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/maintainers/bump-python-revisions b/Documentation/maintainers/bump-python-revisions
index 8564167..298b065 100755
--- a/Documentation/maintainers/bump-python-revisions
+++ b/Documentation/maintainers/bump-python-revisions
@@ -40,7 +40,7 @@ dosip() {
ebegin "Changing revision number to: ${new_sip_rev}"
sed -i -e "/HG_REVISION=/s:=.*:=${new_sip_rev}:" sip-${new_sip_ver}_pre${DATE}.ebuild
eend $?
- repoman manifest
+ repoman manifest || exit 1
git add .
popd
}
@@ -61,7 +61,7 @@ dopyqt4() {
ebegin "Changing revision number to: ${new_pyqt4_rev}"
sed -i "/^REVISION/s:=.*:=${new_pyqt4_rev}:" PyQt4-${new_pyqt4_ver}_pre${DATE}.ebuild
eend $?
- repoman manifest
+ repoman manifest || exit 1
git add .
popd
}
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [gentoo-commits] proj/qt:master commit in: Documentation/maintainers/
@ 2012-10-23 17:54 Markos Chandras
0 siblings, 0 replies; 26+ messages in thread
From: Markos Chandras @ 2012-10-23 17:54 UTC (permalink / raw
To: gentoo-commits
commit: 0e39a47821ad0f6252f61b97f9addd5ed42fb018
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 23 17:54:14 2012 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Tue Oct 23 17:54:14 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=0e39a478
bump-python-revision: Fix detection for pyqt4/sip revisions
---
Documentation/maintainers/bump-python-revisions | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Documentation/maintainers/bump-python-revisions b/Documentation/maintainers/bump-python-revisions
index 6d20199..87c267b 100755
--- a/Documentation/maintainers/bump-python-revisions
+++ b/Documentation/maintainers/bump-python-revisions
@@ -96,12 +96,12 @@ commit() {
getrevisions() {
pushd ${OVERLAY}/dev-python/PyQt4/ > /dev/null
pyqt4_tomove=$(find '.' -type f -name "PyQt4-*_pre*.ebuild"|tail -1)
- pyqt4_revision=$(grep ^REVISION ${pyqt4_tomove}|sed "s:^REVISION=::")
+ pyqt4_revision=$(grep ^REVISION ${pyqt4_tomove}|cut -d "=" -f 2)
PVER=$(echo ${pyqt4_tomove/\.\//}|sed "s:PyQt4-\(.*\)_pre.*:\1:")
popd > /dev/null
pushd ${OVERLAY}/dev-python/sip/ > /dev/null
sip_tomove=$(find '.' -type f -name "sip-*_pre*.ebuild"|tail -1)
- sip_revision=$(grep "HG_REVISION=" ${sip_tomove}|sed "s:HG_REVISION=::")
+ sip_revision=$(grep "HG_REVISION=" ${sip_tomove}|cut -d "=" -f 2)
SVER=$(echo ${sip_tomove/\.\//}|sed "s:sip-\(.*\)_pre.*:\1:")
popd > /dev/null
@@ -130,10 +130,10 @@ getrevisions() {
einfo "New sip snapshot@rev: ${new_sip}@${new_sip_rev}"
# Decide what to bump"
[[ -z ${new_pyqt4_rev} ]] || \
- { [[ ${pyqt4_revision} != ${new_pyqt4_rev} ]] \
+ { [[ "${pyqt4_revision}" != "${new_pyqt4_rev}" ]] \
&& dopyqt4 && FOUND=true; }
[[ -z ${new_sip_rev} ]] || \
- { [[ ${sip_revision} != ${new_sip_rev} ]] \
+ { [[ "${sip_revision}" != "${new_sip_rev}" ]] \
&& dosip && FOUND=true; }
if [[ -n ${FOUND} ]]; then
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [gentoo-commits] proj/qt:master commit in: Documentation/maintainers/
@ 2013-06-30 23:11 Davide Pesavento
0 siblings, 0 replies; 26+ messages in thread
From: Davide Pesavento @ 2013-06-30 23:11 UTC (permalink / raw
To: gentoo-commits
commit: 6200bae019f5a5d948d4e4f729e600f5743842f7
Author: Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sun Jun 30 23:11:11 2013 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jun 30 23:11:11 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=6200bae0
Remove obsolete scripts.
---
Documentation/maintainers/bump-kde-qt.sh | 38 ------------------
Documentation/maintainers/bump-live-qt | 66 --------------------------------
2 files changed, 104 deletions(-)
diff --git a/Documentation/maintainers/bump-kde-qt.sh b/Documentation/maintainers/bump-kde-qt.sh
deleted file mode 100755
index 494687d..0000000
--- a/Documentation/maintainers/bump-kde-qt.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-# Markos Chandras <hwoarang@gentoo.org>
-# Oneliner for bumping kde-qt ebuilds
-# use it like
-# bump-kde-qt <old version> <new version>
-# This will copy the <old version> ebuilds to <new version>
-# New version is always using 4.9999 ebuilds
-# Lets say you want to bump 4.4.9999 ebuilds to 4.5.9999 you have to write:
-#
-# ./bump-kde-qt 4.4.9999 4.5.9999
-#
-source /etc/init.d/functions.sh
-#### VARIABLES ####
-HOME="`pwd|xargs dirname|xargs dirname`"
-LIBS="x11-libs"
-EXCLUDE="qt-embedded"
-old="${1}"
-new="${2}"
-#################
-cd ${HOME}/${LIBS}
-## update ebuilds and create manifest ##
-ebegin "Updating ebuilds"
-for package in $(ls |grep -v ${EXCLUDE}|grep qt);do cd ${package};rm $(ls|grep ${old});cp "${package}-4.9999.ebuild" "${package}-${new}.ebuild";git add "${package}-${new}.ebuild";echangelog "Version bump to ${new}">>/dev/null;repoman manifest;cd ${HOME}/${LIBS};done
-eend $?
-## update sets ##
-ebegin "Updating sets"
-cd ${HOME}/sets
-sed -i "s/${old}/${new}/" qt-all-live-kde
-eend $?
-## update package keywords ##
-cd ${HOME}/Documentation/package.keywords/
-ebegin "Updating package keywords"
-sed -i "s/${old}/${new}/" qt-live-kde
-eend $?
-## add and commit but DONT push ##
-cd ${HOME}
-ebegin "Ready to commit"
-git add .
-eend $?
diff --git a/Documentation/maintainers/bump-live-qt b/Documentation/maintainers/bump-live-qt
deleted file mode 100755
index 1309cc5..0000000
--- a/Documentation/maintainers/bump-live-qt
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-
-. /etc/init.d/functions.sh
-base="${1}"
-version="${2}"
-overlay="$(portageq get_repo_path / qt)/dev-qt/"
-RED=$'\033[31;01m'
-GREEN=$'\e[32;01m'
-moto(){
- echo """
- ##############################################
- # Tool for bumping live qt packages using ge #
- # 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> #
- # qt overlay #
- ##############################################
- """
-}
-
-usage(){
- echo """
- ##################### 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 qt overlay #
- #################################################
- """
-}
-if [[ ${1} == -h ]];then
- moto
- usage
- exit 3
-fi
-
-if [[ $# != 2 ]]; then
- eerror "Incorrect number of parameters"
- usage
- eerror "Exiting..."
- exit 2
-fi
-
-
-pushd ${overlay}
-for pkg in qt-assistant qt-core qt-dbus qt-demo qt-gui qt-multimedia qt-opengl qt-phonon qt-qt3support qt-script qt-sql qt-svg qt-test qt-webkit qt-xmlpatterns; do
- qtpkg=$(find . -type f -name "${pkg}-${base}*.ebuild")
- cp ${qtpkg} ${pkg}/${pkg}-${version}.ebuild
- cd ${pkg}
- git add .
- repoman manifest
- cd ..
-done
-einfo "Packages are ready but I advice you to review them first. ${GREEN}Commit[C]${NORMAL}/${RED}Review[R]${NORMAL}" && read choice
-if [[ "${choice}" == "C" ]]; then
- git commit -a -m "dev-qt/qt*:bump to ${version}"
- git pull --rebase
- git push
-elif [[ "${choice}" == "R" ]]; then
- einfo "Script ended for further review"
-else
- eerror "No valid choice"
- exit 1
-fi
-exit 0
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [gentoo-commits] proj/qt:master commit in: Documentation/maintainers/
@ 2014-08-10 14:29 Davide Pesavento
2014-08-19 1:07 ` Davide Pesavento
0 siblings, 1 reply; 26+ messages in thread
From: Davide Pesavento @ 2014-08-10 14:29 UTC (permalink / raw
To: gentoo-commits
commit: e815f109d82f0565f35774d7b83c66b0326545dc
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 10 14:29:00 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Aug 10 14:29:00 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e815f109
[maintainers] Delete ancient scripts.
---
Documentation/maintainers/bump-qt-release | 39 -------
Documentation/maintainers/eclass-checker | 172 ------------------------------
2 files changed, 211 deletions(-)
diff --git a/Documentation/maintainers/bump-qt-release b/Documentation/maintainers/bump-qt-release
deleted file mode 100755
index e319b19..0000000
--- a/Documentation/maintainers/bump-qt-release
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-# custom script for bumping Qt release ebuilds
-# use at your own risk!
-# make sure you take care of any new patches before running this script
-# this does not include the qt meta ebuild
-
-EdgeDir="$(portageq get_repo_path / qt)"
-RelVer="4.5.2"
-
-echo
-echo "[bump-qt-release] Copying Qt ${RelVer} ebuilds from ${EdgeDir} to gentoo-x86"
-echo "[bump-qt-release] and running cvs add, echangelog and repoman manifest"
-echo
-for i in qt-{assistant,core,dbus,demo,gui,opengl,phonon,qt3support,script,sql,svg,test,webkit,xmlpatterns} ; do
- pushd ${i} || exit 'cannot pushd'
- cp ${EdgeDir}/x11-libs/${i}/${i}-${RelVer}.ebuild .
- cvs add ${i}-${RelVer}.ebuild || exit 'cannot cvs add'
- echangelog 'Version bump' || exit 'cannot echangelog'
- repoman manifest || exit 'cannot manifest'
- popd
-done
-
-echo
-echo "[bump-qt-release] Checking ebuilds with repoman full - abort if needed"
-echo
-for i in qt-{assistant,core,dbus,demo,gui,opengl,phonon,qt3support,script,sql,svg,test,webkit,xmlpatterns} ; do
- pushd ${i} || exit 'cannot pushd'
- repoman full
- popd
-done
-
-echo
-echo "[bump-qt-release] Doing the actual commit of Qt ${RelVer} ebuilds"
-echo
-for i in qt-{assistant,core,dbus,demo,gui,opengl,phonon,qt3support,script,sql,svg,test,webkit,xmlpatterns} ; do
- pushd ${i} || exit 'cannot pushd'
- repoman commit -m "Qt ${RelVer} release version bump"
- popd
-done
diff --git a/Documentation/maintainers/eclass-checker b/Documentation/maintainers/eclass-checker
deleted file mode 100755
index 3246474..0000000
--- a/Documentation/maintainers/eclass-checker
+++ /dev/null
@@ -1,172 +0,0 @@
-#!/bin/bash
-# this script checks for ebuilds using old and/or deprecated eclasses
-# written by Alex Alexander <wired@gentoo.org>
-#
-# arguments
-# -h -> generate html instead of plain text
-# -u -> upload results to devspace ( d.g.o:~/public_html/checks/${eclass}.eclass.html )
-# -v -> open results with xdg-open
-# -e <eclass> -> eclass to check
-# -p <dir> -> PORTAGE_DIR
-#
-# ./eclass-echecker -hu is ran daily by wired:
-# http://dev.gentoo.org/~wired/checks/qt4.eclass.html
-
-PORTAGE_DIR="/usr/portage/tree"
-
-args=$1
-opts=0
-html=0
-upload=0
-view=0
-eclass="qt4"
-
-dt="$(date --utc +%Y-%m-%d\ %H:%M:%S) UTC"
-
-while getopts hvue:p: args
-do
- opts=1
- case $args in
- h) html=1 ;;
- v) view=1 ;;
- u) upload=1 ;;
- e) eclass=${OPTARG} ;;
- p) PORTAGE_DIR={$OPTARG} ;;
- esac
-done
-
-function render_head() {
- if [[ $html == 1 ]]; then
- echo " <HTML>
- <HEAD>
- <TITLE>Qt4 ~testing ebuilds using old ${eclass}.eclass</TITLE>
- <STYLE>
- body {
- color: black;
- background: #ccc;
- font-family: Dejavu Sans Mono, Verdana;
- font-size: 12px;
- }
- #mainTable td {
- padding: 3px;
- font-family: Dejavu Sans Mono, Verdana;
- font-size: 12px;
- }
- #mainTable .splitter {
- padding: 0px;
- height: 1px;
- background: #333;
- }
- </STYLE>
- </HEAD>
- <BODY>
- <table cellspacing='0' cellpadding='0' id='mainTable'>
- <tr><td style='background: #333; color: white;'>Last update: <strong>$dt</strong> (testing: ${1} | stable: ${2})</td></tr>
- "
- else
- echo "The following ebuilds are using the old, deprecated ${eclass}.eclass. (testing: ${1} | stable: ${2})"
- fi
-
-}
-
-function render_foot() {
- if [[ $html == 1 ]]; then
- echo "
- </table>
- </BODY>
- </HTML>
- "
- fi
-}
-
-function render() {
- C=$1;
- X=$2;
- shift;
-
- if [[ $html == 1 ]]; then
- echo "
- <tr><td style='height: 5px'></td></tr>
- <tr><td style='font-weight: bold'>The following <span style='color: yellow'>${X}</span> ebuilds are using the old, deprecated <span style='color:red'>${eclass}.eclass</span>.</td></tr>
- <tr><td style='height: 5px'></td></tr>
- ";
- else
- echo "${X} ebuilds:"
- fi
-
-
- CCAT=""
- while (( $C > 0 )); do
- C=$(( $C - 1 ))
- shift
- CAT=${1%/*}
- if [[ $CAT != $CCAT ]]; then
- if [[ $html == 1 ]]; then
- echo "<tr><td class='splitter'></td></tr>";
- else
- echo
- fi
- fi
- if [[ $html == 1 ]]; then
- echo "<tr><td>${1}</td></tr>"
- else
- echo ${1}
- fi
- CCAT=${CAT}
- done
-}
-
-function check() {
- CNT_S=0
- CNT_T=0
- EB_S=( )
- EB_T=( )
-
- FOUND=$(grep --include="*ebuild" -r "^inherit" ${PORTAGE_DIR}/ |
- grep "${eclass}" | grep -v "${eclass}\-" | sort |
- while read i; do
- E=$(echo ${i} | cut -d":" -f1)
- echo $E;
- done
- )
-
- for i in $FOUND; do
- E=${i/*\/}
- C=${i%\/*}
- P=${C/*\/}
- C=${C%\/*}
- C=${C/*\/}
- KW=$(sed -nre 's:^\s*KEYWORDS="(.+)".*$:\1:p' "${i}")
- local stable=0
- for j in ${KW};
- do
- [[ ${j} == ${j/\~} ]] && stable=1 && break;
- done
- if [[ $stable == 0 ]]; then
- CNT_T=$((CNT_T + 1))
- EB_T[${#EB_T[*]}]="$C/$P/$E";
- else
- CNT_S=$((CNT_S + 1))
- EB_S[${#EB_S[*]}]="$C/$P/$E";
- fi
- done
-
- render_head $CNT_T $CNT_S
- render $CNT_T "testing" ${EB_T[@]}
- render $CNT_S "stable" ${EB_S[@]}
- render_foot
-}
-
-if [[ $upload == 1 ]] || [[ $view == 1 ]]; then
- if [[ $html == 1 ]]; then
- check > /tmp/${eclass}.eclass.html
- [[ $upload == 1 ]] && scp /tmp/${eclass}.eclass.html dev.gentoo.org:public_html/checks/
- [[ $view == 1 ]] && xdg-open /tmp/${eclass}.eclass.html &
- else
- check > /tmp/${eclass}.eclass.txt
- [[ $upload == 1 ]] && scp /tmp/${eclass}.eclass.txt dev.gentoo.org:public_html/checks/
- [[ $view == 1 ]] && xdg-open /tmp/${eclass}.eclass.txt &
- fi
-else
- check
-fi
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [gentoo-commits] proj/qt:master commit in: Documentation/maintainers/
2014-08-10 14:29 Davide Pesavento
@ 2014-08-19 1:07 ` Davide Pesavento
0 siblings, 0 replies; 26+ messages in thread
From: Davide Pesavento @ 2014-08-19 1:07 UTC (permalink / raw
To: gentoo-commits
commit: e815f109d82f0565f35774d7b83c66b0326545dc
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 10 14:29:00 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Aug 10 14:29:00 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e815f109
[maintainers] Delete ancient scripts.
---
Documentation/maintainers/bump-qt-release | 39 -------
Documentation/maintainers/eclass-checker | 172 ------------------------------
2 files changed, 211 deletions(-)
diff --git a/Documentation/maintainers/bump-qt-release b/Documentation/maintainers/bump-qt-release
deleted file mode 100755
index e319b19..0000000
--- a/Documentation/maintainers/bump-qt-release
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-# custom script for bumping Qt release ebuilds
-# use at your own risk!
-# make sure you take care of any new patches before running this script
-# this does not include the qt meta ebuild
-
-EdgeDir="$(portageq get_repo_path / qt)"
-RelVer="4.5.2"
-
-echo
-echo "[bump-qt-release] Copying Qt ${RelVer} ebuilds from ${EdgeDir} to gentoo-x86"
-echo "[bump-qt-release] and running cvs add, echangelog and repoman manifest"
-echo
-for i in qt-{assistant,core,dbus,demo,gui,opengl,phonon,qt3support,script,sql,svg,test,webkit,xmlpatterns} ; do
- pushd ${i} || exit 'cannot pushd'
- cp ${EdgeDir}/x11-libs/${i}/${i}-${RelVer}.ebuild .
- cvs add ${i}-${RelVer}.ebuild || exit 'cannot cvs add'
- echangelog 'Version bump' || exit 'cannot echangelog'
- repoman manifest || exit 'cannot manifest'
- popd
-done
-
-echo
-echo "[bump-qt-release] Checking ebuilds with repoman full - abort if needed"
-echo
-for i in qt-{assistant,core,dbus,demo,gui,opengl,phonon,qt3support,script,sql,svg,test,webkit,xmlpatterns} ; do
- pushd ${i} || exit 'cannot pushd'
- repoman full
- popd
-done
-
-echo
-echo "[bump-qt-release] Doing the actual commit of Qt ${RelVer} ebuilds"
-echo
-for i in qt-{assistant,core,dbus,demo,gui,opengl,phonon,qt3support,script,sql,svg,test,webkit,xmlpatterns} ; do
- pushd ${i} || exit 'cannot pushd'
- repoman commit -m "Qt ${RelVer} release version bump"
- popd
-done
diff --git a/Documentation/maintainers/eclass-checker b/Documentation/maintainers/eclass-checker
deleted file mode 100755
index 3246474..0000000
--- a/Documentation/maintainers/eclass-checker
+++ /dev/null
@@ -1,172 +0,0 @@
-#!/bin/bash
-# this script checks for ebuilds using old and/or deprecated eclasses
-# written by Alex Alexander <wired@gentoo.org>
-#
-# arguments
-# -h -> generate html instead of plain text
-# -u -> upload results to devspace ( d.g.o:~/public_html/checks/${eclass}.eclass.html )
-# -v -> open results with xdg-open
-# -e <eclass> -> eclass to check
-# -p <dir> -> PORTAGE_DIR
-#
-# ./eclass-echecker -hu is ran daily by wired:
-# http://dev.gentoo.org/~wired/checks/qt4.eclass.html
-
-PORTAGE_DIR="/usr/portage/tree"
-
-args=$1
-opts=0
-html=0
-upload=0
-view=0
-eclass="qt4"
-
-dt="$(date --utc +%Y-%m-%d\ %H:%M:%S) UTC"
-
-while getopts hvue:p: args
-do
- opts=1
- case $args in
- h) html=1 ;;
- v) view=1 ;;
- u) upload=1 ;;
- e) eclass=${OPTARG} ;;
- p) PORTAGE_DIR={$OPTARG} ;;
- esac
-done
-
-function render_head() {
- if [[ $html == 1 ]]; then
- echo " <HTML>
- <HEAD>
- <TITLE>Qt4 ~testing ebuilds using old ${eclass}.eclass</TITLE>
- <STYLE>
- body {
- color: black;
- background: #ccc;
- font-family: Dejavu Sans Mono, Verdana;
- font-size: 12px;
- }
- #mainTable td {
- padding: 3px;
- font-family: Dejavu Sans Mono, Verdana;
- font-size: 12px;
- }
- #mainTable .splitter {
- padding: 0px;
- height: 1px;
- background: #333;
- }
- </STYLE>
- </HEAD>
- <BODY>
- <table cellspacing='0' cellpadding='0' id='mainTable'>
- <tr><td style='background: #333; color: white;'>Last update: <strong>$dt</strong> (testing: ${1} | stable: ${2})</td></tr>
- "
- else
- echo "The following ebuilds are using the old, deprecated ${eclass}.eclass. (testing: ${1} | stable: ${2})"
- fi
-
-}
-
-function render_foot() {
- if [[ $html == 1 ]]; then
- echo "
- </table>
- </BODY>
- </HTML>
- "
- fi
-}
-
-function render() {
- C=$1;
- X=$2;
- shift;
-
- if [[ $html == 1 ]]; then
- echo "
- <tr><td style='height: 5px'></td></tr>
- <tr><td style='font-weight: bold'>The following <span style='color: yellow'>${X}</span> ebuilds are using the old, deprecated <span style='color:red'>${eclass}.eclass</span>.</td></tr>
- <tr><td style='height: 5px'></td></tr>
- ";
- else
- echo "${X} ebuilds:"
- fi
-
-
- CCAT=""
- while (( $C > 0 )); do
- C=$(( $C - 1 ))
- shift
- CAT=${1%/*}
- if [[ $CAT != $CCAT ]]; then
- if [[ $html == 1 ]]; then
- echo "<tr><td class='splitter'></td></tr>";
- else
- echo
- fi
- fi
- if [[ $html == 1 ]]; then
- echo "<tr><td>${1}</td></tr>"
- else
- echo ${1}
- fi
- CCAT=${CAT}
- done
-}
-
-function check() {
- CNT_S=0
- CNT_T=0
- EB_S=( )
- EB_T=( )
-
- FOUND=$(grep --include="*ebuild" -r "^inherit" ${PORTAGE_DIR}/ |
- grep "${eclass}" | grep -v "${eclass}\-" | sort |
- while read i; do
- E=$(echo ${i} | cut -d":" -f1)
- echo $E;
- done
- )
-
- for i in $FOUND; do
- E=${i/*\/}
- C=${i%\/*}
- P=${C/*\/}
- C=${C%\/*}
- C=${C/*\/}
- KW=$(sed -nre 's:^\s*KEYWORDS="(.+)".*$:\1:p' "${i}")
- local stable=0
- for j in ${KW};
- do
- [[ ${j} == ${j/\~} ]] && stable=1 && break;
- done
- if [[ $stable == 0 ]]; then
- CNT_T=$((CNT_T + 1))
- EB_T[${#EB_T[*]}]="$C/$P/$E";
- else
- CNT_S=$((CNT_S + 1))
- EB_S[${#EB_S[*]}]="$C/$P/$E";
- fi
- done
-
- render_head $CNT_T $CNT_S
- render $CNT_T "testing" ${EB_T[@]}
- render $CNT_S "stable" ${EB_S[@]}
- render_foot
-}
-
-if [[ $upload == 1 ]] || [[ $view == 1 ]]; then
- if [[ $html == 1 ]]; then
- check > /tmp/${eclass}.eclass.html
- [[ $upload == 1 ]] && scp /tmp/${eclass}.eclass.html dev.gentoo.org:public_html/checks/
- [[ $view == 1 ]] && xdg-open /tmp/${eclass}.eclass.html &
- else
- check > /tmp/${eclass}.eclass.txt
- [[ $upload == 1 ]] && scp /tmp/${eclass}.eclass.txt dev.gentoo.org:public_html/checks/
- [[ $view == 1 ]] && xdg-open /tmp/${eclass}.eclass.txt &
- fi
-else
- check
-fi
^ permalink raw reply related [flat|nested] 26+ messages in thread
* [gentoo-commits] proj/qt:master commit in: Documentation/maintainers/
@ 2019-11-28 19:31 Davide Pesavento
0 siblings, 0 replies; 26+ messages in thread
From: Davide Pesavento @ 2019-11-28 19:31 UTC (permalink / raw
To: gentoo-commits
commit: 2166c9f4473f729478cbea5665aaaab7d0a23e0c
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 28 19:29:54 2019 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Nov 28 19:29:54 2019 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=2166c9f4
Documentation/maintainers: remove obsolete script
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>
Documentation/maintainers/bump-python-revisions | 184 ------------------------
1 file changed, 184 deletions(-)
diff --git a/Documentation/maintainers/bump-python-revisions b/Documentation/maintainers/bump-python-revisions
deleted file mode 100755
index 87c267b4..00000000
--- a/Documentation/maintainers/bump-python-revisions
+++ /dev/null
@@ -1,184 +0,0 @@
-#!/bin/bash
-
-set -e
-
-source /etc/init.d/functions.sh
-
-########################## VARIABLES ############################
-DATE="$(date +%F|sed 's/-//g')" # date to be added to ebuilds
-TARGET="dev.gentoo.org:~/public_html/distfiles/"
-TEMP="/tmp/qt-python-bump/"
-OVERLAY="$(portageq get_repo_path / qt)"
-QUIET=
-####################################################################
-
-usage() {
- echo """
-
-./bump-python-revisions
-
--h: Display this message
--q: Quiet mode. No questions. Just bump and commit
-
- """
-}
-
-dosip() {
- SIPKG="sip-${new_sip}" # Format Sip package
- ebegin "Downloading ${SIPKG} tarball..."
- wget -P ${TEMP} http://www.riverbankcomputing.co.uk/static/Downloads/sip4/${SIPKG}.tar.gz || exit 2
- eend $?
- ebegin "Copying ${SIPKG} to ${TARGET}"
- eend $?
- scp ${TEMP}/${SIPKG}.tar.gz ${TARGET} || exit
- cp ${TEMP}/${SIPKG}.tar.gz $(portageq envvar DISTDIR) || exit
- pushd ${OVERLAY}/dev-python/sip/
- tomove=$(find '.' -type f -name "sip-*_pre*.ebuild"|tail -1)
- einfo "Previous ebuild: ${tomove#./}"
- mv ${tomove#./} sip-${new_sip_ver}_pre${DATE}.ebuild || exit 1
- git rm ${tomove}
- ebegin "Changing revision number to: ${new_sip_rev}"
- sed -i -e "/HG_REVISION=/s:=.*:=${new_sip_rev}:" sip-${new_sip_ver}_pre${DATE}.ebuild
- eend $?
- repoman manifest || exit 1
- git add .
- popd
-}
-
-dopyqt4() {
- PYPKG="PyQt-x11-gpl-snapshot-${new_pyqt4}" #Format PyQt4 package
- ebegin "Downloading ${PYPKG} tarball..."
- wget -P ${TEMP} http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/${PYPKG}.tar.gz || exit 2
- eend $?
- einfo "Copying ${PYPKG} to ${TARGET} ..."
- scp ${TEMP}/${PYPKG}.tar.gz ${TARGET} || exit
- cp ${TEMP}/${PYPKG}.tar.gz $(portageq envvar DISTDIR) || exit
- pushd ${OVERLAY}/dev-python/PyQt4/
- tomove=$(find '.' -type f -name "PyQt4-*_pre*.ebuild"|tail -1)
- einfo "Previous ebuild: ${tomove#./}"
- mv ${tomove#./} PyQt4-${new_pyqt4_ver}_pre${DATE}.ebuild || exit 1
- git rm ${tomove}
- ebegin "Changing revision number to: ${new_pyqt4_rev}"
- sed -i "/^REVISION/s:=.*:=${new_pyqt4_rev}:" PyQt4-${new_pyqt4_ver}_pre${DATE}.ebuild
- eend $?
- repoman manifest || exit 1
- git add .
- popd
-}
-
-commit() {
- if [[ -z ${QUIET} ]]; then
- ewarn "Your changes are ready to be merged. However I strongly recommend you to review your changes."
- ewarn ""
- einfo "Press 'r' to review your changes or 'y' to merge them to master branch (default 'r')."
- read choice
- case "$choice" in
- y)
- ewarn "Your changes will be merged now. Don't break the overlay or I will shoot you down!"
- git commit -m "PyQt4/sip: Automated version bump, remove old" || exit 2
- git push || exit 2
- ;;
- r|"")
- git diff
- ;;
- *)
- eerror ""
- eerror "Invalid option. Are you stupid or something?"
- eerror ""
- exit 3
- esac
- else
- git commit -m "PyQt4/sip: Automated version bump, remove old" || exit 2
- git push || exit 2
- fi
-}
-
-getrevisions() {
- pushd ${OVERLAY}/dev-python/PyQt4/ > /dev/null
- pyqt4_tomove=$(find '.' -type f -name "PyQt4-*_pre*.ebuild"|tail -1)
- pyqt4_revision=$(grep ^REVISION ${pyqt4_tomove}|cut -d "=" -f 2)
- PVER=$(echo ${pyqt4_tomove/\.\//}|sed "s:PyQt4-\(.*\)_pre.*:\1:")
- popd > /dev/null
- pushd ${OVERLAY}/dev-python/sip/ > /dev/null
- sip_tomove=$(find '.' -type f -name "sip-*_pre*.ebuild"|tail -1)
- sip_revision=$(grep "HG_REVISION=" ${sip_tomove}|cut -d "=" -f 2)
- SVER=$(echo ${sip_tomove/\.\//}|sed "s:sip-\(.*\)_pre.*:\1:")
- popd > /dev/null
-
- einfo "Old Revisions:"
- einfo "PyQt4 : ${pyqt4_revision}"
- einfo "sip : ${sip_revision}"
-
- # Find new revisions
- new_pyqt4=$(curl -s \
- http://www.riverbankcomputing.com/software/pyqt/download \
- | grep "x11-gpl-snapshot-.*.tar.gz" \
- | cut -d '/' -f 5 | cut -d '-' -f 5-6 \
- | sed -e "s@\.tar\.gz.*@@")
- new_pyqt4_rev=$(echo $new_pyqt4 | cut -d '-' -f 2)
- new_pyqt4_ver=$(echo $new_pyqt4 | cut -d '-' -f 1)
- [[ -z ${new_pyqt4} ]] || \
- einfo "New PyQt4 snapshot@rev: ${new_pyqt4}@${new_pyqt4_rev}"
- new_sip=$(curl -s \
- http://www.riverbankcomputing.com/software/sip/download \
- | grep "snapshot-.*.tar.gz" \
- | cut -d '/' -f 5 | cut -d '-' -f 5-8 \
- | sed -e "s@\.tar\.gz.*@@")
- new_sip_rev=$(echo $new_sip | cut -d '-' -f 3)
- new_sip_ver=$(echo $new_sip | cut -d '-' -f 1)
- [[ -z ${new_sip} ]] || \
- einfo "New sip snapshot@rev: ${new_sip}@${new_sip_rev}"
- # Decide what to bump"
- [[ -z ${new_pyqt4_rev} ]] || \
- { [[ "${pyqt4_revision}" != "${new_pyqt4_rev}" ]] \
- && dopyqt4 && FOUND=true; }
- [[ -z ${new_sip_rev} ]] || \
- { [[ "${sip_revision}" != "${new_sip_rev}" ]] \
- && dosip && FOUND=true; }
-
- if [[ -n ${FOUND} ]]; then
- commit
- # clean up
- dst=$(portageq envvar DISTDIR)
- einfo "Cleaning up tarballs..."
- [[ -n ${SIPKG} ]] && rm ${TEMP}/${SIPKG}.tar.gz && rm ${dst}/${SIPKG}.tar.gz
- [[ -n ${PYPKG} ]] && rm ${TEMP}/${PYPKG}.tar.gz && rm ${dst}/${PYPKG}.tar.gz
- rm -r ${TEMP}
- else
- ewarn ""
- ewarn "No new snapshots. Sorry :-("
- ewarn ""
- fi
- exit 0
-
-}
-
-einfo """
- ###########################################################
- # Automatic PyQt4/sip bumping tool for qt overlay #
- # Author: Markos Chandras <hwoarang@gentoo.org> #
- # Use ./bump-python-revisions -h for a usage example #
- ###########################################################
-"""
-
-ebegin "Updating tree"
-git pull
-eend $?
-
-while getopts ":hq" opt; do
- case $opt in
- h)
- usage
- exit 1
- ;;
- q)
- QUIET=1
- ;;
- ?)
- usage
- exit 1
- ;;
- esac
-done
-
-getrevisions
^ permalink raw reply related [flat|nested] 26+ messages in thread
end of thread, other threads:[~2019-11-28 19:31 UTC | newest]
Thread overview: 26+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-05 22:14 [gentoo-commits] proj/qt:master commit in: Documentation/maintainers/ Markos Chandras
-- strict thread matches above, loose matches on Subject: below --
2019-11-28 19:31 Davide Pesavento
2014-08-10 14:29 Davide Pesavento
2014-08-19 1:07 ` Davide Pesavento
2013-06-30 23:11 Davide Pesavento
2012-10-23 17:54 Markos Chandras
2012-10-16 18:30 Markos Chandras
2012-10-16 18:30 Markos Chandras
2012-10-14 21:30 Davide Pesavento
2012-09-22 16:43 Markos Chandras
2012-09-22 16:36 Markos Chandras
2012-09-22 12:01 Markos Chandras
2012-07-12 17:10 Markos Chandras
2012-07-10 17:23 Markos Chandras
2012-07-04 17:55 Markos Chandras
2012-06-23 11:06 Markos Chandras
2012-06-09 8:44 Markos Chandras
2012-06-08 20:24 Markos Chandras
2012-06-08 20:20 Markos Chandras
2012-06-08 20:20 Markos Chandras
2012-03-29 13:56 Davide Pesavento
2012-03-25 16:46 Markos Chandras
2012-03-24 11:10 Markos Chandras
2012-03-24 11:08 Markos Chandras
2012-03-18 11:03 Markos Chandras
2012-03-18 11:00 Markos Chandras
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox