Update package generation script

(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)

2 files changed, 49 insertions, 9 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/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