Update package generation script

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

3 files changed, 65 insertions, 25 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 36d33db896ca..fed49c163ece 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.317 2012/05/23 08:45:10 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.318 2012/05/27 15:30:31 dilfridge Exp $
+
+  27 May 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  files/generate_libreoffice_package.sh:
+  Update package generation script
 
   23 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.5.9999.ebuild,
   libreoffice-9999-r2.ebuild:
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 2237d342f240..7b54f06988ca 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 2586 RMD160 5a5059446e8ec1172bce8f69d3419f963c7e7e97 SHA1 95f8beeaa7603a75ec361bd109a60f76dbfd0d99 SHA256 8b48315f2f830136b1950cf1bfe50ba15c051404cd61155b76e553240b29d18b
+AUX generate_libreoffice_package.sh 3601 RMD160 0ce44e076c1d146c4590b3dead79bab67441049e SHA1 a417cb8dddccd21e7da005b7701fbeec9b755f68 SHA256 9ef6dfc77a5707c592589270adf5105d8fc07a7f7b564fd73abb37e6e8d51f55
 AUX libreoffice-3.5-doublebuild.patch 887 RMD160 dd38de91af9b513e3b66bfa53a5d74635fdc16e2 SHA1 5cae5b8aedd7f18d526e61c465f944d46e06de4d SHA256 15dba3ca6be47bffe26e9eae73ed356a3e75fde97c5000b9a19b61906af8f5f8
 AUX libreoffice-3.5-propagate-gb_FULLDEPS.patch 922 RMD160 251ea777df53418e6acbb208e2a57ba374ad17a3 SHA1 09ede0550fcc518a3d30e4ebc06f842ef79b39c4 SHA256 73cbbec0744fc8cce99f5c9dd499935e9bf2db2e3d994045fab4c328116e3724
 AUX libreoffice-3.5.2-icu-49.patch 3762 RMD160 c729b31e645b8b7b58a7611e0b69e6e33901418c SHA1 7a3b36e8911e1db416b9d76f82a9795aab56c518 SHA256 04c2c9104361d8f308a86d115e5724fd9b18739ed480884990bfae77248d2096
@@ -33,22 +33,22 @@ EBUILD libreoffice-3.5.3.2.ebuild 15391 RMD160 ab20a10477855e6f862dbb81ec27c01a7
 EBUILD libreoffice-3.5.4.2.ebuild 15585 RMD160 22055c455c0a2da2f177d1fff0cad13f2a719905 SHA1 c26a1d0f78ea1f57a8f9c5c25c8e5832e2f5dbf2 SHA256 9ceaae1f93448b4eaa517251a9bf76bba0992069be9fb22eeb8ebbb883386ea9
 EBUILD libreoffice-3.5.9999.ebuild 15586 RMD160 a78bf12f84f4df571a84ab33fe9990a9a647814d SHA1 8a05f6987bd13b33dcc8addb91cbfa369e85144e SHA256 934a486bf305efd79929dbacac5515d34b55552847be5fca26de57231d4c191f
 EBUILD libreoffice-9999-r2.ebuild 17293 RMD160 01ff4e9e5001f517d8a40782aa28f5009ac4678c SHA1 5181780996cef5caa68f029dbf8979a874ba1f22 SHA256 9ad355d40096bb62838abfe221948fdecd73285dc9df05ce10b32745f7ee6c30
-MISC ChangeLog 58498 RMD160 81e7b89904695897bce2a5b4290fc8025af5b6d5 SHA1 6ac1f324dd2a6b4a26eb64350970edee9659b20f SHA256 03e7b4088db0298538aae5463109ce3fa66e9fb6e962105a6bb1202408883e39
+MISC ChangeLog 58632 RMD160 6f9465bdb8c91efb6ea16d08b011595604643b1b SHA1 e5ba3eac1f43f6c38ac747c8a7f176349198e262 SHA256 7ee04ebb9687c9f94903faddf11985bcf84bcb4b82f457b14c23af46f453229a
 MISC metadata.xml 1534 RMD160 24433486738eb58853e959332201611cf24fd5c6 SHA1 05d71c3efc820312fcf61f0fee4cb8d6e91a7c52 SHA256 2f095ea98ee3715366a47bfb72683434384d06526cb66a3db8b071fed537b401
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPvKOgAAoJEOSiRoyO7jvoklsP/3Eo/WcgLTz7gVqfksAGUPzu
-rGxdIsmRWG5zGzbZ20qc0P1139TlG6qSFaYFTOFSq0ZRmFT2kbg4jifpWHbigrKI
-jkq4Fj5IRcZ5N2q3qKWvvFdVUlehqgV2zTSVGUarwqZOgkMlvxo+ZKuvFz81i36f
-jQAr89VMDCve5OlDVtSZIG4MGYBF7br+dNC/wtxct3cRirGqUqpMghLQHWD3zDbS
-TrxyyFYSkXE0CFFwaIRM4KOMsksyFkuV00AFXgpOGsK/Gz5suIlOy3TPOksiEatj
-KHX3I6bOpHz1gKMY0YeVDn5ye534ZxkhXOIhe+zPAHp1he7lvRKeDdkcsW0MLv9e
-/BvdEYUr8jVDdEeW5rlrTKjUs3eVYA9ph1Cq4BcjPbit79xZ3iD8asWDlHbsd9QU
-hLpQeaWcHcxap21/beLcB1KlaqN8Rm7/caVFQChpH7FgcQk66QQ1lgGcYqmJVoKl
-P66QatVNeZ+uxR6hMiasFiUk/5R+1u8U1UCX19xyxDVIMWCMJ5lbUpWQIfaOU7tE
-ta8X840yNaH7Zdy0/iYB8bXCAmIL2xkX0/TUaFEhfFc+StYyKuNxqDsFpeqe8jP/
-3VUl8Crpk+bGn4f9naR8ioTK8nMkckoLRVGTNZ36BSBp08Ck7Nz6C9MPpSs58tvx
-PMUJb4iawIB6Gl8pTtVY
-=Qlvj
+iQIcBAEBCgAGBQJPwkjcAAoJENwGBM22xffemrgP/1bG3JpXYzTzRb52pbeLa8U0
+2NxwqOeqILiJ05F3uSUb4ihCP2HjjsfealbmR7nlqG7vbI040SwAzExiKhTm22+Q
+seaAivY05/iexyR9NPiI56ZcNIt35kTheGUar+5SmlIaKvu8hTFxiK8R1z/pfGby
+q7vN9ZKMvwBdeYuI64YkXTeiC6+6xLCkJR62tAYAZPi+3T0MbLd9UsOOz51u68q/
+YcPCVXvwHwljVICCMDORUHThii2NBLYdoQBFJzNNWjOKQ2olTiR9VBa6d/jKkNUS
+qjuypiZJ8RdtpN+YdQcbQZfC2cSH5X1IzY5mdNBTR4ov8H1pYxlPHhJj0lnFgUfx
+5TdZXKc9CgoG5jD+2wurvAa4QH85oduhe1tV5HddXb3w9SDrXBD9hQrFAUrYu+7F
+MnHOt4tMOLXlmEdVrv9psEbEmpQivfDl7mILWoZpIA/DLv2TNS0/kjbgWhSu4i0C
+23ZbNheiQBS6eKzXXNjsJGyRCoQBGzqOWh9LApzCISxorVAsekBFzuyGi9I+eb46
+zBqNDNW7XqMoc4yl8OBaLjzblu9lWdv3ejq6viCEyVKbtRrv0rPORnq8Cb7+NBeQ
+ckQkGX0AZXO15L09c40/1vrwImlnrXz46ANjNILr3rzsU/SGZqFgvwGdD4/RMnzo
+viqaJUPrrl6PuFXu7jOF
+=LSUR
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/files/generate_libreoffice_package.sh b/app-office/libreoffice/files/generate_libreoffice_package.sh
index 97aa1d0c2d59..760905ddae35 100644
--- a/app-office/libreoffice/files/generate_libreoffice_package.sh
+++ b/app-office/libreoffice/files/generate_libreoffice_package.sh
@@ -1,14 +1,21 @@
 #!/bin/bash
 
+# important: you need to use the most general CFLAGS to build the packages
+# recommendation: 
+#  * for x86  : CFLAGS="-march=i586 -mtune=generic -O2 -pipe -g"
+#  * for amd64: CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -g"
+
 die() {
 	echo "${1}"
 	exit 1
 }
 
-VERSION="3.4.5.2"
+VERSION="3.5.2.2"
+
+BINRELEASE="-r1"
 
 # first the default subset of useflags
-IUSES_BASE="bash-completion binfilter branding dbus graphite gstreamer gtk python templates webdav odk"
+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"
 
 # now for the options
 IUSES_J="java"
@@ -25,38 +32,67 @@ 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
-cp /usr/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-base-${VERSION}.tbz2  || die "Copying package failed"
+mv /tmp/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-base-${VERSION}${BINRELEASE}.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
-cp /usr/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-base-java-${VERSION}.tbz2  || die "Copying package failed"
+mv /tmp/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-base-java-${VERSION}${BINRELEASE}.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
-cp /usr/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-kde-${VERSION}.tbz2  || die "Copying package failed"
+mv /tmp/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-kde-${VERSION}${BINRELEASE}.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
-cp /usr/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-kde-java-${VERSION}.tbz2  || die "Copying package failed"
+mv /tmp/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-kde-java-${VERSION}${BINRELEASE}.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
-cp /usr/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-gnome-${VERSION}.tbz2  || die "Copying package failed"
+mv /tmp/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-gnome-${VERSION}${BINRELEASE}.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
-cp /usr/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-gnome-java-${VERSION}.tbz2  || die "Copying package failed"
+mv /tmp/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-gnome-java-${VERSION}${BINRELEASE}.tbz2  || die "Moving package failed"
+
+
+for name in ./libreoffice-*-${VERSION}${BINRELEASE}.tbz2 ; do 
+
+  BN=`basename $name .tbz2`
+
+  rm -rf tmp.lo
+  mkdir -vp tmp.lo/p1 tmp.lo/p2
+  cd tmp.lo/p1
+
+  echo "Unpacking complete archive $BN.tbz2"
+  tar xfvjp ../../$BN.tbz2
+
+  echo "Moving debug info"
+  mkdir -vp ../p2/usr/lib
+  mv -v usr/lib/debug ../p2/usr/lib/
+
+  echo "Re-packing program"
+  tar cfvJ ../../bin-$BN.tar.xz --owner root --group root ./*
+
+  echo "Re-packing debug info"
+  cd ../p2
+  tar cfvJ ../../debug-$BN.tar.xz --owner root --group root ./*
+
+  echo "Removing unpacked files"
+  cd ../..
+  rm -rf tmp.lo
 
+  echo "Done with $BN.tbz2"
 
+done