Cleaned OO.o SDK versions and updated it.

svn path=/; revision=11

6 files changed, 30 insertions, 108 deletions

diff --git a/trunk/app-office/openoffice-sdk/Manifest b/trunk/app-office/openoffice-sdk/Manifest
index 3d1694e..e70342e 100644
--- a/trunk/app-office/openoffice-sdk/Manifest
+++ b/trunk/app-office/openoffice-sdk/Manifest
@@ -7,25 +7,22 @@ MD5 7eb1daa44a793066d81dc539a82f0335 files/setsdkenv_unix.sh.gentoo 9221
 RMD160 c4950444f0a8d4fd681bf8086b2d1ca9b83ebfd5 files/setsdkenv_unix.sh.gentoo 9221
 SHA256 8f8db808429c6a628c46c2d46c504176b4500bd630233b8f41679be685aefab2 files/setsdkenv_unix.sh.gentoo 9221
 DIST OOo-SDK_2.0_linux_install_en-US.sh 40101497 RMD160 0d7a8480d0c377ee79fd91b650eeef36bd1659b8 SHA1 67b409e16b525aa34f8111bca267791e54dac92c SHA256 e1037ceebccad2ba28c3c7354e1f84da441caad7dca75400c0050b9d8bbf4752
-DIST OOo_2.0.3_LinuxIntel_sdk.sh 39845497 RMD160 fec7a01c81540394928036cdd88cba3d0d8ba96b SHA1 9a3b70fcd8b4574b0e586f26be86ea320801fe7f SHA256 b6848815c674ac65b58b49a65a487c801d8ed763dd1f2d82b27f52995b103a13
-EBUILD openoffice-sdk-2.0.3.ebuild 2698 RMD160 7da50b06f392736ea079e3c1ad05630146344237 SHA1 794723f9ffda81d90b99feb285cf9370760a7122 SHA256 3edcfb3ce111933f5b879b82a82a0d93fa8d0f0dad1c3a00bae6e88425b86aa6
-MD5 6ce9f2b771cfc9601eb5eeff60317f8d openoffice-sdk-2.0.3.ebuild 2698
-RMD160 7da50b06f392736ea079e3c1ad05630146344237 openoffice-sdk-2.0.3.ebuild 2698
-SHA256 3edcfb3ce111933f5b879b82a82a0d93fa8d0f0dad1c3a00bae6e88425b86aa6 openoffice-sdk-2.0.3.ebuild 2698
-EBUILD openoffice-sdk-2.0.4.ebuild 2618 RMD160 258e90393cb246980f4db19c89ae68ff020ff1a2 SHA1 5f82afe642c4f41729d0205afd46ce269d1cf522 SHA256 4a49a644ad1926607adcab8a4fe1284b6a5335a8a310f6076e919a7c342ad793
-MD5 c07f58bf4dd6fbfa27e4191185fec90b openoffice-sdk-2.0.4.ebuild 2618
-RMD160 258e90393cb246980f4db19c89ae68ff020ff1a2 openoffice-sdk-2.0.4.ebuild 2618
-SHA256 4a49a644ad1926607adcab8a4fe1284b6a5335a8a310f6076e919a7c342ad793 openoffice-sdk-2.0.4.ebuild 2618
+DIST OOo-SDK_2.2.0_LinuxIntel_install.sh 39067264 RMD160 63428dcc33497b147033113d21844e7f62659d94 SHA1 2f34c8322bb6fd95b3521cde34f63bb13d5ff937 SHA256 8e043e408307a146ea7c9fa8047f22c36ed2be36065224705dc1e6beab49d8e4
 EBUILD openoffice-sdk-2.1.0.ebuild 2796 RMD160 cfd3cfd9c58e6727869edd541823225144081669 SHA1 ee194259369fa216681e91ff3eb97306ce5a8556 SHA256 74873ddf409cd7bfff706d71bd5db453b6c2669878e268b9182c27b70ca23fb6
 MD5 b3e97be32ab032579a3abe37632db6dc openoffice-sdk-2.1.0.ebuild 2796
 RMD160 cfd3cfd9c58e6727869edd541823225144081669 openoffice-sdk-2.1.0.ebuild 2796
 SHA256 74873ddf409cd7bfff706d71bd5db453b6c2669878e268b9182c27b70ca23fb6 openoffice-sdk-2.1.0.ebuild 2796
-MD5 9020d216d63b907ba0564a128717d5f7 files/digest-openoffice-sdk-2.0.3 268
-RMD160 de8ae5b94f256bf620e2b1adb75f3eb75d42fb7e files/digest-openoffice-sdk-2.0.3 268
-SHA256 a3b5134b7f6d9b761015d7f9f176d39dae665e2fa0ab9fcb09b873de0d1e15b9 files/digest-openoffice-sdk-2.0.3 268
-MD5 69f107677b4b2deecdbbb0c46adc17d4 files/digest-openoffice-sdk-2.0.4 289
-RMD160 ce89f6da3d9a3df35e91512439439e9f9d93ade7 files/digest-openoffice-sdk-2.0.4 289
-SHA256 4fb7efa55d28a9344da4d363af460548fe3ca5849271516659fb970d234c5d44 files/digest-openoffice-sdk-2.0.4 289
+EBUILD openoffice-sdk-2.2.0.ebuild 2793 RMD160 036cdc05e7b7c6099dd4f58979259f681e9184d0 SHA1 3a57bc4c115a4c63f13fb71152a62bbde97cadfd SHA256 4c43162cc745a8bba833431fe5304493083e4c438e1dcaa60f94c126a3f2d86a
+MD5 525cae60403c43e909915a1d0c8e18a8 openoffice-sdk-2.2.0.ebuild 2793
+RMD160 036cdc05e7b7c6099dd4f58979259f681e9184d0 openoffice-sdk-2.2.0.ebuild 2793
+SHA256 4c43162cc745a8bba833431fe5304493083e4c438e1dcaa60f94c126a3f2d86a openoffice-sdk-2.2.0.ebuild 2793
+MISC .openoffice-sdk-2.2.0.ebuild.swp 12288 RMD160 7f4568f13bdd6a1e4945c993e960b84621c188be SHA1 0be882d9df89988a4fe4d7404308ecaf9e987885 SHA256 8b4d2ed628de6edba2f72a337a5fc77100c4ee7fdf0007a1bea5ffcfc0a90679
+MD5 fc818919ea0b7919bc79e1a1703ad81e .openoffice-sdk-2.2.0.ebuild.swp 12288
+RMD160 7f4568f13bdd6a1e4945c993e960b84621c188be .openoffice-sdk-2.2.0.ebuild.swp 12288
+SHA256 8b4d2ed628de6edba2f72a337a5fc77100c4ee7fdf0007a1bea5ffcfc0a90679 .openoffice-sdk-2.2.0.ebuild.swp 12288
 MD5 69f107677b4b2deecdbbb0c46adc17d4 files/digest-openoffice-sdk-2.1.0 289
 RMD160 ce89f6da3d9a3df35e91512439439e9f9d93ade7 files/digest-openoffice-sdk-2.1.0 289
 SHA256 4fb7efa55d28a9344da4d363af460548fe3ca5849271516659fb970d234c5d44 files/digest-openoffice-sdk-2.1.0 289
+MD5 a3583a06f22a8c61c04237dbab4b634f files/digest-openoffice-sdk-2.2.0 292
+RMD160 6e413de24154f90edf8bc3ccd2692643063bfdde files/digest-openoffice-sdk-2.2.0 292
+SHA256 d94bb04797daae00882da7d320205d9112e2fb824e37cb37d3b8bdc98ec74f33 files/digest-openoffice-sdk-2.2.0 292
diff --git a/trunk/app-office/openoffice-sdk/files/digest-openoffice-sdk-2.0.3 b/trunk/app-office/openoffice-sdk/files/digest-openoffice-sdk-2.0.3
deleted file mode 100644
index 82b8007..0000000
--- a/trunk/app-office/openoffice-sdk/files/digest-openoffice-sdk-2.0.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f35f397dac358a054cd425b2348f258c OOo_2.0.3_LinuxIntel_sdk.sh 39845497
-RMD160 fec7a01c81540394928036cdd88cba3d0d8ba96b OOo_2.0.3_LinuxIntel_sdk.sh 39845497
-SHA256 b6848815c674ac65b58b49a65a487c801d8ed763dd1f2d82b27f52995b103a13 OOo_2.0.3_LinuxIntel_sdk.sh 39845497
diff --git a/trunk/app-office/openoffice-sdk/files/digest-openoffice-sdk-2.0.4 b/trunk/app-office/openoffice-sdk/files/digest-openoffice-sdk-2.1.0
index ae80502..ae80502 100644
--- a/trunk/app-office/openoffice-sdk/files/digest-openoffice-sdk-2.0.4
+++ b/trunk/app-office/openoffice-sdk/files/digest-openoffice-sdk-2.1.0
diff --git a/trunk/app-office/openoffice-sdk/files/digest-openoffice-sdk-2.2.0 b/trunk/app-office/openoffice-sdk/files/digest-openoffice-sdk-2.2.0
new file mode 100644
index 0000000..ea1fc23
--- /dev/null
+++ b/trunk/app-office/openoffice-sdk/files/digest-openoffice-sdk-2.2.0
@@ -0,0 +1,3 @@
+MD5 f0ea9de588f1b7c9f7a5f9e3f9b51a99 OOo-SDK_2.2.0_LinuxIntel_install.sh 39067264
+RMD160 63428dcc33497b147033113d21844e7f62659d94 OOo-SDK_2.2.0_LinuxIntel_install.sh 39067264
+SHA256 8e043e408307a146ea7c9fa8047f22c36ed2be36065224705dc1e6beab49d8e4 OOo-SDK_2.2.0_LinuxIntel_install.sh 39067264
diff --git a/trunk/app-office/openoffice-sdk/openoffice-sdk-2.0.3.ebuild b/trunk/app-office/openoffice-sdk/openoffice-sdk-2.0.3.ebuild
deleted file mode 100644
index be2f8fb..0000000
--- a/trunk/app-office/openoffice-sdk/openoffice-sdk-2.0.3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-DESCRIPTION="Software Development Kit addition to OpenOffice.Org"
-HOMEPAGE="http://download.openoffice.org/2.0.3/sdk.html"
-SRC_URI="http://mirrors.dotsrc.org/openoffice/stable/${PV}_sdk/OOo_${PV}_LinuxIntel_sdk.sh"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="java"
-
-DEPEND="|| ( >app-office/openoffice-2 >app-office/openoffice-bin-2 )
-	sys-apps/sed
-	>app-arch/zip-2.3
-	|| ( app-arch/rpm2targz )
-	java? ( >dev-java/sun-jdk-1.4.1.01 )
-	"
-RDEPEND="|| ( >app-office/openoffice-2 >app-office/openoffice-bin-2 )
-	>app-arch/zip-2.3
-	"
-
-src_unpack() {
-	mkdir "${S}"
-	cd "${S}"
-	# check line number from sh on update
-	tail --lines=+88 "${DISTDIR}/OOo_${PV}_LinuxIntel_sdk.sh" | tar xf -
-	assert
-	cd RPMS
-	rpm2targz openoffice.org-sdk-${PV}-?.i586.rpm || \
-		die "Unable to unrpm"
-	tar zxpf openoffice.org-sdk-${PV}-?.i586.tar.gz || \
-		die "Unable to untar"
-	cd opt/openoffice.org2.0_sdk
-	OO_SDK_JAVA_HOME=""
-	if has_version dev-java/sun-jdk && use java ; then
-		jdk_version=$(best_version dev-java/sun-jdk)
-		OO_SDK_JAVA_HOME="${ROOT}/opt/sun-jdk-${jdk_version/-r?/}"
-	fi
-	sed	-e "s:@OO_SDK_HOME@:${ROOT}/usr/lib/openoffice:g" \
-		-e "s:@OFFICE_HOME@:${ROOT}/usr/lib/openoffice:g" \
-		-e "s:@OO_SDK_ZIP_HOME@:${ROOT}/usr/bin:g" \
-		-e "s:@OO_SDK_CPP_HOME@:${ROOT}/usr/bin:g" \
-		-e "s:@OO_SDK_MAKE_HOME@:${ROOT}/usr/bin:g" \
-		-e "s:@OO_SDK_JAVA_HOME@:${OO_SDK_JAVA_HOME}:g" \
-		-e "s:/usr/share/automake:${ROOT}/usr/share/automake:g" \
-		"${FILESDIR}/setsdkenv_unix.sh.gentoo" > setsdkenv_unix.sh
-	sed -e "s:@OO_SDK_HOME@:${ROOT}/usr/lib/openoffice:g" \
-		-e "s:@OFFICE_HOME@:${ROOT}/usr/lib/openoffice:g" \
-		-e "s:@OO_SDK_ZIP_HOME@:${ROOT}/usr/bin:g" \
-		-e "s:@OO_SDK_CPP_HOME@:${ROOT}/usr/bin:g" \
-		-e "s:@OO_SDK_MAKE_HOME@:${ROOT}/usr/bin:g" \
-		-e "s:@OO_SDK_JAVA_HOME@:${OO_SDK_JAVA_HOME}:g" \
-		-e "s:/usr/share/automake:${ROOT}/usr/share/automake:g" \
-		"${FILESDIR}/setsdkenv_unix.csh.gentoo" > setsdkenv_unix.csh
-}
-
-src_install() {
-	dodir /usr/lib/openoffice
-	insinto /usr/lib/openoffice
-	cd "${S}/RPMS/opt/openoffice.org2.0_sdk/"
-	doins -r classes examples idl linux settings xml include
-	doins config.*
-	dodoc index.html README{,.html}
-	dodir /usr/share/doc/${PF}
-	insinto /usr/share/doc/${PF}
-	doins -r docs
-	insinto /usr/lib/openoffice/program/
-	doins setsdkenv_unix* configure.pl
-	fperms a+x /usr/lib/openoffice/program/setsdkenv_unix.{c,}sh
-	fperms a+x /usr/lib/openoffice/config.*
-	fperms a+x /usr/lib/openoffice/linux/bin/*
-}
-
-src_postinst() {
-	elog "SDK environment variable setup scripts were installed in: "
-	elog "	${ROOT}/usr/lib/openoffice/program"
-}
diff --git a/trunk/app-office/openoffice-sdk/openoffice-sdk-2.0.4.ebuild b/trunk/app-office/openoffice-sdk/openoffice-sdk-2.2.0.ebuild
index 92eb674..c19493d 100644
--- a/trunk/app-office/openoffice-sdk/openoffice-sdk-2.0.4.ebuild
+++ b/trunk/app-office/openoffice-sdk/openoffice-sdk-2.2.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 inherit java-pkg-opt-2
 
-OOI_SCRIPT="OOo-SDK_2.0_linux_install_en-US.sh"
+OOI_SCRIPT="OOo-SDK_2.2.0_LinuxIntel_install.sh"
 DESCRIPTION="Software Development Kit addition to OpenOffice.Org"
-HOMEPAGE="http://download.openoffice.org/2.0.3/sdk.html"
-SRC_URI="http://mirrors.dotsrc.org/openoffice/stable/${PV}_sdk/${OOI_SCRIPT}"
+HOMEPAGE="http://download.openoffice.org/2.2.0/sdk.html"
+SRC_URI="http://mirrors.dotsrc.org/openoffice/stable/${PV}/${OOI_SCRIPT}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -29,12 +29,12 @@ src_unpack() {
 	tail --lines=+88 "${DISTDIR}/${OOI_SCRIPT}" | tar xf -
 	assert
 	cd RPMS
-	rpm2targz openoffice.org-sdk-${PV}-?.i586.rpm || \
+	rpm2targz openoffice.org-sdk-${PV}-*.i586.rpm || \
 		die "Unable to unrpm"
-	tar zxpf openoffice.org-sdk-${PV}-?.i586.tar.gz || \
+	tar zxpf openoffice.org-sdk-${PV}-*.i586.tar.gz || \
 		die "Unable to untar"
-	cd opt/openoffice.org2.0_sdk
-	sed	-e "s:@OO_SDK_HOME@:${ROOT}/usr/lib/openoffice:g" \
+	cd opt/openoffice.org2.2_sdk
+	sed -e "s:@OO_SDK_HOME@:${ROOT}/usr/lib/openoffice:g" \
 		-e "s:@OFFICE_HOME@:${ROOT}/usr/lib/openoffice:g" \
 		-e "s:@OO_SDK_ZIP_HOME@:${ROOT}/usr/bin:g" \
 		-e "s:@OO_SDK_CPP_HOME@:${ROOT}/usr/bin:g" \
@@ -56,14 +56,14 @@ src_install() {
 	# tools, examples & api docs
 	dodir /usr/lib/openoffice
 	insinto /usr/lib/openoffice
-	cd "${S}/RPMS/opt/openoffice.org2.0_sdk/"
+	cd "${S}/RPMS/opt/openoffice.org2.2_sdk/"
 	doins -r classes examples idl linux settings xml include
 	doins config.*
 	for f in config.* linux/bin/* ; do
 		fperms a+x /usr/lib/openoffice/${f} || die "fperms failed"
 	done
 
-	# docs 
+	# docs
 	dodoc index.html README{,.html}
 	dodir /usr/share/doc/${PF}
 	insinto /usr/share/doc/${PF}
@@ -77,7 +77,11 @@ src_install() {
 	done
 }
 
-src_postinst() {
+pkg_postinst() {
 	elog "SDK environment variable setup scripts were installed in: "
 	elog "	${ROOT}/usr/lib/openoffice/program"
+	elog "Please note that this ugly kludge of package is only used until "
+	elog "	http://bugs.gentoo.org/show_bug.cgi?id=151798"
+	elog "has been resolved by kind openoffice team"
 }
+