* [gentoo-commits] proj/qt:master commit in: dev-python/PyQt4/, Documentation/maintainers/
@ 2012-03-24 11:03 Markos Chandras
0 siblings, 0 replies; 2+ messages in thread
From: Markos Chandras @ 2012-03-24 11:03 UTC (permalink / raw
To: gentoo-commits
commit: d6420c32a50b33d2185937bec7eff8666b304681
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 24 11:01:33 2012 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Mar 24 11:01:33 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=d6420c32
PyQt4/sip: Automatic version bump, remove old
---
Documentation/maintainers/bump-python-revisions | 4 ++--
dev-python/PyQt4/Manifest | 2 +-
...20318.ebuild => PyQt4-4.9.2_pre20120324.ebuild} | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Documentation/maintainers/bump-python-revisions b/Documentation/maintainers/bump-python-revisions
index 7c42630..f0528fe 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=$(echo ${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=$(echo ${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}"
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index b9f3277..5bd30de 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -1 +1 @@
-DIST PyQt-x11-gpl-snapshot-4.9.2-b99fb4a42763.tar.gz 9890928 SHA256 cdf891ef1cb9aead236afd80d155b48417d74078dba4a2e0308afd40937f15f2 SHA512 567c226fc2388f39b1510f89382999fc43c70e4e02c713fac1cff95d70878c0bcb26f4abc1faf3f4e95bf5d3fb12631628d7dca662f7d97500c031481d51540b WHIRLPOOL 39a882dc2449afceb46a1db47918a2de852cf6965cde80dc17683a0cf75f95115ec37af0897f776121caff316c45e8faa5590519700d873d0f9681d098c0bbc0
+DIST PyQt-x11-gpl-snapshot-4.9.2-7df26c475ead.tar.gz 9892086 SHA256 9c4bb8e8a9abfb4fac3d9c5cfc0bc6fd2a0a262a24292deb44227bda9744f3d6 SHA512 15673fa328df4c3befbc1d4413729c8938224546cd989e97098e548cc05db3d00f1fe2dd92ae5474e0d354f437f7db3f36cc4ca9ce0dbfa1967e3baf491212c3 WHIRLPOOL 8d7d27cc1b19d987e3d7d334acc315c0dade7b67bf0da392a0159a59186015c4fcdb2f2e265d9a3c1f0f73bf64da90aafa225ebac8d9f6b40338ec70e39379fb
diff --git a/dev-python/PyQt4/PyQt4-4.9.2_pre20120318.ebuild b/dev-python/PyQt4/PyQt4-4.9.2_pre20120324.ebuild
similarity index 99%
rename from dev-python/PyQt4/PyQt4-4.9.2_pre20120318.ebuild
rename to dev-python/PyQt4/PyQt4-4.9.2_pre20120324.ebuild
index 3e99b86..dd0dfa7 100644
--- a/dev-python/PyQt4/PyQt4-4.9.2_pre20120318.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.9.2_pre20120324.ebuild
@@ -11,7 +11,7 @@ RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
inherit toolchain-funcs qt4-r2 python
-REVISION=b99fb4a42763
+REVISION=7df26c475ead
# Minimal supported version of Qt.
QT_VER="4.7.2"
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/qt:master commit in: dev-python/PyQt4/, Documentation/maintainers/
@ 2012-06-23 11:03 Markos Chandras
0 siblings, 0 replies; 2+ messages in thread
From: Markos Chandras @ 2012-06-23 11:03 UTC (permalink / raw
To: gentoo-commits
commit: 14d4d30d44e2ad247f88130cc35e326748a9cbc9
Author: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 23 11:03:16 2012 +0000
Commit: Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Jun 23 11:03:16 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=14d4d30d
PyQt4/sip: Automated version bump, remove old
---
Documentation/maintainers/bump-python-revisions | 45 ++++++++++++++------
dev-python/PyQt4/Manifest | 2 +-
...20608.ebuild => PyQt4-4.9.3_pre20120623.ebuild} | 2 +-
3 files changed, 34 insertions(+), 15 deletions(-)
diff --git a/Documentation/maintainers/bump-python-revisions b/Documentation/maintainers/bump-python-revisions
index ec57e92..02c6b6a 100755
--- a/Documentation/maintainers/bump-python-revisions
+++ b/Documentation/maintainers/bump-python-revisions
@@ -25,7 +25,7 @@ usage() {
dosip(){
- SIPKG="sip-${SVER}-snapshot-${new_sip}" # Format Sip package
+ SIPKG="sip-snapshot-${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 $?
@@ -36,9 +36,9 @@ dosip(){
pushd ${OVERLAY}/dev-python/sip/
tomove=$(find '.' -type f -name "sip-*_pre*.ebuild"|tail -1)
einfo "Previous ebuild: ${tomove#./}"
- mv ${tomove#./} sip-${SVER}_pre${DATE}.ebuild || exit "Failed to bump sip"
- ebegin "Changing revision number to: ${new_sip}"
- sed -i "/^HG_REVISION/s:=.*:=${new_sip}:" sip-${SVER}_pre${DATE}.ebuild
+ mv ${tomove#./} sip-${new_sip_ver}_pre${DATE}.ebuild || exit "Failed to bump sip"
+ ebegin "Changing revision number to: ${new_sip_rev}"
+ sed -i "/^HG_REVISION/s:=.*:=${new_sip_rev}:" sip-${new_sip_ver}_pre${DATE}.ebuild
eend $?
repoman manifest
git add .
@@ -46,7 +46,7 @@ dosip(){
}
dopyqt4(){
- PYPKG="PyQt-x11-gpl-snapshot-${PVER}-${new_pyqt4}" #Format PyQt4 package
+ 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 $?
@@ -56,9 +56,9 @@ dopyqt4(){
pushd ${OVERLAY}/dev-python/PyQt4/
tomove=$(find '.' -type f -name "PyQt4-*_pre*.ebuild"|tail -1)
einfo "Previous ebuild: ${tomove#./}"
- mv ${tomove#./} PyQt4-${PVER}_pre${DATE}.ebuild || exit "Failed to bump PyQt4"
- ebegin "Changing revision number to: ${new_pyqt4}"
- sed -i "/^REVISION/s:=.*:=${new_pyqt4}:" PyQt4-${PVER}_pre${DATE}.ebuild
+ mv ${tomove#./} PyQt4-${new_pyqt4_ver}_pre${DATE}.ebuild || exit "Failed to bump PyQt4"
+ 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
git add .
@@ -111,12 +111,31 @@ getrevisions(){
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:\..*::")
- new_sip=$(curl -s http://www.riverbankcomputing.com/software/sip/download|grep "snapshot-.*.tar.gz"|cut -d '/' -f 5|cut -d '-' -f 7|sed "s:\..*::")
-
+ 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 6-7 \
+ | sed -e "s@\.tar\.gz.*@@")
+ new_sip_rev=$(echo $new_sip | cut -d '-' -f 2)
+ 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"
- [[ ${pyqt4_revision} != ${new_pyqt4} ]] && dopyqt4 && FOUND=true;
- [[ ${sip_revision} != ${new_sip} ]] && dosip && FOUND=true;
+ [[ -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
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index 95c9001..90e4aab 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -1 +1 @@
-DIST PyQt-x11-gpl-snapshot-4.9.2-93480e10d581.tar.gz 9907000 SHA256 815daa9bbc583e6ed69b927a0a3665fb5ec8cb492772f5eb910dc86673163cb4 SHA512 8d577d19517752349429a1b12d838a58a443d18cc73bb7ba5a45ca6db372433240d03a1aba65f99af48f40e6bd05675f2211ea4a6fe195c999397f88470e9701 WHIRLPOOL f89e3c5538b110b19a460405d60cd30b8cc6d569afd7baab10cfdc78fc5ea85fc3b269293f473cc2c1e4ba36bddd2ce3184c6ea633e38f09c251510af19940c5
+DIST PyQt-x11-gpl-snapshot-4.9.3-d0d1c4101e69.tar.gz 9944749 SHA256 0dd2d60472067c77bdbbab339334c5bc18915607008ec0529e12f8e09ccf929c SHA512 0393becd43dd1910524ea096e1826f1c961d50fe600a4acefc90b257c248af64f229b1019a6446fd73e773b6229e2116ec706adfc97246a75d7da6f24181e387 WHIRLPOOL 3566e716a13ef84aa7d099016a687917883f9c9222b8180cbad454acd5d37cfe6a8f931311d32fbd9cabfe76a04ba7ba82bec41a75de0063b1e8141b00e928f8
diff --git a/dev-python/PyQt4/PyQt4-4.9.2_pre20120608.ebuild b/dev-python/PyQt4/PyQt4-4.9.3_pre20120623.ebuild
similarity index 99%
rename from dev-python/PyQt4/PyQt4-4.9.2_pre20120608.ebuild
rename to dev-python/PyQt4/PyQt4-4.9.3_pre20120623.ebuild
index 5f88cca..0b783fa 100644
--- a/dev-python/PyQt4/PyQt4-4.9.2_pre20120608.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.9.3_pre20120623.ebuild
@@ -11,7 +11,7 @@ RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
inherit eutils toolchain-funcs qt4-r2 python
-REVISION=93480e10d581
+REVISION=d0d1c4101e69
# Minimal supported version of Qt.
QT_VER="4.7.2"
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-06-23 11:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-24 11:03 [gentoo-commits] proj/qt:master commit in: dev-python/PyQt4/, Documentation/maintainers/ Markos Chandras
-- strict thread matches above, loose matches on Subject: below --
2012-06-23 11:03 Markos Chandras
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox