Need more general version handling

Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64

3 files changed, 30 insertions, 27 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 748bd8d05a3b..16f098a45b27 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.327 2012/06/01 20:18:03 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.328 2012/06/02 09:41:50 dilfridge Exp $
+
+  02 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  files/generate_libreoffice_package.sh:
+  Need more general version handling
 
   01 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.5.4.2-r1.ebuild, libreoffice-3.5.9999.ebuild,
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 2e4dc2c54358..9f282603594e 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
-AUX generate_libreoffice_package.sh 3601 RMD160 0ce44e076c1d146c4590b3dead79bab67441049e SHA1 a417cb8dddccd21e7da005b7701fbeec9b755f68 SHA256 9ef6dfc77a5707c592589270adf5105d8fc07a7f7b564fd73abb37e6e8d51f55
+AUX generate_libreoffice_package.sh 3540 RMD160 4dcfd53e87b4b0cbd96752a8b994bcfca8bfcab6 SHA1 7b9444e6ed8ee80c6b5dff795d7aaad4cee52885 SHA256 96f5597156d2f2d8952ebfcd58ca2c4206639e027388f0e09661a30859cfc102
 AUX libreoffice-3.5-doublebuild.patch 887 RMD160 dd38de91af9b513e3b66bfa53a5d74635fdc16e2 SHA1 5cae5b8aedd7f18d526e61c465f944d46e06de4d SHA256 15dba3ca6be47bffe26e9eae73ed356a3e75fde97c5000b9a19b61906af8f5f8
 AUX libreoffice-3.5-hebrew-icu49.patch 5661 RMD160 0eb99d6c5a30512820540e285667e3b6aefdedfc SHA1 f7dda045920175b03e683ad440913088e6c485b9 SHA256 169ec723b1453b932deefafada3e4dcbc038a336c427657021e1de8afadd8ab9
 AUX libreoffice-3.5-propagate-gb_FULLDEPS.patch 922 RMD160 251ea777df53418e6acbb208e2a57ba374ad17a3 SHA1 09ede0550fcc518a3d30e4ebc06f842ef79b39c4 SHA256 73cbbec0744fc8cce99f5c9dd499935e9bf2db2e3d994045fab4c328116e3724
@@ -31,22 +31,22 @@ EBUILD libreoffice-3.5.2.2.ebuild 14796 RMD160 50e705b52d06cbe7e2aa820fbafd8cbe5
 EBUILD libreoffice-3.5.4.2-r1.ebuild 15723 RMD160 9af2a417275813e8366b874872acf2d5471ba1b0 SHA1 7ae07feb071cd81867b1bd314bb531610e946d23 SHA256 97a8772f415e83d3b3977fb9480ca837aab20a6dc97d267e947e619d432eaeb9
 EBUILD libreoffice-3.5.9999.ebuild 15655 RMD160 b7aba3e31dfed5bf04e1c06230f3ae63f24d179a SHA1 ba5f15ce874cc079a01a57dab6c2851013ed4545 SHA256 b380ef9af20e2f2f5ab909a8478c2c47fee60b10f5a3c84e0aac360f4c403546
 EBUILD libreoffice-9999-r2.ebuild 17315 RMD160 527ad34efd996fa299e9d78de84d1c311640c19e SHA1 29a268a4141a152f053c414e2b8ded7523a52ecf SHA256 ed7bab5b14c50012029191859c5b01291adb90dfdfc7b542a1b2411ad7ee96ed
-MISC ChangeLog 60246 RMD160 aefc85ee2b84130ebbbdb558849d72b27a70d27a SHA1 832df1ea2429f119314d81e20660e96d867320d6 SHA256 03f96e5e4fcea6abde1dbccb5ce4149f0715fd9a0b3aacf606d6c4bd03303d38
+MISC ChangeLog 60382 RMD160 171b6c2e12695fb71db8a47ad1bc6f8cae7a5250 SHA1 6a73f3f9ee33225e60c4276639aec6f83577bd73 SHA256 f3ca902644a6d11ec995b014036526b99d5ea6d2149f2d6d1b83211ed08a3fde
 MISC metadata.xml 1534 RMD160 24433486738eb58853e959332201611cf24fd5c6 SHA1 05d71c3efc820312fcf61f0fee4cb8d6e91a7c52 SHA256 2f095ea98ee3715366a47bfb72683434384d06526cb66a3db8b071fed537b401
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPySODAAoJEOSiRoyO7jvofLAP/jZmQb6dS93yR3lPL2Y1MocM
-lmFCJc97sV64cNyOL5UJUHUaeFGNW9f5NLgaEZje6Me9SCJOLj8t/JAINhZ17hDw
-lUbnI3aA3nH5tCHwHQQbkLbXOC0IzYvsNlB9Su3PovOM6kDmSFeQTCG/bucQy8Tw
-rSk3g/KKZSr7J9JJkbxbcEozyOA2bmQoHxZCuPbM8GJzuF5nq6PE4aJ1LF1AzfbA
-ca3NNyzbZR5XsCEzE1N8biv/65BBbB38gVswzYa/qj28MHkK1QJ1VinWeFQPeyBB
-WM+82mAbeOdOIc4tAuE9kCSpRbsNzgznFcvXo4kYRxvmLz+uNFSaSLKFF+ktCMba
-d3yoWaf6Pj1sPnt2vccU8kTCrKr07HPrYxglmrRyWBK7OMYoupAGzHJw5vWBCfU2
-xL6HkPJeb3hDOD/uD/7iL5LbWJSgkdxOsApyMU0K48w/L6rN8gP90rKbJlLvwbBi
-p01bg5M2mh/ZmuZm9JlhAoM+AI6osclPSTYMM0r4qic5jtvT8y3gGW09afpbL8TI
-WRQW2yBTjQ8HhRbkmY6NYR33dZax08g5vmj9aDypB22CoU789BML4isjPTa+iKaB
-mTMSE80GlPYZioUDL3BcWAFu0j8G9+H5STXqpRklkNdkYI4uQc3UFKXKw/nTHIiw
-r/mOj4suDsN4MFMOkm6F
-=kiXK
+iQIcBAEBCgAGBQJPyeAqAAoJENwGBM22xffe/BwP/3YEgHJLn9qwZ6huCZ5I9/Ea
+aTefr730dYBBku6LJMWyCwk2pgEN8Vz86/38B2IGy0FWlBtaXIdVMyVhpCX+mxFh
+IzdowfyPohHPrIoG1ybaZwgytDI8smb7QeUPFj+oeSh48E3vIYyaWLYaxnwdyxDK
+vq7ouyfBnI5TW93qdW3Yz4H1Ar+NxZBjOqzUTH2spVg5Pzo1l9snALr0sxi4OX1e
+1Ysgn4nmFTN8XVZLMgE9M3bhFr/k11YJqsrZJLh2g+HNd2wvF27Zp9PCN+u9MdFF
+7QAVuLhTFZL9Hv+5O78kTXRjDZV2CdHPawD2aok0LjW3CIh1HOopgj73bvrjn4DD
+coQW24PuJ1feipvcOrwWDI4KCeowxJbR0y/3i5AiI6e/jpUT9zxmsvSO6/odjOas
+8c1CKJIi1shkB2YhBZnvwBpbDQRnTHJ14ZmO3jAdY+WQ/To/TZKHf5mJ2sCxDvS5
+S5v9q/0oAiAMnfKD91Mkwa2/sI1JQLrZRAThqg8tSVuFzStMLsSydIjcb+TtYma4
+txDTqBwOvBFa4K0eUtlqAGmmEOf7Q94KLBkIOvmytDfqzXzOJoCH7f6BULszx0pX
+aBDHxrQ5ONFZURQ/9q0V/Ov4Fue3IehOBFBl1T9ChAg/kXtvtWztxBVuuMTKRUe2
+7adLgvL4k7QvnJUGUP6+
+=Ufsa
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/files/generate_libreoffice_package.sh b/app-office/libreoffice/files/generate_libreoffice_package.sh
index 760905ddae35..780b91ed6c56 100644
--- a/app-office/libreoffice/files/generate_libreoffice_package.sh
+++ b/app-office/libreoffice/files/generate_libreoffice_package.sh
@@ -10,9 +10,8 @@ die() {
 	exit 1
 }
 
-VERSION="3.5.2.2"
-
-BINRELEASE="-r1"
+VERSION="3.5.4.2-r1"
+BINVERSION="3.5.4.2-r1"
 
 # first the default subset of useflags
 IUSES_BASE="bash-completion binfilter branding cups dbus graphite gstreamer gtk nsplugin python vba webdav xmlsec -aqua -jemalloc -mysql -nlpsolver -odk -opengl -pdfimport -postgres -svg"
@@ -32,42 +31,42 @@ echo "Base"
 echo "app-office/libreoffice ${IUSES_BASE} ${IUSES_NJ} ${IUSES_NG} ${IUSES_NK}" > /etc/portage/package.use/libreo
 emerge -v =libreoffice-${VERSION} || die "emerge failed"
 quickpkg libreoffice --include-config=y
-mv /tmp/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-base-${VERSION}${BINRELEASE}.tbz2  || die "Moving package failed"
+mv /tmp/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-base-${BINVERSION}.tbz2  || die "Moving package failed"
 
 echo "Base - java"
 echo "app-office/libreoffice ${IUSES_BASE} ${IUSES_J} ${IUSES_NG} ${IUSES_NK}" > /etc/portage/package.use/libreo
 emerge -v =libreoffice-${VERSION} || die "emerge failed"
 quickpkg libreoffice --include-config=y
-mv /tmp/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-base-java-${VERSION}${BINRELEASE}.tbz2  || die "Moving package failed"
+mv /tmp/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-base-java-${BINVERSION}.tbz2  || die "Moving package failed"
 
 # kde flavor
 echo "KDE"
 echo "app-office/libreoffice ${IUSES_BASE} ${IUSES_NJ} ${IUSES_NG} ${IUSES_K}" > /etc/portage/package.use/libreo
 emerge -v =libreoffice-${VERSION} || die "emerge failed"
 quickpkg libreoffice --include-config=y
-mv /tmp/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-kde-${VERSION}${BINRELEASE}.tbz2  || die "Moving package failed"
+mv /tmp/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-kde-${BINVERSION}.tbz2  || die "Moving package failed"
 
 echo "KDE - java"
 echo "app-office/libreoffice ${IUSES_BASE} ${IUSES_J} ${IUSES_NG} ${IUSES_K}" > /etc/portage/package.use/libreo
 emerge -v =libreoffice-${VERSION} || die "emerge failed"
 quickpkg libreoffice --include-config=y
-mv /tmp/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-kde-java-${VERSION}${BINRELEASE}.tbz2  || die "Moving package failed"
+mv /tmp/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-kde-java-${BINVERSION}.tbz2  || die "Moving package failed"
 
 # gnome flavor
 echo "Gnome"
 echo "app-office/libreoffice ${IUSES_BASE} ${IUSES_NJ} ${IUSES_G} ${IUSES_NK}" > /etc/portage/package.use/libreo
 emerge -v =libreoffice-${VERSION} || die "emerge failed"
 quickpkg libreoffice --include-config=y
-mv /tmp/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-gnome-${VERSION}${BINRELEASE}.tbz2  || die "Moving package failed"
+mv /tmp/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-gnome-${BINVERSION}.tbz2  || die "Moving package failed"
 
 echo "Gnome -java"
 echo "app-office/libreoffice ${IUSES_BASE} ${IUSES_J} ${IUSES_G} ${IUSES_NK}" > /etc/portage/package.use/libreo
 emerge -v =libreoffice-${VERSION} || die "emerge failed"
 quickpkg libreoffice --include-config=y
-mv /tmp/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-gnome-java-${VERSION}${BINRELEASE}.tbz2  || die "Moving package failed"
+mv /tmp/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-gnome-java-${BINVERSION}.tbz2  || die "Moving package failed"
 
 
-for name in ./libreoffice-*-${VERSION}${BINRELEASE}.tbz2 ; do 
+for name in ./libreoffice-*-${BINVERSION}.tbz2 ; do 
 
   BN=`basename $name .tbz2`