diff options
| author |   Flammie Pirinen <flammie@gentoo.org> | 2008-03-28 06:01:31 +0000 |
|---|---|---|
| committer | Flammie Pirinen <flammie@gentoo.org> | 2008-03-28 06:01:31 +0000 |
| commit | ad81ca30a75c40d60c29e0e67505c14ea66f321f (patch) | |
| tree | 9a5ac4a53f079c9720e874d96b499d723d54f4f9 | |
| parent | Version bump and cleanup (diff) | |
| download | finnish-ad81ca30a75c40d60c29e0e67505c14ea66f321f.tar.gz finnish-ad81ca30a75c40d60c29e0e67505c14ea66f321f.tar.bz2 finnish-ad81ca30a75c40d60c29e0e67505c14ea66f321f.zip | |
Fixed rpm dependencies, thanks to Jussi Saarinen
svn path=/; revision=42
| -rw-r--r-- | trunk/app-office/openoffice-sdk/ChangeLog | 6 | ||||
| -rw-r--r-- | trunk/app-office/openoffice-sdk/Manifest | 4 | ||||
| -rw-r--r-- | trunk/app-office/openoffice-sdk/openoffice-sdk-2.3.0.ebuild | 7 |
3 files changed, 11 insertions, 6 deletions
diff --git a/trunk/app-office/openoffice-sdk/ChangeLog b/trunk/app-office/openoffice-sdk/ChangeLog index 107a498..c88903f 100644 --- a/trunk/app-office/openoffice-sdk/ChangeLog +++ b/trunk/app-office/openoffice-sdk/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*openoffice-sdk-2.3.0 (28 Mar 2008) + + 28 Mar 2008; Flammie Pirinen <flammie@gentoo.org> + openoffice-sdk-2.3.0.ebuild: + Added rpm dep to fix rpm cpio unpack, thanks to Jussi Saarinen. + 24 Dec 2007; Flammie Pirinen <flammie@gentoo.org> +openoffice-sdk-2.3.0.ebuild: Version bump, stlport is back in oo.o package. diff --git a/trunk/app-office/openoffice-sdk/Manifest b/trunk/app-office/openoffice-sdk/Manifest index a988475..a991e08 100644 --- a/trunk/app-office/openoffice-sdk/Manifest +++ b/trunk/app-office/openoffice-sdk/Manifest @@ -4,6 +4,6 @@ DIST OOo-SDK_2.2.0_LinuxIntel_install.sh 39067264 RMD160 63428dcc33497b147033113 DIST OOo-SDK_2.3.0_LinuxIntel_install.sh 34213504 RMD160 40f54de7326395cf1b86fa47d507d4aa6e6d5656 SHA1 9b33dd57a7b34bfba5ad8882a503ed74b2bf0026 SHA256 e69c332911ea26702cbc38c1292f8530abf863bd03243c4a74faebefde585d8f DIST openoffice.org-core-2.2.0-14.6.i386.rpm 77436780 RMD160 7931f26b903d0a8cf21ab6ccf2c83c0a305eb217 SHA1 c6b84b00b6b2edad65f75b0300f9c48df6516598 SHA256 24b5635397999bed84817d9df3924a680840a885980aecda86d518370fd79a59 EBUILD openoffice-sdk-2.2.0.ebuild 3873 RMD160 3dd82512f8ac0abb9c0a6f85083448247bc58be9 SHA1 38bf434354dcb0001096fe3f31bc99757cc74f84 SHA256 f3375947c0df0a3fd4ceb29cebb6ba75e5580f3359940e1f44d65d2efe6d7a49 -EBUILD openoffice-sdk-2.3.0.ebuild 3468 RMD160 83cc7dbb770df22da90634c5a35a41545ec35277 SHA1 cd00788e87a4d79412e723a70dfbe7eaa1add41d SHA256 a658f823eb9f783171b147f04feea4608adf50e4f349e39b283abfb3026df01b -MISC ChangeLog 414 RMD160 22511c4f5b9ee5698bd884794b8b1ced31b42269 SHA1 6bf5ba307e52a1107ceab0ae84ceef231e085d15 SHA256 b8794dc60e6976f8511fe005daa74fd76b0c8ed18e63eb6973812bff33498594 +EBUILD openoffice-sdk-2.3.0.ebuild 3393 RMD160 a41d8ca7d9957fa283c032b788cb020edae24e89 SHA1 ff7c17ce3f31ee4aedc39dca172e44430b88fadb SHA256 019d75f658e48196bfb5d8d7093cb832145534390815bdec6cf41278cdfba80f +MISC ChangeLog 601 RMD160 b32148b6ce238ea10a1ff901cc80733b9d256cba SHA1 96ded0f3437c7184bf3d592cd6b7228da582bdaf SHA256 aec8ba5c59d4a6a357c08fe03fbaafadb1c4512ae354fc4d3814b8ecbe26db54 MISC metadata.xml 510 RMD160 cb4f1319441f89f1ec110216291c0f73084a48dd SHA1 30714346c0a6f8bd18132c4d157faf62c61eca81 SHA256 f7ced2575305259f7ef5a743d74fb2483f1aca9a96f32ab9d6bbbe610628b0b2 diff --git a/trunk/app-office/openoffice-sdk/openoffice-sdk-2.3.0.ebuild b/trunk/app-office/openoffice-sdk/openoffice-sdk-2.3.0.ebuild index e91bfe1..831aaa5 100644 --- a/trunk/app-office/openoffice-sdk/openoffice-sdk-2.3.0.ebuild +++ b/trunk/app-office/openoffice-sdk/openoffice-sdk-2.3.0.ebuild @@ -31,7 +31,8 @@ usr/lib/openoffice/linux/bin/autodoc" #dodgybinarieswithexecstacks,meh DEPEND="|| ( =app-office/openoffice-2.3* =app-office/openoffice-bin-2.3* ) sys-apps/sed >app-arch/zip-2.3 - || ( app-arch/rpm2targz ) + app-arch/cpio + app-arch/rpm " RDEPEND="|| ( =app-office/openoffice-2.3* =app-office/openoffice-bin-2.3* ) >app-arch/zip-2.3 @@ -41,13 +42,11 @@ src_unpack() { mkdir "${S}" cd "${S}" # check line number from sh on update - tail --lines=+88 "${DISTDIR}/${OOI_SCRIPT}" | tar xf - + tail --lines=+88 "${DISTDIR}/${OOI_SCRIPT}" | tar xvf - assert cd RPMS rpm_unpack 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.3_sdk # XXX: Not $ROOT != / safe sed -e "s:@OO_SDK_HOME@:/usr/$(get_libdir)/openoffice:g" \ |