Make the generator script more usable

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

3 files changed, 30 insertions, 37 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 4ad40461eecc..50a6df29406c 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.391 2012/11/14 10:13:06 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.392 2012/11/14 22:32:55 ago Exp $
+
+  14 Nov 2012; Agostino Sarubbo <ago@gentoo.org>
+  files/generate_libreoffice_package.sh:
+  Make the generator script more usable
 
   14 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild:
   Also symlink the nsplugin. Drop no longer needed disable.
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 142b6db49041..70a7ccf50f26 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 3534 SHA256 1bc8941ecde7198794ab3f9255194fd4238a97ad58e216aae527c113ab20331f SHA512 8a70f737eb1d7ace83cc61c36eef3bb80ea134407c19b77f8e746b20eede2eb5ada9b2c481dc05998db451ce73334970ab43e0633b5f654f9f6f61cd8b527b39 WHIRLPOOL 4b0223d483142e08f3e1418e9599f5b136c43c75c6e7a78d34afd998245302db11260495da142b7aadcd8a97b7808a80a0ae4b28801259c15f54eb98aab5871a
+AUX generate_libreoffice_package.sh 3704 SHA256 e5802482452dbdd1fabaf4ec668f913742a2bfd3f5ea0e501bb15f64a38c23b7 SHA512 1f9ed1468a5ea8c871d38b93496716cc59036a95ed53cb55325ae038d57ca27e5fd6664f5302ca05052478452bf4740c39403ea3eefddbf63520625a1b27dcb8 WHIRLPOOL 2ac55b0a8fb6757090299f5f2eb6f04a1a882a056778625cdc347cbd38d08dc3cba7d6f15334766caa657444719c0586dae3c4cb5a53f8644400ebcd3265c7fe
 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
@@ -32,22 +29,5 @@ EBUILD libreoffice-3.5.7.2.ebuild 15682 SHA256 d86d6b532a7d1c8b66a7671e4db14d0f5
 EBUILD libreoffice-3.6.3.2.ebuild 17678 SHA256 00b9e967bae3c512c0d436b37e423627ee5137e28da668c233a12bf99ea7ae28 SHA512 e6e1fabc6d0639627d8532b5205b61504877c827a3472595a6a0388282dabfbfee4f74a8481bde645a4657a2f0c8415696bd1b70f51ec36443328be46a0ac374 WHIRLPOOL 12a5467f370fab4a0a9ea462ce80a55a779213f8f96d53da8c7872de74cf91312cb7a54576802fa6469d78818bdc47bd59ff99ac64b053015e8dbce25a2d361a
 EBUILD libreoffice-3.6.9999.ebuild 17642 SHA256 02aed6667a628878644813c688c98af82e01c82f50d7dcbb190ea59a73dfa630 SHA512 717b94404251f3fbf300c4acf875acbf9bc00aaac316efa81f7214eca3c1e5e5e5b56d0a700751fda1ab2f2d701a7542b47f0aced969ce872f32e559699c3a54 WHIRLPOOL 16abc6398d0d1871394c6286f954a5a013dec5d08eae9f19774c11e90184392fc2188cb3029b20ed0cb40af2121bc9357f3024101d25624b6b7531e7f6732f0c
 EBUILD libreoffice-9999-r2.ebuild 17648 SHA256 b7bac017595bfa60dce123b2a224ffcee7b10e04ac4629516433600aaaa7b8d4 SHA512 a3f9a3b7ec28f322be2ab90d92780b0cd498accc39a7bd28b2359459f96b6475af5ed0dd5b202164d319d9c9c5fc572e27b98d94acd24fbcc38154dab07414e2 WHIRLPOOL eb4ac09426dfe2bf70d8f739e510278ec256e13ba872c7dc8971881948f02d76a3906c65f89cc18546c9b08296a0673bec0f6a6fd15e6bd781709b5394b5022d
-MISC ChangeLog 71666 SHA256 e39243cc2990e3f668295855cd80fb5f916d6033c9d9499cc806d82272ae4610 SHA512 d70d802b63241d89442b8e04c4ee376c54485748779c79427e6618d5066b8b109435832cee49ff9800ba7006234a7f6a56a8a2d44a8e72395165b961554e13c7 WHIRLPOOL e9d042d857a0238228d8dfaa3012176d7493c5ed113dabe20d6f70d0a989e313e57ea00a8fdf690805cb13aa8f340074611144086653712c85e9b4fc98bcfce9
+MISC ChangeLog 71791 SHA256 baf653146d13f512b775b941bd73a4876e2edad4297fb0eba2e08bdb90ec9f98 SHA512 6b0a997f9789f4a5676dc24b66df5918066c24306e6a955a33211a210feddeafb52651540cda7268e2f4bbfbc8ce33e0e74d1b59ae1b2df1d6582e269b7e0dbe WHIRLPOOL 2dfd34ba306f9062423aeb4879a1a6a7c3cd3cec7e8fb5ffade3da59654d87bcd0d80a7dcb3c7ddd3ae2a01a866e77060bdd81e26903e16e328f1472770bbdb1
 MISC metadata.xml 1645 SHA256 24887289646f2058654a7701555baf8afabcffa2223f5bece682d537a43fdcda SHA512 dbf85074a9bc3b984a6f8188dee88a19123d0b6fed5131a70592f31769c317b8eb5ea1095fb72a406dad9fe5214ac51e33203c162a6891a63b9cbedb0d1affc0 WHIRLPOOL 7cbfb1f8644f8cf36efc4ddd8bdb0f757483c7fce7da0e2d61922d0a5e9ab4dd968c5120064ec3307fd547544cdb9501a4bedabf905f7a7d201f972534b41172
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJQo26JAAoJEOSiRoyO7jvoD9oQAKwjlDGSBiFcssQrQ8rUfupQ
-bmTB6MlMfd26mcaVpuRC2CL1JKsgPz1McfmQ2A1QMdRit8u/jmPpOJGRoPEpQjc9
-MHRejuJRoEPTJQxM+TrMq9KgNwIyuewSxBiZZz6vQvcJBAT+jehP/sgHM7HbFIMd
-Y06guuBn1jyEjdAVt7R7ptfo9fHecDxSWg36rpCw59MYbxv5UVpaGuHhXU+JVA4r
-AWsG+9/e83VnE6CBnZhTG7eNG7cC8eWzCOmWHtSPDhZ12LJgqSUlvERMhN9tLg2e
-yz1DZyWZHT0t6jIYJyRdy5VJnGsnqgXpoV8EX34B5Eo77WJlgr9HKikGJp/I6I79
-5YVAtGVjstOvdOf0nEWkdyO86MWAb3IT3qiFy6864R37PpUTE/XUKdXdP6FSdxQn
-HVHuuDPPTCm4+fzXEEpBFWRl6pGT6N7ogLFAPqqejsKFj/pE8HJYTrmZVteNR2Le
-Ayb+uuX4E/b9yZWie4+PomXoIalyN0PYACJYfkqVH3A61HUKs+5z/0iw6EZOLotd
-+PUNdIM/FizBuko5D2VtEU65vHBvOEtQQt31byN3CwBkGtuT0zfst+9rS1MpBxWj
-+dgMOThj9y5xENomkFssvH32sIJr8d1dEK3rETrS8/nDkJ48t3o+/NClT57pxRef
-tDidcmuEO9WUeOlWpi/n
-=ewk8
------END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/files/generate_libreoffice_package.sh b/app-office/libreoffice/files/generate_libreoffice_package.sh
index 21f64781e543..82d8175f65c3 100644
--- a/app-office/libreoffice/files/generate_libreoffice_package.sh
+++ b/app-office/libreoffice/files/generate_libreoffice_package.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # important: you need to use the most general CFLAGS to build the packages
-# recommendation: 
+# recommendation:
 #  * for x86  : CFLAGS="-march=i586 -mtune=generic -O2 -pipe -g"
 #  * for amd64: CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -g"
 
@@ -24,49 +24,58 @@ IUSES_NG="-gnome -eds"
 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
+fi
+
 mkdir -p /etc/portage/package.use/
 
+OPTS="-v"
+
+MYPKGDIR="$( emerge --info | grep PKGDIR | sed "s:PKGDIR=::;s:\"::g" )"
+
 # compile the flavor
 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"
+emerge ${OPTS} =libreoffice-${VERSION} || die "emerge failed"
 quickpkg libreoffice --include-config=y
-mv /tmp/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-base-${BINVERSION}.tbz2  || die "Moving package failed"
+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 -v =libreoffice-${VERSION} || die "emerge failed"
+emerge ${OPTS} =libreoffice-${VERSION} || die "emerge failed"
 quickpkg libreoffice --include-config=y
-mv /tmp/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-base-java-${BINVERSION}.tbz2  || die "Moving package failed"
+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 -v =libreoffice-${VERSION} || die "emerge failed"
+emerge ${OPTS} =libreoffice-${VERSION} || die "emerge failed"
 quickpkg libreoffice --include-config=y
-mv /tmp/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-kde-${BINVERSION}.tbz2  || die "Moving package failed"
+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 -v =libreoffice-${VERSION} || die "emerge failed"
+emerge ${OPTS} =libreoffice-${VERSION} || die "emerge failed"
 quickpkg libreoffice --include-config=y
-mv /tmp/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-kde-java-${BINVERSION}.tbz2  || die "Moving package failed"
+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 -v =libreoffice-${VERSION} || die "emerge failed"
+emerge ${OPTS} =libreoffice-${VERSION} || die "emerge failed"
 quickpkg libreoffice --include-config=y
-mv /tmp/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-gnome-${BINVERSION}.tbz2  || die "Moving package failed"
+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 -v =libreoffice-${VERSION} || die "emerge failed"
+emerge ${OPTS} =libreoffice-${VERSION} || die "emerge failed"
 quickpkg libreoffice --include-config=y
-mv /tmp/portage/packages/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-gnome-java-${BINVERSION}.tbz2  || die "Moving package failed"
+mv ${MYPKGDIR}/app-office/libreoffice-${VERSION}.tbz2 ./libreoffice-gnome-java-${BINVERSION}.tbz2  || die "Moving package failed"
 
 
-for name in ./libreoffice-*-${BINVERSION}.tbz2 ; do 
+for name in ./libreoffice-*-${BINVERSION}.tbz2 ; do
 
   BN=`basename $name .tbz2`