Fix KDE menu item duplicity

4 files changed, 239 insertions, 4 deletions

diff --git a/app-office/openoffice-bin/ChangeLog b/app-office/openoffice-bin/ChangeLog
index ac8070c9d55d..0ebfaf5cbaa2 100644
--- a/app-office/openoffice-bin/ChangeLog
+++ b/app-office/openoffice-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/openoffice-bin
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.21 2003/06/20 08:58:17 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.22 2003/06/30 11:05:55 brad Exp $
+
+*openoffice-bin-1.1_beta2-r1 (30 Jun 2003)
+
+  30 Jun 2003; Brad Laue <brad@gentoo.org> openoffice-bin-1.1_beta2-r1.ebuild:
+  Correct an issue where KDE menu items show up twice - directory name changed
+  on us.
 
   20 Jun 2003; Paul de Vrieze <pauldv@gentoo.org>
   openoffice-bin-1.1_beta2.ebuild, files/1.1_beta2/ooffice-wrapper-1.3:
diff --git a/app-office/openoffice-bin/Manifest b/app-office/openoffice-bin/Manifest
index d306642ec133..75d93dd2a514 100644
--- a/app-office/openoffice-bin/Manifest
+++ b/app-office/openoffice-bin/Manifest
@@ -1,20 +1,22 @@
-MD5 e75ddedee19197b607283471bbcbf1e0 ChangeLog 4467
+MD5 948f3c59bad83f2822a8afe875ce0d95 ChangeLog 4677
 MD5 583bb2a3fcf66696f1c3c389874b82c9 openoffice-bin-1.0.0-r3.ebuild 2912
 MD5 b221cf945d38e9e31215107f8d084063 openoffice-bin-1.0.1.ebuild 5603
 MD5 7641bbaef9471705b1ed80f92485d707 openoffice-bin-1.0.2.ebuild 6176
 MD5 d75508db43d161514ce1f1288c5d67d2 openoffice-bin-1.0.3.ebuild 6177
+MD5 1d8dc5e17ece7fe099b2297b2fe64d04 openoffice-bin-1.1_beta.ebuild 5963
 MD5 286e13ebb4c41e2b2a502ac3b12fa6b4 openoffice-bin-1.0.3.1.ebuild 6448
 MD5 4c18a84bc75b5859b4ffd053f8762759 openoffice-bin-1.1_beta-r1.ebuild 6254
-MD5 1d8dc5e17ece7fe099b2297b2fe64d04 openoffice-bin-1.1_beta.ebuild 5963
 MD5 9c068210f1dad29882aad1a6683bf9d2 openoffice-bin-1.1_beta2.ebuild 6263
+MD5 f94a6aefb7a74d11b83d7c57edaa7595 openoffice-bin-1.1_beta2-r1.ebuild 6269
 MD5 9f6fa2caffbec422160157fb68966b37 files/digest-openoffice-bin-1.0.0-r3 82
 MD5 9f9a6ba9924997dd5a42c2b374ea6aa8 files/digest-openoffice-bin-1.0.1 165
 MD5 6bb2dccd6a53a5457be6670d628c77d3 files/digest-openoffice-bin-1.0.2 168
 MD5 e345ca755fa551b18c20129ebb7da224 files/digest-openoffice-bin-1.0.3 82
 MD5 7339447c6b75b9d8cad638a824041ba5 files/digest-openoffice-bin-1.1_beta 84
-MD5 7339447c6b75b9d8cad638a824041ba5 files/digest-openoffice-bin-1.1_beta-r1 84
 MD5 94e303d234eb28b21c53aefdc9f8f19f files/digest-openoffice-bin-1.0.3.1 145
+MD5 7339447c6b75b9d8cad638a824041ba5 files/digest-openoffice-bin-1.1_beta-r1 84
 MD5 777372dfd2a1b56594ee73e40e663be6 files/digest-openoffice-bin-1.1_beta2 85
+MD5 777372dfd2a1b56594ee73e40e663be6 files/digest-openoffice-bin-1.1_beta2-r1 85
 MD5 31dc859e113fcefc3b4aaaab55d54bb9 files/1.0.0/read_ins.pl 9753
 MD5 5ec13ed7c68a3af10ef7d74bf104fb3d files/1.0.0/regcomp-1.0.0.tbz2 11185
 MD5 9d58d18cf68c1b88732eeae0c52767da files/1.0.1/ooffice-wrapper 7406
diff --git a/app-office/openoffice-bin/files/digest-openoffice-bin-1.1_beta2-r1 b/app-office/openoffice-bin/files/digest-openoffice-bin-1.1_beta2-r1
new file mode 100644
index 000000000000..fb4953079bf3
--- /dev/null
+++ b/app-office/openoffice-bin/files/digest-openoffice-bin-1.1_beta2-r1
@@ -0,0 +1 @@
+MD5 84565c1c28c5a526b9e6faabd3d97074 OOo_1.1beta2_LinuxIntel_install.tar.gz 73649497
diff --git a/app-office/openoffice-bin/openoffice-bin-1.1_beta2-r1.ebuild b/app-office/openoffice-bin/openoffice-bin-1.1_beta2-r1.ebuild
new file mode 100644
index 000000000000..979acefb5d8e
--- /dev/null
+++ b/app-office/openoffice-bin/openoffice-bin-1.1_beta2-r1.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.1_beta2-r1.ebuild,v 1.1 2003/06/30 11:05:55 brad Exp $
+
+IUSE="kde gnome"
+
+inherit virtualx
+
+# NOTE:  There are two big issues that should be addressed.
+#
+#        1)  Language support and fonts should be addressed.
+
+LOC="/opt"
+
+INSTDIR="${LOC}/OpenOffice.org${PV}"
+#MY_PV="`echo ${PV} | gawk '{ print tolower($1) }'`"
+MY_PV="${PV/_/}"
+if [ `use ppc` ]; then
+	MY_P="OOo_${MY_PV}_LinuxPowerPC_installer"
+S="${WORKDIR}/${MY_P}"
+else
+	MY_P="OOo_${MY_PV}_LinuxIntel_install" 
+	S="${WORKDIR}/${MY_P}"
+fi;
+
+DESCRIPTION="OpenOffice productivity suite"
+SRC_URI="x86? ( http://vlaai.snt.utwente.nl/pub/software/openoffice/stable/${MY_PV}/OOo_${MY_PV}_LinuxIntel_install.tar.gz
+		http://openoffice.mirrors.pair.com/stable/${MY_PV}/OOo_${MY_PV}_LinuxIntel_install.tar.gz )
+ 	 ppc? ( ftp://ftp.yellowdoglinux.com/pub/yellowdog/software/openoffice/OOo_${MY_PV}_LinuxPowerPC_installer.tar.gz )"
+HOMEPAGE="http://www.openoffice.org"
+
+DEPEND="sys-apps/findutils
+	virtual/glibc
+	>=dev-lang/perl-5.0
+	virtual/x11
+	app-arch/zip
+	app-arch/unzip
+	|| ( >=virtual/jdk-1.3.1 >=virtual/jre-1.3.1 )
+	!app-office/openoffice"
+
+RDEPEND="virtual/glibc
+	>=dev-lang/perl-5.0
+	virtual/x11
+	app-arch/zip
+	app-arch/unzip
+	|| ( >=virtual/jdk-1.3.1 >=virtual/jre-1.3.1 )
+	!app-office/openoffice"
+
+LICENSE="LGPL-2 | SISSL-1.1"
+SLOT="0"
+KEYWORDS="~x86 -ppc -sparc "
+
+src_install() {
+	# Sandbox issues; bug #8587
+	addpredict "/user"
+	addpredict "/share"
+	addpredict "/pspfontcache"
+	addpredict "/usr/bin/soffice"
+	
+	# Sandbox issues; bug 8063
+	addpredict "/dev/dri"	
+
+	# Autoresponse file for main installation
+	cat > ${T}/rsfile-global <<-"END_RS"
+		[ENVIRONMENT]
+		INSTALLATIONMODE=INSTALL_NETWORK
+		INSTALLATIONTYPE=STANDARD
+		DESTINATIONPATH=<destdir>
+		OUTERPATH=
+		LOGFILE=
+		LANGUAGELIST=<LANGUAGE>
+
+		[JAVA]
+		JavaSupport=preinstalled_or_none
+	END_RS
+	
+	# Autoresponse file for user isntallation
+	cat > ${T}/rsfile-local <<-"END_RS"
+		[ENVIRONMENT]
+		INSTALLATIONMODE=INSTALL_WORKSTATION
+		INSTALLATIONTYPE=WORKSTATION
+		DESTINATIONPATH=<home>/.openoffice/<pv>
+
+		[JAVA]
+		JavaSupport=none
+	END_RS
+
+	# Fixing install location in response file
+	sed -e "s|<destdir>|${D}${INSTDIR}|" \
+		${T}/rsfile-global > ${T}/autoresponse
+
+	einfo "Installing OpenOffice.org into build root..."
+	dodir ${INSTDIR}
+	cd ${S}
+	# Setup virtualmake
+	export maketype="./setup"
+	# We need X to install...
+	virtualmake "-v -r:${T}/autoresponse"
+
+	#fix the libstdc++.so symlink
+	cd ${D}/${INSTDIR}/program
+	ln -sf libstdc++.so.3.0.4 libstdc++.so.3
+	ln -sf libstdc++.so.3.0.4 libstdc++
+
+	echo
+	einfo "Removing build root from registry..."
+	# Remove totally useless stuff.
+	rm -f ${D}${INSTDIR}/program/{setup.log,sopatchlevel.sh}
+	# Remove build root from registry and co
+	egrep -rl "${D}" ${D}${INSTDIR}/* | \
+		xargs -i perl -pi -e "s|${D}||g" {} || :
+
+	einfo "Fixing permissions..."
+	# Fix permissions
+	find ${D}${INSTDIR}/ -type f -exec chmod a+r {} \;
+	chmod a+x ${D}${INSTDIR}/share/config/webcast/*.pl
+
+	# Fix symlinks
+	for x in "soffice program/spadmin" \
+		"program/setup setup" \
+		"program/spadmin spadmin"
+	do
+		dosym $(echo ${x} | awk '{print $1}') \
+			${INSTDIR}/$(echo ${x} | awk '{print $2}')
+	done
+
+	# Install user autoresponse file
+	insinto /etc/openoffice
+	sed -e "s|<pv>|${PV//_beta2}|g" ${T}/rsfile-local > ${T}/autoresponse-${PV}.conf
+	doins ${T}/autoresponse-${PV}.conf
+	
+	# Install wrapper script
+	exeinto /usr/bin
+	sed -e "s|<pv>|${PV}|g" \
+		${FILESDIR}/${PV}/ooffice-wrapper-1.3 > ${T}/ooffice
+	doexe ${T}/ooffice
+	# Component symlinks
+	dosym ooffice /usr/bin/oocalc
+	dosym ooffice /usr/bin/oodraw
+	dosym ooffice /usr/bin/ooimpress
+	dosym ooffice /usr/bin/oomath
+	dosym ooffice /usr/bin/oowriter
+	dosym ooffice /usr/bin/oosetup
+	dosym ooffice /usr/bin/oopadmin
+
+	einfo "Installing Menu shortcuts (need \"gnome\" or \"kde\" in USE)..."
+	if [ -n "`use gnome`" ]
+	then
+		insinto /usr/share/gnome/apps/OpenOffice.org
+		# Install the files needed for the catagory
+		doins ${D}${INSTDIR}/share/gnome/net/.directory
+		doins ${D}${INSTDIR}/share/gnome/net/.order
+		
+		for x in ${D}${INSTDIR}/share/gnome/net/*.desktop
+		do
+			# We have to handle setup differently
+			perl -pi -e "s:${INSTDIR}/program/setup:/usr/bin/oosetup:g" ${x}
+			# Now fix the rest
+			perl -pi -e "s:${INSTDIR}/program/s:/usr/bin/oo:g" ${x}
+			doins ${x}
+		done
+	fi
+
+	if [ -n "`use kde`" ]
+	then
+		local kdeloc="${D}${INSTDIR}/share/kde/net/"
+
+		insinto /usr/share/applnk/OpenOffice.org\ 1.1
+		# Install the files needed for the catagory
+		doins ${kdeloc}/.directory
+		doins ${kdeloc}/.order
+		dodir /usr/share
+		# Install the icons and mime info
+		cp -r ${D}${INSTDIR}/share/kde/net/share/mimelnk ${D}${INSTDIR}/share/kde/net/share/icons ${D}/usr/share
+		
+		for x in ${kdeloc}/*.desktop
+		do
+			# We have to handle setup differently
+			perl -pi -e "s:${INSTDIR}/program/setup:/usr/bin/oosetup:g" ${x}
+			# Now fix the rest
+			perl -pi -e "s:${INSTDIR}/program/s:/usr/bin/oo:g" ${x}
+			doins ${x}
+		done
+	fi
+
+	# Unneeded, as they get installed into /usr/share...
+#	rm -rf ${D}${INSTDIR}/share/{cde,gnome,kde}
+	rm -rf ${D}${INSTDIR}/share/cde
+
+	for f in ${D}/usr/share/gnome/apps/OpenOffice.org/* ; do
+		echo 'Categories=Application;Office;' >> ${f}
+	done
+
+
+	# Make sure these do not get nuked.
+	keepdir ${INSTDIR}/user/registry/res/en-us/org/openoffice/{Office,ucb}
+	keepdir ${INSTDIR}/user/psprint/{driver,fontmetric}
+	keepdir ${INSTDIR}/user/{autocorr,backup,plugin,store,temp,template}
+
+	#touch files to make portage uninstalling happy (#22593)
+	find ${D} -type f -exec touch {} \;
+}
+
+pkg_preinst() {
+
+	# The one with OO-1.0.0 was not valid
+	if [ -f ${ROOT}/etc/openoffice/autoresponse.conf ]
+	then
+		rm -f ${ROOT}/etc/openoffice/autoresponse.conf
+	fi
+}
+
+pkg_postinst() {
+	
+	einfo "******************************************************************"
+	einfo " To start OpenOffice.org, run:"
+	einfo
+	einfo "   $ ooffice"
+	einfo
+	einfo " Also, for individual components, you can use any of:"
+	einfo
+	einfo "   oocalc, oodraw, ooimpress, oomath or oowriter"
+	einfo
+	einfo "******************************************************************"
+}
+