diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2005-01-29 12:05:50 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2005-01-29 12:05:50 +0000 |
| commit | ee88f5be2bf535722fe699e31d121a455d278f81 (patch) | |
| tree | c03592029142215e6527733d11ccea82ebbb52d0 /app-office | |
| parent | Version bump, fixing bug #61368. This version allows using percentages under ... (diff) | |
| download | historical-ee88f5be2bf535722fe699e31d121a455d278f81.tar.gz historical-ee88f5be2bf535722fe699e31d121a455d278f81.tar.bz2 historical-ee88f5be2bf535722fe699e31d121a455d278f81.zip | |
bunch of fixes, see ChangeLog
Package-Manager: portage-2.0.51-r15
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice-ximian/ChangeLog | 8 | ||||
| -rw-r--r-- | app-office/openoffice-ximian/Manifest | 4 | ||||
| -rw-r--r-- | app-office/openoffice-ximian/openoffice-ximian-1.3.8.ebuild | 11 |
3 files changed, 15 insertions, 8 deletions
diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog index 6d3907922bf6..b4651dc74713 100644 --- a/app-office/openoffice-ximian/ChangeLog +++ b/app-office/openoffice-ximian/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-office/openoffice-ximian # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.107 2005/01/28 19:16:36 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.108 2005/01/29 12:05:50 suka Exp $ + + 29 Jan 2005; Andreas Proschofsky <suka@gentoo.org> + openoffice-ximian-1.3.8.ebuild: + *) Fix kde path detection, closes bug #79827. + *) Provide virtual/ooo + *) further ebuild cleanups 28 Jan 2005; Andreas Proschofsky <suka@gentoo.org> files/1.1.4/gentoo-1.3.8.patch, openoffice-ximian-1.3.8.ebuild: diff --git a/app-office/openoffice-ximian/Manifest b/app-office/openoffice-ximian/Manifest index d19434c323ec..e176973bb605 100644 --- a/app-office/openoffice-ximian/Manifest +++ b/app-office/openoffice-ximian/Manifest @@ -1,8 +1,8 @@ MD5 f881d3e35a8d3a9c27e1d29984b9d3fd openoffice-ximian-1.3.6.ebuild 16873 -MD5 2d5ce73876a69b26dc9d49e3887fdb5e openoffice-ximian-1.3.8.ebuild 17416 +MD5 4d12cf8ef66ff2b33b22497189d4a1c8 openoffice-ximian-1.3.8.ebuild 17348 MD5 26f1b4de2d99cba28eb2b09825c69475 openoffice-ximian-1.3.5-r1.ebuild 16129 MD5 981121820dd0442f8eef8ee4c8e99a31 openoffice-ximian-1.3.7.ebuild 17810 -MD5 13f9e933533dd0a5b6ff5c7aff0d96da ChangeLog 26812 +MD5 fd4d418c3192722e7c61816bebbb84cd ChangeLog 27002 MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300 MD5 b7a3ab0336f7e514b6641e5871c1bbbb files/digest-openoffice-ximian-1.3.5-r1 437 MD5 2595967ac130a541e50bffc75e105041 files/digest-openoffice-ximian-1.3.6 502 diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.3.8.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.8.ebuild index 8656d57d25a7..6454e914672c 100644 --- a/app-office/openoffice-ximian/openoffice-ximian-1.3.8.ebuild +++ b/app-office/openoffice-ximian/openoffice-ximian-1.3.8.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/openoffice-ximian/openoffice-ximian-1.3.8.ebuild,v 1.3 2005/01/28 19:16:36 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.8.ebuild,v 1.4 2005/01/29 12:05:50 suka Exp $ # Notes: # @@ -24,7 +24,7 @@ # Get support going for installing a custom language pack. Also # need to be able to install more than one language pack. -inherit eutils fdo-mime flag-o-matic toolchain-funcs +inherit eutils fdo-mime flag-o-matic kde-functions toolchain-funcs IUSE="curl gnome hardened java kde nptl zlib" @@ -91,6 +91,8 @@ DEPEND="${RDEPEND} java? ( >=virtual/jdk-1.4.1 ) !java? ( dev-libs/libxslt )" +PROVIDE="virtual/ooo" + pkg_setup() { if use java @@ -296,9 +298,6 @@ src_unpack() { einfo "Applying Ximian OO.org Patches" ${PATCHDIR}/patches/apply.pl ${PATCHDIR}/patches/${PATCHLEVEL} ${S} -f --distro=${DISTRO} || die "Ximian patches failed" - use nptl && epatch ${PATCHDIR}/patches/gcc34/gcc34-nptl-fix.diff - use gnome && epatch ${PATCHDIR}/patches/gcc34/gcc34-gnome.diff - #Fix for hardened if use hardened; then epatch ${FILESDIR}/${OO_VER}/pthreadlink-fix.patch @@ -363,6 +362,8 @@ src_compile() { MYCONF="${MYCONF} --with-system-zlib" fi + use kde && set-kdedir 3 + # 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) |