Change cp -a to cp -pPR to be less GNU-ish (bug #103487), remove version 0.6.5 since we have newer stable 0.6.6

Package-Manager: portage-2.0.51.22-r2

5 files changed, 12 insertions, 93 deletions

diff --git a/app-office/indeview/ChangeLog b/app-office/indeview/ChangeLog
index c9f0c989b8b0..1ba508762d46 100644
--- a/app-office/indeview/ChangeLog
+++ b/app-office/indeview/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/indeview
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/indeview/ChangeLog,v 1.11 2005/07/28 21:03:59 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/indeview/ChangeLog,v 1.12 2005/08/26 13:30:49 kanaka Exp $
+
+  26 Aug 2005; Joel Martin <kanaka@gentoo.org> -indeview-0.6.5.ebuild,
+  indeview-0.6.6.ebuild:
+  Change cp -a to cp -pPR to be less GNU-ish (bug #103487), remove version
+  0.6.5 since we have newer stable 0.6.6
 
   28 Jul 2005; Caleb Tennis <caleb@gentoo.org> indeview-0.6.5.ebuild,
   indeview-0.6.6.ebuild:
@@ -34,5 +39,5 @@
 
   22 Apr 2004; Joel Martin <kanaka@gentoo.org> indeview-0.6.5.ebuild,
   metadata.xml:
-  New ebuild, bug 46520
+  New ebuild, bug #46520
 
diff --git a/app-office/indeview/Manifest b/app-office/indeview/Manifest
index 56aec1136e49..07aebbf6b548 100644
--- a/app-office/indeview/Manifest
+++ b/app-office/indeview/Manifest
@@ -1,6 +1,4 @@
-MD5 db73ff17dedd531f1cafda1f434d0a24 indeview-0.6.6.ebuild 2750
-MD5 b55e96243492029844e3df83e4797229 indeview-0.6.5.ebuild 2752
-MD5 4ca8727407b2763082afee0095998329 ChangeLog 1210
+MD5 0eb28b45a9a626c9a7056b28cf40e37b ChangeLog 1425
+MD5 2014ba8791d9410a02f165065a161f9f indeview-0.6.6.ebuild 2754
 MD5 999957c815f1f66cd06973b1da035051 metadata.xml 218
-MD5 af867adfa8e9bd51546181498d308927 files/digest-indeview-0.6.5 64
 MD5 27ca16448a510baad8ef2438527d7d03 files/digest-indeview-0.6.6 64
diff --git a/app-office/indeview/files/digest-indeview-0.6.5 b/app-office/indeview/files/digest-indeview-0.6.5
deleted file mode 100644
index c57f87cdff7e..000000000000
--- a/app-office/indeview/files/digest-indeview-0.6.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b7959850b9fb2485160dcc00936ab4a0 indeview-0.6.5.tgz 6768036
diff --git a/app-office/indeview/indeview-0.6.5.ebuild b/app-office/indeview/indeview-0.6.5.ebuild
deleted file mode 100644
index 8063cedd60cc..000000000000
--- a/app-office/indeview/indeview-0.6.5.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/indeview/indeview-0.6.5.ebuild,v 1.8 2005/07/28 21:03:59 caleb Exp $
-
-DESCRIPTION="Convert OpenOffice/KOffice to run independently on Linux, OSX, or Windows"
-HOMEPAGE="http://www.indeview.org/"
-SRC_URI="http://www.${PN}.org/download/${P}.tgz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-KEYWORDS="~x86 ~ppc"
-IUSE=""
-RDEPEND="=x11-libs/qt-3*"
-
-S=${WORKDIR}/${P}/Viewer
-
-src_compile() {
-	${QTDIR}/bin/qmake || die "qmake failed"
-	make || die "make failed"
-
-	# Fix up the OpenOffice macro file
-	cd ${S}/../Creator/OpenOffice/
-	cp IndeViewExport.bas IndeViewExport.mo.bas
-	sed -i -e 's:unknown:/usr/share/IndeView/ROOT_DATA:' IndeViewExport.mo.bas
-	# Convert special characters to &XXX; style
-	sed -i -e 's/&/\&amp;/g' IndeViewExport.mo.bas
-	sed -i -e 's/"/\&quot;/g' IndeViewExport.mo.bas
-	sed -i -e 's/</\&lt;/g' IndeViewExport.mo.bas
-	sed -i -e 's/>/\&gt;/g' IndeViewExport.mo.bas
-	sed -i -e "s/'/\&apos;/g" IndeViewExport.mo.bas
-	sed -i -e 's/ö/o/g' IndeViewExport.mo.bas
-
-	cat >> IndeViewExport.xba << _EOF_
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE script:module PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "module.dtd">
-<script:module xmlns:script="http://openoffice.org/2000/script" script:name="IndeViewExport" script:language="StarBasic">
-_EOF_
-	cat IndeViewExport.mo.bas >> IndeViewExport.xba
-	cat >> IndeViewExport.xba << _EOF_
-</script:module>
-_EOF_
-
-	cd ${S}/../Creator/KPresenter
-	sed -i -e 's:^ROOT_DATA=unknown:ROOT_DATA=/usr/share/IndeView/ROOT_DATA:' kpr2iv.sh
-}
-
-src_install() {
-	dobin bin/indeview
-	dobin ../Creator/KPresenter/kpr2iv.sh
-
-	cd ${S}/..
-	dohtml -r doc/html/*
-	dodoc LICENSE README AUTHORS
-
-	dodir /usr/share/IndeView
-	cp -a ${S}/../ROOT_DATA ${D}/usr/share/IndeView/
-
-	dodir /opt/OpenOffice.org/share/basic/Tools
-	insinto /opt/OpenOffice.org/share/basic/Tools
-	cd ${S}/../Creator/OpenOffice/
-
-	doins IndeViewExport.xba
-}
-
-pkg_postinst() {
-	# Add script to OpenOffice macros list
-	grep "IndeViewExport" /opt/OpenOffice.org/share/basic/Tools/script.xlb > /dev/null 2>&1 ||
-		sed -i -e 's;</library:library>; <library:element library:name="IndeViewExport"/>\n</library:library>;' /opt/OpenOffice.org/share/basic/Tools/script.xlb
-
-	echo
-	einfo "If you install or re-install openoffice, "
-	einfo "you will need to re-merge this pacakge."
-	echo
-}
-
-pkg_postrm() {
-	# Delete script from OpenOffice macros list
-	if [ ! -e ${ROOT}/usr/bin/indeview ];
-	then
-		grep "IndeViewExport" /opt/OpenOffice.org/share/basic/Tools/script.xlb > /dev/null 2>&1 &&
-			sed -i -e '/^ <library:element library:name="IndeViewExport"\/>$/d' /opt/OpenOffice.org/share/basic/Tools/script.xlb
-	fi
-}
diff --git a/app-office/indeview/indeview-0.6.6.ebuild b/app-office/indeview/indeview-0.6.6.ebuild
index 5bf63a00c857..825e821ab05d 100644
--- a/app-office/indeview/indeview-0.6.6.ebuild
+++ b/app-office/indeview/indeview-0.6.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/indeview/indeview-0.6.6.ebuild,v 1.5 2005/07/28 21:03:59 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/indeview/indeview-0.6.6.ebuild,v 1.6 2005/08/26 13:30:49 kanaka Exp $
 
 DESCRIPTION="Convert OpenOffice/KOffice to run independently on Linux, OSX, or Windows"
 HOMEPAGE="http://www.indeview.org/"
@@ -28,7 +28,7 @@ src_compile() {
 	sed -i -e 's/</\&lt;/g' IndeViewExport.mo.bas
 	sed -i -e 's/>/\&gt;/g' IndeViewExport.mo.bas
 	sed -i -e "s/'/\&apos;/g" IndeViewExport.mo.bas
-	sed -i -e 's/ö/o/g' IndeViewExport.mo.bas
+	sed -i -e 's/ö/o/g' IndeViewExport.mo.bas
 
 	cat >> IndeViewExport.xba << _EOF_
 <?xml version="1.0" encoding="UTF-8"?>
@@ -53,7 +53,7 @@ src_install() {
 	dodoc LICENSE README AUTHORS
 
 	dodir /usr/share/IndeView
-	cp -a ${S}/../ROOT_DATA ${D}/usr/share/IndeView/
+	cp -pPR ${S}/../ROOT_DATA ${D}/usr/share/IndeView/
 
 	dodir /opt/OpenOffice.org/share/basic/Tools
 	insinto /opt/OpenOffice.org/share/basic/Tools