PyQt4/sip: Automatic version bump, remove old

5 files changed, 94 insertions, 95 deletions

diff --git a/Documentation/maintainers/bump-python-revisions b/Documentation/maintainers/bump-python-revisions
index 5bb5abc1..fc7bc29c 100755
--- a/Documentation/maintainers/bump-python-revisions
+++ b/Documentation/maintainers/bump-python-revisions
@@ -1,6 +1,15 @@
 #!/bin/bash
 source /etc/init.d/functions.sh
 
+########################## VARIABLES ############################
+PVER="4.8.4" # PyQt4 current working version
+SVER="4.12.2" #$ Sip current working version
+DATE="$(date +%F|sed 's/-//g')" # date to be added to ebuilds
+TARGET="dev.gentooexperimental.org:~/public_html/distfiles/"
+TEMP="/tmp/qting-edge-python-bump/"
+OVERLAY="../../" # ugly but hey dont shoot me
+####################################################################
+
 usage() {
 	echo """
 
@@ -17,6 +26,50 @@ Use -c option to skip bumping operation and do
 	"""
 }
 
+
+dosip(){
+	SIPKG="sip-${SVER}-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 $?
+	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-${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
+	eend $?
+	repoman manifest
+	git add .
+	popd
+}
+
+dopyqt4(){
+	PYPKG="PyQt-x11-gpl-snapshot-${PVER}-${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-${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
+	eend $?
+	repoman manifest
+	git add .
+	popd
+}
+
+
+
 commit() {
 ewarn "Your changes are ready to be merged. However I strongly recommend you to review your changes."
 ewarn ""
@@ -37,33 +90,41 @@ case "$choice" in
 esac
 }
 
-
-########################## VARIABLES ############################
-PREV="${1}" # PyQt4 Revision
-SREV="${2}" # Sip Revision
-PVER="4.8.4" # PyQt4 current working version
-SVER="4.12.2" #$ Sip current working version
-PYPKG="PyQt-x11-gpl-snapshot-${PVER}-${PREV}" #Format PyQt4 package
-SIPKG="sip-${SVER}-snapshot-${SREV}" # Format Sip package
-DATE="$(date +%F|sed 's/-//g')" # date to be added to ebuilds
-####################################################################
-
-TARGET="dev.gentooexperimental.org:~/public_html/distfiles/"
-TEMP="/tmp/qting-edge-python-bump/"
-OVERLAY="../../" # ugly but hey dont shoot me
-
-if [[ -z $1 ]]; then
-	eerror " "
-	eerror "Invalid usage"
-	eerror " "
-	usage
-	exit 1
-elif [[ $1 == "-h" ]]; then
-	usage
+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=::")
+	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=::")
+	popd >> /dev/null
+
+	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:\..*::")
+	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:\..*::")
+	
+	# Decide what to bump"
+	[[ ${pyqt4_revision} != ${new_pyqt4} ]] && dopyqt4 && FOUND=true;
+	[[ ${sip_revision} != ${new_sip} ]] && dosip && FOUND=true;
+
+	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 $?
+	fi
 	exit 0
-elif [[ $1 == "-c" ]];then
-	commit
-fi
+
+}
 
 einfo """
 	###########################################################
@@ -73,66 +134,4 @@ einfo """
 	# Use ./bump-python-revisions -h for a usage example      #
 	###########################################################
 """
-
-ebegin "Downloading tarballs..."
-wget -P ${TEMP} http://www.riverbankcomputing.co.uk/static/Downloads/sip4/${SIPKG}.tar.gz || exit 2
-wget -P ${TEMP} http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/${PYPKG}.tar.gz || exit 2
-eend $?
-
-if [[ $? != 0 ]]; then
-	eerror "Failed to download tarballs. Exiting..."
-	exit $?
-fi
-
-# copy the tarballs to mirror
-ebegin "Copying files to mirror..."
-scp ${TEMP}/${PYPKG}.tar.gz ${TARGET} || exit
-scp ${TEMP}/${SIPKG}.tar.gz ${TARGET} || exit
-eend $?
-
-# copy files to local distdir
-ebegin "Copying files to distdir..."
-cp ${TEMP}/${PYPKG}.tar.gz $(portageq envvar DISTDIR) || exit
-cp ${TEMP}/${SIPKG}.tar.gz $(portageq envvar DISTDIR) || exit
-eend $?
-
-# bump ebuilds
-einfo "Bumping ebuilds..."
-
-# PyQt4
-pushd ${OVERLAY}/dev-python/PyQt4/
-tomove=$(find '.' -type f -name "PyQt4-*_pre*.ebuild"|tail -1)
-einfo "Previous ebuild to use: ${tomove#./}"
-mv ${tomove#./} PyQt4-${PVER}_pre${DATE}.ebuild || exit "Failed to bump PyQt4"
-ebegin "Changing revision number to ${PREV}"
-sed -i "/^REVISION/s:=.*:=${PREV}:" PyQt4-${PVER}_pre${DATE}.ebuild
-eend $?
-repoman manifest
-git add .
-popd
-
-# sip
-pushd ${OVERLAY}/dev-python/sip/
-tomove=$(find '.' -type f -name "sip-*_pre*.ebuild"|tail -1)
-einfo "Previous ebuild to use: ${tomove#./}"
-mv ${tomove#./} sip-${SVER}_pre${DATE}.ebuild || exit "Failed to bump sip"
-ebegin "Changing revision number to ${SREV}"
-sed -i "/^HG_REVISION/s:=.*:=${SREV}:" sip-${SVER}_pre${DATE}.ebuild
-eend $?
-repoman manifest
-git add .
-popd
-
-# commit
-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 $?
-
-exit 0
+getrevisions
diff --git a/dev-python/PyQt4/Manifest b/dev-python/PyQt4/Manifest
index 835c57aa..46fbc4dc 100644
--- a/dev-python/PyQt4/Manifest
+++ b/dev-python/PyQt4/Manifest
@@ -2,6 +2,6 @@ AUX PyQt4-4.6.1-configure-multilib.patch 883 RMD160 4ce96cdf4d53773c245544737c89
 AUX PyQt4-4.7.2-configure.py.patch 933 RMD160 1c9525855d47bcdbf0c88618294be44274ce653b SHA1 4b27ab9173692a9d74598dc7c7fc88c3531e09b5 SHA256 1a87c58ccb14441f77c7c764b6e6c40d1bdd64c5b35581f3deda54019a3461be
 AUX PyQt4-4.7.3-qreal_float_support.patch 6460 RMD160 f022dc75ccde5b923c689f82d169d02e8b066a19 SHA1 2e000133b482f5bb36a5795e375bfa3f60dd5c55 SHA256 8183d7a12c094d02eb4f1ac2b983690c39ee54182a0d28adba52348f705e9c16
 AUX PyQt4-4.8.3-configure-multilib.patch 775 RMD160 b6248b0cd228db706de61da424ebc2e54d882ee5 SHA1 592083f3ed3b99b03392cee976cdc263ed56af22 SHA256 e637464097e81a26b0335715e04021acbba241685a853a0c66eba34660461b98
-DIST PyQt-x11-gpl-snapshot-4.8.4-17e24ab57cf9.tar.gz 9767056 RMD160 49be6999f3bc5a27218b4a6d3f0340204e80c17f SHA1 b45aaf011abf45996bc453ee9d244ce88717e9ef SHA256 35568f9e5dcc93aa0ce124352abda1a7ccc0eb049d221b264fd973bd877c4bb2
-EBUILD PyQt4-4.8.4_pre20110223.ebuild 4987 RMD160 f27d187c4955deb42f6194881ac07a1c4a3da8ab SHA1 07c44c69f8002acea6e1734aeba1bfa9921da8f1 SHA256 12a6a29fbdef2543ff5f80f1c42c45239231e41ff1f7cb0a091787549959569d
+DIST PyQt-x11-gpl-snapshot-4.8.4-e8c290c7fcb7.tar.gz 9767049 RMD160 812224dabda6250f8c0fe76438405d69bd3453d4 SHA1 d360baeecafd1cc391080a53b6d32941d55938f0 SHA256 c78622bb0e5ef7cb5384db83885bd62de2c8a2e3cdb87582588628ab7b20213b
+EBUILD PyQt4-4.8.4_pre20110228.ebuild 4987 RMD160 4229ede46c7c3617adbaad464f23ff1499f8b76d SHA1 1f7392f98e666aa7af3c4d40915c9026422de97b SHA256 1365c0d8efd9315bacca19f488900d757cbb7841598c8f8811d88e87e04d29d1
 MISC metadata.xml 977 RMD160 23f99466eeacd466e33a44b3c39734cbcc4bab4a SHA1 db18d5fd7052bca05d5f840d07e4f68d82e655e1 SHA256 c2ff560a0958956cf8f1fd0f580622882c0808439d50ea307379547109c9d419
diff --git a/dev-python/PyQt4/PyQt4-4.8.4_pre20110223.ebuild b/dev-python/PyQt4/PyQt4-4.8.4_pre20110228.ebuild
index a3ef768f..8d30cfcb 100644
--- a/dev-python/PyQt4/PyQt4-4.8.4_pre20110223.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.8.4_pre20110228.ebuild
@@ -10,7 +10,7 @@ RESTRICT_PYTHON_ABIS="*-jython"
 
 inherit python qt4-r2 toolchain-funcs
 
-REVISION=17e24ab57cf9
+REVISION=e8c290c7fcb7
 MY_P="PyQt-x11-gpl-snapshot-${PV/_pre*/}-${REVISION}"
 QT_VER="4.7.1" # minimal Qt version this is supposed to work with
 
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 03a3ad3a..f8cae558 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,5 +1,5 @@
 AUX sip-4.9.3-darwin.patch 1447 RMD160 adc8a4c56dbed79dc172467de5df4205fa071bc6 SHA1 c1ad08eff9c537068bd5af4782a7e570cc6c2552 SHA256 91751308ce118af4f7f7cb3ac3e25de29c527ddc0bb52102e6e835c8c0e64ea2
-DIST sip-4.12.2-snapshot-0fae9a0aae28.tar.gz 716404 RMD160 d1fb1d932ea9bbdcea31b1c128713ae4c3e91075 SHA1 7137da89305b8e8dbee412d1b0ba041adacbed37 SHA256 a7f2f661642123ad84da93cc3354f4035c778b60ba3cce0ee7dc3a436481359a
-EBUILD sip-4.12.2_pre20110223.ebuild 2431 RMD160 8f25d95ab7b8758325ee5ffcf3a25f030d73d9d3 SHA1 bbeef3a70b226745b7a2b4b5c58c95318f57f78f SHA256 3cd1c564a02b06eb6632a397401c57a0bd09f38b036e4a1ff7113d9f863432ff
+DIST sip-4.12.2-snapshot-62e2faa4fb81.tar.gz 716821 RMD160 7409606e86f62146991a3025d1ca753d8f68dd2e SHA1 d0a0181f39fd838ed9976cd90556e3e7b982df7f SHA256 a4c35da99021141aa7f07382405096cb1d6433bec4c1c4e77dc3b6e65312a0cb
+EBUILD sip-4.12.2_pre20110228.ebuild 2431 RMD160 87c64ffb217652cb876e1f7d2d4a2e9b1bee9f5e SHA1 d4ebc87bc135adc54022de32e00d464cf81afaa1 SHA256 ad3f1bc361f0a81e31f228848b68a17ef1ae3b88299486385dab60f1647ba281
 EBUILD sip-4.9999.ebuild 2295 RMD160 3629c8a726fabca58b49d1cdc8bb40de167f4260 SHA1 5e7855c65dd92646dfe141a345793b0d4d4e9ced SHA256 969ac420f75d0970e10e5ed36f3ab7baa0c5fe53314dc8b0a3ce0db1880346b1
 MISC metadata.xml 372 RMD160 ff5f25817e7f743fd660f836c240e4369a77bc19 SHA1 b421c9675c1c4dcffd9872f0ef043087e2e79539 SHA256 7e0a125fd3b30fbe45e6fb3d306e342cc23d3d9f45d14f9907779075bf2dabf7
diff --git a/dev-python/sip/sip-4.12.2_pre20110223.ebuild b/dev-python/sip/sip-4.12.2_pre20110228.ebuild
index 867f1c61..c7288e62 100644
--- a/dev-python/sip/sip-4.12.2_pre20110223.ebuild
+++ b/dev-python/sip/sip-4.12.2_pre20110228.ebuild
@@ -12,7 +12,7 @@ EHG_REPO_URI="http://www.riverbankcomputing.com/hg/sip"
 
 inherit eutils python toolchain-funcs ${HG_ECLASS}
 
-HG_REVISION=0fae9a0aae28
+HG_REVISION=62e2faa4fb81
 
 DESCRIPTION="Python extension module generator for C and C++ libraries"
 HOMEPAGE="http://www.riverbankcomputing.co.uk/software/sip/intro http://pypi.python.org/pypi/SIP"