new version of the script

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64

3 files changed, 66 insertions, 49 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 3628f5f022d9..8103c4c982f9 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.398 2012/11/18 11:39:51 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.399 2012/11/18 12:02:01 ago Exp $
+
+  18 Nov 2012; Agostino Sarubbo <ago@gentoo.org>
+  files/generate_libreoffice_package.sh:
+  new version of the script
 
   18 Nov 2012; Andreas K. Huettel <dilfridge@gentoo.org>
   libreoffice-9999-r2.ebuild:
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 3a73c9fba34c..e565cdb0de90 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -1,7 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX generate_libreoffice_package.sh 3704 SHA256 e5802482452dbdd1fabaf4ec668f913742a2bfd3f5ea0e501bb15f64a38c23b7 SHA512 1f9ed1468a5ea8c871d38b93496716cc59036a95ed53cb55325ae038d57ca27e5fd6664f5302ca05052478452bf4740c39403ea3eefddbf63520625a1b27dcb8 WHIRLPOOL 2ac55b0a8fb6757090299f5f2eb6f04a1a882a056778625cdc347cbd38d08dc3cba7d6f15334766caa657444719c0586dae3c4cb5a53f8644400ebcd3265c7fe
+AUX generate_libreoffice_package.sh 4529 SHA256 9be3ad6c288eabc2855c9283f762ac2383058473e91d3b10306f734d7f3d1cf0 SHA512 37dca2ed2dc62f09051769fcd0960c1a594ba6b25cacf18cf686a73c493e4d95fc8feb89ff6c148c16ba18858eb289d673289c9cfb2a795ee19a44c4cbb954ca WHIRLPOOL 20feff11998bd3acc5abf4991d68f1964eddc7df99bc53779666aface2f2ea0a33e28b200c067edd06f2b99c850e65904ed76c64bc8e5c3e40f0a44882b0e918
 AUX libreoffice-3.5-doublebuild.patch 887 SHA256 15dba3ca6be47bffe26e9eae73ed356a3e75fde97c5000b9a19b61906af8f5f8 SHA512 42d460f2b5ba578bfe9bdf0b6ec0a096778fdcf445a449524e6b65b8accbe4a0340b8c818a6aafdb1d92ac58a1e9513488c26ff67f370ea356d7c1cc0baa524b WHIRLPOOL 9be5eb7b2490f2d4820d961ace029c98ee13fe9482d4967efdb20f63659e4dceb9aba4df7aec8d688a3dac41ca22326970c34add5232a62676d4ec7b5e07f820
 AUX libreoffice-3.5-hebrew-icu49.patch 5661 SHA256 169ec723b1453b932deefafada3e4dcbc038a336c427657021e1de8afadd8ab9 SHA512 6b6c93092bc34acc4030ebed056ad189d1eefc2081521b1c995ff81b5ac52760e7f631e90a94c7165bd745c7685b43c0e7b105deb37b40b6fd7e767e64e7ee1a WHIRLPOOL 5c2c09462eb770a2240469f972be4b99329674f2a056d56d3fb1cd539da9551a4d4f85040d936e77fe3bdbdfe7e991c47e9a2a83c5906ca7848685498a1f2dc4
 AUX libreoffice-3.5-propagate-gb_FULLDEPS.patch 922 SHA256 73cbbec0744fc8cce99f5c9dd499935e9bf2db2e3d994045fab4c328116e3724 SHA512 3fdeaaffc82e2b43ba162b45866c0bb795b23b6be671f4bdc71459d9ab169fd62487d9339c7d6e8dc4721d567027c049b861ddf56cb097594641b0bf357c7c42 WHIRLPOOL c55ff6ff62b63ccfc4fec7f21ac01bafa21d2228897cda2d3033738a31fd99159a717d463228ba3843f9a45edba87a5a07be9d3d83a0b00f3a763598affe56bd
@@ -33,22 +30,5 @@ EBUILD libreoffice-3.5.7.2.ebuild 15682 SHA256 d86d6b532a7d1c8b66a7671e4db14d0f5
 EBUILD libreoffice-3.6.3.2.ebuild 17754 SHA256 0a6ecdb8779513ed684a64108e453bcd0761b866679a20cebe969f760bbbbae6 SHA512 53278295af40537c702e5247346bbc636b25f350fbcccb397c649d3d350e4064fe1b968e92bdf9b198b33ea6b16ee9c9f1494bd3131a8a0468923c62fa9660cb WHIRLPOOL 849d9d0ecbbed3e55a39526420cf0ee36f741d18da9ffdbce840357da644dbde14577726649fba191f2359bc87f178a89190686fbccc0002414cd998729f7c6c
 EBUILD libreoffice-3.6.9999.ebuild 17637 SHA256 ada8cb139c23102ae404d6f76223cf288a306979df14a5d292233a344f76b3be SHA512 16a3527d5d55aad805c6eb46a48b4c76e056f0d998f424911235cde9f95b3c8a3c03383730a8e4d689c2e60ede61f57ec9af1c3215861dd1afac6596d8686b5f WHIRLPOOL 291b3e2914b3b14703ccf2edf1f7d4d3cf04275297f2c2d801d49a739da14d4c18c455f58a6d3daaae947647163da7bbc77fb8aa96e5f3d56a1a8708c79310b7
 EBUILD libreoffice-9999-r2.ebuild 17659 SHA256 e66fdcc973bd3f03fdbff9bca12cede0576eb489c0eaba497521ee727268a629 SHA512 00abf19ce265ca6253c6fc005088e642ef7be099da23235ed7e81553cf91f15d26576f0c6d0e8119b710b17521196f5281058512b948965bb197051401688baf WHIRLPOOL 4ab49d44b84a49a8e3c808d203d088136dcb8a9be610a87b9e023a166016d89afc953bd8243ae1c45105f321a707b7444226b79a9d5ae127e7a70cebe9b082cd
-MISC ChangeLog 72499 SHA256 c764fe9ac2c31af12ac1ed73759f762da73381987a570b3bf82cb9680caa78b8 SHA512 3c1a3e53a19c40abddbd03c7321ccd82434cc60fcc781a05f0f594bbc35b1a7ac2681ab1b8b79e1cc146f6fd1e387ab7e4a9f88813dc031dc9f7eca1cf930c04 WHIRLPOOL 136e1e1720fd52699f89bbfd1295775b9d14b80152c1b818ed290d14360e586b6a981ed7cd00d427fc1ca6c6bee35fedb3a55fd2ab8849d8743a8bf42ea5d296
+MISC ChangeLog 72612 SHA256 3f8b110f804d9131130c8d973b21022cc193064085323d1195e32e2137176c09 SHA512 28a3cf2e56c89cc036105ba4a5bc9274df9e20c93c745c96714470050c11489a2b0e4be18eeb7fd0b9b2717bf3089d36f3a23a48036b7fb1e54f2b478fad1e94 WHIRLPOOL 83199b86875c0d39bb8a6d18e4f99413215be768007e2576194ce499cadf785c3e0a0618b58f4c1075f0dfc83857ca91467fb98aabdfafd84a9eca63f3ee3863
 MISC metadata.xml 1645 SHA256 24887289646f2058654a7701555baf8afabcffa2223f5bece682d537a43fdcda SHA512 dbf85074a9bc3b984a6f8188dee88a19123d0b6fed5131a70592f31769c317b8eb5ea1095fb72a406dad9fe5214ac51e33203c162a6891a63b9cbedb0d1affc0 WHIRLPOOL 7cbfb1f8644f8cf36efc4ddd8bdb0f757483c7fce7da0e2d61922d0a5e9ab4dd968c5120064ec3307fd547544cdb9501a4bedabf905f7a7d201f972534b41172
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJQqMoCAAoJENwGBM22xffeBQUP/0deWHESiwFTv8EVSIbUDUSn
-d0Z2xiIF2HRqIdU1w2LgUwdpzYTfsOPnlsKz8eaSGgKjrrGZR1xxZacWYfhshO9D
-Ro5ptdyM4PxX1oXBQeOVu6CTg2CqlTkoUIBnp++Tmzu74DxVg5t5Dybn5kp0Awfd
-WhGkf3HnKn7f2K1jMgJAVZFz1Oa3GQS5kRBB1BTRWvY6YsyPLcESJYJbAoBZ0+ye
-L0j6nvlr77xICkfzTCG6LAB+JSCPWrw9zu0Ktq1/UYCBAXF7ClAtK4PZYSjAKn3n
-YOPl8rFpF1EflasGiGKhE5ZRZEq4hBQwxzDXWLFxmYA3wR8VJqGAe7p+jb9m+20h
-YS++X8181BkK9shgCjMCIHsgiebMu3fyk3UzboNgBO0DMUtJzhmgEgjf1L48iQ0z
-1JgQVGyM5DSZh0xIEwftNgCq7Y6CEtRXD7Ut2hd4eBlG4clLVADhQ8PdzD88COH4
-RzXDv8VM/dGVKYtmZ0nOJptFpFaNly/WD3trvFbw7GmmSwpl8pR7ty3TrpGMULLc
-UAGY6tqQunMI5z1pvB2EhlJcI7/KX+wqRI6HiSHYLTHUmES0AN2z8vmyVKoohtkx
-mUDSqms42H3o5L+hqkbkLhrWa419WzhidwONxtOrkBNV+jWUF6FNSpNVM00HzSsz
-Uxdtbz6tiSqsI9GAWXDI
-=c5uL
------END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/files/generate_libreoffice_package.sh b/app-office/libreoffice/files/generate_libreoffice_package.sh
index 82d8175f65c3..3d6b5c135a16 100644
--- a/app-office/libreoffice/files/generate_libreoffice_package.sh
+++ b/app-office/libreoffice/files/generate_libreoffice_package.sh
@@ -1,20 +1,50 @@
 #!/bin/bash
 
-# important: you need to use the most general CFLAGS to build the packages
-# recommendation:
+# important: you need to use the most general CFLAGS to build the packages:
 #  * for x86  : CFLAGS="-march=i586 -mtune=generic -O2 -pipe -g"
 #  * for amd64: CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -g"
 
+# What you can set:
+VERSION="3.6.3.2"
+BINVERSION="3.6.3.2"
+OPTS="-q"
+USEFILE="/etc/portage/package.use/libreo"
+MYPKGDIR="$( portageq pkgdir )"
+################################################
+
 die() {
-	echo "${1}"
-	exit 1
+        echo "${1}"
+        exit 1
 }
 
-VERSION="3.5.5.3"
-BINVERSION="3.5.5.3"
+if [ "$( uname -m )" = "x86_64" ] ; then
+	MYFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -g"
+	ARCH="amd64"
+elif [ "$( uname -m )" = "i686" ] ; then
+	MYFLAGS="-march=i586 -mtune=generic -O2 -pipe -g"
+	ARCH="x86"
+else
+	die "Arch not supported"
+fi
+
+for i in \
+	"/bin/echo" \
+	"/bin/mkdir" \
+	"/bin/mv" \
+	"/bin/rm" \
+	"/bin/sed" \
+	"/bin/tar" \
+	"/usr/bin/emerge" \
+	"/usr/bin/portageq" \
+	"/usr/bin/quickpkg"
+do
+	if [ ! -e "${i}" ] ; then
+		die "Missing something in your system"
+	fi
+done
 
 # 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"
+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,52 +55,51 @@ IUSES_K="kde"
 IUSES_NK="-kde"
 
 if [ -f /etc/portage/package.use ] ; then
-	echo "Please save your package.use and make it as a directory"
-	exit 1
+	die "Please save your package.use and make it as a directory"
 fi
 
 mkdir -p /etc/portage/package.use/
 
-OPTS="-v"
-
-MYPKGDIR="$( emerge --info | grep PKGDIR | sed "s:PKGDIR=::;s:\"::g" )"
+if [ -z "${MYPKGDIR}" -o ! -d "${MYPKGDIR}" ] ; then
+	die "Anything goes wrong"
+fi
 
 # compile the flavor
 echo "Base"
-echo "app-office/libreoffice ${IUSES_BASE} ${IUSES_NJ} ${IUSES_NG} ${IUSES_NK}" > /etc/portage/package.use/libreo
-emerge ${OPTS} =libreoffice-${VERSION} || die "emerge failed"
+echo "app-office/libreoffice ${IUSES_BASE} ${IUSES_NJ} ${IUSES_NG} ${IUSES_NK}" > ${USEFILE}
+CFLAGS="${MYFLAGS}" CXXFLAGS="${MYFLAGS}" emerge ${OPTS} =libreoffice-${VERSION} || die "emerge failed"
 quickpkg libreoffice --include-config=y
 mv ${MYPKGDIR}/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 ${OPTS} =libreoffice-${VERSION} || die "emerge failed"
+echo "app-office/libreoffice ${IUSES_BASE} ${IUSES_J} ${IUSES_NG} ${IUSES_NK}" > ${USEFILE}
+CFLAGS="${MYFLAGS}" CXXFLAGS="${MYFLAGS}" emerge ${OPTS} =libreoffice-${VERSION} || die "emerge failed"
 quickpkg libreoffice --include-config=y
 mv ${MYPKGDIR}/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 ${OPTS} =libreoffice-${VERSION} || die "emerge failed"
+echo "app-office/libreoffice ${IUSES_BASE} ${IUSES_NJ} ${IUSES_NG} ${IUSES_K}" > ${USEFILE}
+CFLAGS="${MYFLAGS}" CXXFLAGS="${MYFLAGS}" emerge ${OPTS} =libreoffice-${VERSION} || die "emerge failed"
 quickpkg libreoffice --include-config=y
 mv ${MYPKGDIR}/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 ${OPTS} =libreoffice-${VERSION} || die "emerge failed"
+echo "app-office/libreoffice ${IUSES_BASE} ${IUSES_J} ${IUSES_NG} ${IUSES_K}" > ${USEFILE}
+CFLAGS="${MYFLAGS}" CXXFLAGS="${MYFLAGS}" emerge ${OPTS} =libreoffice-${VERSION} || die "emerge failed"
 quickpkg libreoffice --include-config=y
 mv ${MYPKGDIR}/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 ${OPTS} =libreoffice-${VERSION} || die "emerge failed"
+echo "app-office/libreoffice ${IUSES_BASE} ${IUSES_NJ} ${IUSES_G} ${IUSES_NK}" > ${USEFILE}
+CFLAGS="${MYFLAGS}" CXXFLAGS="${MYFLAGS}" emerge ${OPTS} =libreoffice-${VERSION} || die "emerge failed"
 quickpkg libreoffice --include-config=y
 mv ${MYPKGDIR}/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 ${OPTS} =libreoffice-${VERSION} || die "emerge failed"
+echo "app-office/libreoffice ${IUSES_BASE} ${IUSES_J} ${IUSES_G} ${IUSES_NK}" > ${USEFILE}
+CFLAGS="${MYFLAGS}" CXXFLAGS="${MYFLAGS}" emerge ${OPTS} =libreoffice-${VERSION} || die "emerge failed"
 quickpkg libreoffice --include-config=y
 mv ${MYPKGDIR}/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-gnome-java-${BINVERSION}.tbz2  || die "Moving package failed"
 
@@ -91,11 +120,11 @@ for name in ./libreoffice-*-${BINVERSION}.tbz2 ; do
   mv -v usr/lib/debug ../p2/usr/lib/
 
   echo "Re-packing program"
-  tar cfvJ ../../bin-$BN.tar.xz --owner root --group root ./*
+  tar cfvJ ../../$ARCH-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 ./*
+  tar cfvJ ../../$ARCH-debug-$BN.tar.xz --owner root --group root ./*
 
   echo "Removing unpacked files"
   cd ../..
@@ -104,3 +133,7 @@ for name in ./libreoffice-*-${BINVERSION}.tbz2 ; do
   echo "Done with $BN.tbz2"
 
 done
+
+rm -fr ${USEFILE}
+
+rm -fr libreoffice*${VERSION}*.tbz2