[gentoo-commits] gentoo-x86 commit in app-office/openoffice/files: ooo-build-3.0.1.2-prefix.patch

[gentoo-commits] gentoo-x86 commit in app-office/openoffice/files: ooo-build-3.0.1.2-prefix.patch

[Andreas Proschofsky (suka)]

suka        11/02/05 10:40:31

  Added:                ooo-build-3.0.1.2-prefix.patch
  Log:
  EAPI3 and prefix fixes, bug #353035, also clean up pax-stuff, bug #353587
  
  (Portage version: 2.1.9.35/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  app-office/openoffice/files/ooo-build-3.0.1.2-prefix.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice/files/ooo-build-3.0.1.2-prefix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice/files/ooo-build-3.0.1.2-prefix.patch?rev=1.1&content-type=text/plain

Index: ooo-build-3.0.1.2-prefix.patch
===================================================================
--- ooo-build-3.0.1.2/bin/package-ooo.orig	2008-10-07 08:50:49.000000000 -0500
+++ ooo-build-3.0.1.2/bin/package-ooo	2008-11-11 14:47:21.000000000 -0600
@@ -115,8 +115,8 @@
 fi
 
 # create bash completion
-mkdir -p $OODESTDIR/etc/bash_completion.d
-$TOOLSDIR/bin/generate-bash-completion --binsuffix="$BINSUFFIX" $TOOLSDIR/bin/bash-completion.in $OODESTDIR/etc/bash_completion.d/ooffice${BINSUFFIX}.sh
+mkdir -p $SYSCONFDIR/bash_completion.d
+$TOOLSDIR/bin/generate-bash-completion --binsuffix="$BINSUFFIX" $TOOLSDIR/bin/bash-completion.in $SYSCONFDIR/bash_completion.d/ooffice${BINSUFFIX}.sh
 
 if test "z$VENDORNAME" != "zRedHat"; then
 	mkdir -p $MANDIR/man1
@@ -176,11 +176,11 @@
         # Icons and menu stuff is handled in actions.py
         ;;
   *)
-	mkdir -p $OODESTDIR/usr/share/applications
+	mkdir -p $DATADIR/applications
 	cd $TOOLSDIR/desktop
 	for source in *.desktop ; do
 	    dest=`echo $source | sed "s|.desktop\$||"`
-	    dest="$OODESTDIR/usr/share/applications/$dest$BINSUFFIX.desktop"
+	    dest="$DATADIR/applications/$dest$BINSUFFIX.desktop"
 	    add_version=
 	    test "z$VENDORNAME" = "zNovell" -a "z$BINSUFFIX" != "z" && add_version=" ($VERSION)" || :
 	    sed -e "s|\(^Name.*\)\$|\1$add_version|
@@ -188,7 +188,7 @@
 	done
 
 	# icons
-	icondir=/usr/share/icons/hicolor
+	icondir=$DATADIRBASE/icons/hicolor
 	for size in 16x16 22x22 24x24 32x32 48x48 scalable ; do
 	    mkdir -p $OODESTDIR/$icondir/$size/apps
 	    cd $TOOLSDIR/desktop/$size/
@@ -210,9 +210,9 @@
 	done
 	
 	# shared MIME info
-	mkdir -p $OODESTDIR/usr/share/mime/packages
+	mkdir -p $DATADIR/mime/packages
 	cd $TOOLSDIR/desktop
-	cp openoffice.xml $OODESTDIR/usr/share/mime/packages
+	cp openoffice.xml $DATADIR/mime/packages
 	if test "z$RUN_POST_INSTALL_SCRIPTS" = "zyes" && 
 	   which update-mime-database >/dev/null 2>&1 ; then
 	    update-mime-database /usr/share/mime || :