diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2004-10-15 15:36:37 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2004-10-15 15:36:37 +0000 |
| commit | ebd3ef85c54eff08a6bf0d75c7ac306276053b88 (patch) | |
| tree | f63d548eabfa376cf5dc5854670f3786fa4bac79 | |
| parent | restore old files ... no reason to prun ethem since portage handles caching t... (diff) | |
| download | historical-ebd3ef85c54eff08a6bf0d75c7ac306276053b88.tar.gz historical-ebd3ef85c54eff08a6bf0d75c7ac306276053b88.tar.bz2 historical-ebd3ef85c54eff08a6bf0d75c7ac306276053b88.zip | |
stable on x86 for bug #63556
| -rw-r--r-- | app-office/openoffice-ximian/ChangeLog | 5 | ||||
| -rw-r--r-- | app-office/openoffice-ximian/openoffice-ximian-1.3.5-r1.ebuild | 15 | ||||
| -rw-r--r-- | app-office/openoffice/Manifest | 4 |
3 files changed, 16 insertions, 8 deletions
diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog index 9a7030e11240..84e48598b325 100644 --- a/app-office/openoffice-ximian/ChangeLog +++ b/app-office/openoffice-ximian/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-office/openoffice-ximian # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.77 2004/10/12 13:54:03 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.78 2004/10/15 15:36:37 suka Exp $ + + 15 Oct 2004; suka@gentoo.org openoffice-ximian-1.3.5-r1.ebuild: + Mark stable on x86 for bug #63556, also conditionalize curl dependency *openoffice-ximian-1.3.5-r1 (12 Oct 2004) diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.3.5-r1.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.5-r1.ebuild index a7f7e006dc76..aaa0f5d0cdba 100644 --- a/app-office/openoffice-ximian/openoffice-ximian-1.3.5-r1.ebuild +++ b/app-office/openoffice-ximian/openoffice-ximian-1.3.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.5-r1.ebuild,v 1.2 2004/10/12 14:06:10 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.5-r1.ebuild,v 1.3 2004/10/15 15:36:37 suka Exp $ # Notes: # @@ -26,7 +26,7 @@ inherit flag-o-matic eutils gcc -IUSE="gnome kde java" +IUSE="gnome kde java curl" OO_VER=1.1.2 PATCHLEVEL=OOO_1_1_2 @@ -49,7 +49,7 @@ HOMEPAGE="http://ooo.ximian.com" LICENSE="|| ( LGPL-2 SISSL-1.1 )" SLOT="0" -KEYWORDS="~x86 ~ppc" +KEYWORDS="x86 ~ppc" RDEPEND="!app-office/openoffice-ximian-bin virtual/x11 @@ -81,7 +81,7 @@ DEPEND="${RDEPEND} app-shells/tcsh dev-util/pkgconfig dev-util/intltool - net-misc/curl + curl? ( net-misc/curl ) sys-libs/pam sys-libs/zlib !dev-util/dmake @@ -318,6 +318,12 @@ src_compile() { MYCONF="${MYCONF} --disable-java" fi + #See if we use system-curl + if use curl + then + MYCONF="${MYCONF} --with-system-curl" + fi + # Do NOT compile with a external STLport, as gcc-2.95.3 users will # get linker errors due to the ABI being different (STLport will be # compiled with 2.95.3, while OO is compiled with 3.x). (Az) @@ -334,7 +340,6 @@ src_compile() { --enable-fontconfig \ --with-system-zlib \ --with-system-freetype \ - --with-system-curl \ --with-system-xrender \ --disable-mozilla" diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest index 39fe46082eae..09ba535073d7 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -1,8 +1,8 @@ MD5 dcc1f55254b24752c511276cf01d72cd openoffice-1.0.3-r2.ebuild 21286 MD5 851a9f162c8770734bbdd6145b6f9eab openoffice-1.1.1-r1.ebuild 16292 MD5 ae6e88fa3057b6ea75c3f45c78092d8c openoffice-1.1.0-r4.ebuild 20328 -MD5 81078a53b2925da5ebfb55885ef577de openoffice-1.1.3.ebuild 15871 -MD5 70a1a2fe632d566d1264d79c01273849 ChangeLog 19002 +MD5 3adefb585813e6228ae685aedac62773 openoffice-1.1.3.ebuild 15978 +MD5 ff10e8f7909674ccd8230ccefcfe3e8e ChangeLog 19115 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461 MD5 77e939cb806bacd816162a5ad001899f openoffice-1.1.2.ebuild 15932 MD5 2e1cecfeaa8a5134d03b75149ca35ef4 files/digest-openoffice-1.1.2 127 |