[gentoo-commits] gentoo-x86 commit in app-office/libreoffice/files: generate_libreoffice_package.sh

["Andreas HAttel (dilfridge)" <dilfridge@gentoo.org>]

dilfridge    12/12/10 08:08:30

  Modified:             generate_libreoffice_package.sh
  Log:
  Minor updates
  
  (Portage version: 2.2.0_alpha145/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key B6C5F7DE)

Revision  Changes    Path
1.10                 app-office/libreoffice/files/generate_libreoffice_package.sh

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/generate_libreoffice_package.sh?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/generate_libreoffice_package.sh?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/generate_libreoffice_package.sh?r1=1.9&r2=1.10

Index: generate_libreoffice_package.sh
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/files/generate_libreoffice_package.sh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- generate_libreoffice_package.sh	30 Nov 2012 21:33:44 -0000	1.9
+++ generate_libreoffice_package.sh	10 Dec 2012 08:08:30 -0000	1.10
@@ -5,8 +5,8 @@
 #  * 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"
+VERSION="3.6.4.3"
+BINVERSION="3.6.4.3"
 OPTS="-v"
 USEFILE="/etc/portage/package.use/libreo"
 MYPKGDIR="$( portageq pkgdir )"
@@ -24,7 +24,7 @@
 	MYFLAGS="-march=i586 -mtune=generic -O2 -pipe -g"
 	ARCH="x86"
 else
-	die "Arch not supported"
+	die "Arch $( uname -m ) not supported"
 fi
 
 for i in \
@@ -39,12 +39,12 @@
 	"/usr/bin/quickpkg"
 do
 	if [ ! -e "${i}" ] ; then
-		die "Missing something in your system"
+		die "Missing some basic utility in your system"
 	fi
 done
 
 # first the default subset of useflags
-IUSES_BASE="bash-completion branding cups dbus gstreamer gtk opengl svg vba webdav -aqua -binfilter -jemalloc -mysql -odk -postgres"
+IUSES_BASE="bash-completion branding cups dbus gstreamer gtk opengl vba webdav -aqua -binfilter -jemalloc -mysql -odk -postgres"
 
 ENABLE_EXTENSIONS="presenter-console presenter-minimizer"
 DISABLE_EXTENSIONS="nlpsolver pdfimport scripting-beanshell scripting-javascript wiki-publisher"
@@ -66,11 +66,12 @@
 IUSES_NK="-kde"
 
 if [ -f /etc/portage/package.use ] ; then
-	die "Please save your package.use and make it as a directory"
+	die "Please save your package.use and re-create it as a directory"
 fi
 
-mkdir -p /etc/portage/package.use/
+mkdir -p /etc/portage/package.use/ || die
 
+mkdir -p "${MYPKGDIR}"
 if [ -z "${MYPKGDIR}" -o ! -d "${MYPKGDIR}" ] ; then
 	die "Anything goes wrong"
 fi
@@ -145,6 +146,6 @@
 
 done
 
-rm -fr ${USEFILE}
+rm -f ${USEFILE} || die "Removing ${USEFILE} failed"
 
-rm -fr libreoffice*${VERSION}*.tbz2
+rm -f libreoffice*${VERSION}*.tbz2 || die "Removing un-split package files failed"