| 1 |
suka 11/02/05 11:24:09 |
| 2 |
|
| 3 |
Modified: openoffice-bin-3.2.1.ebuild ChangeLog |
| 4 |
Removed: openoffice-bin-3.2.0.ebuild |
| 5 |
Log: |
| 6 |
EAPI3 and prefix fixes, bug #315805, also clean up pax-stuff, bug #353587, remove outdated release |
| 7 |
|
| 8 |
(Portage version: 2.1.9.35/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.4 app-office/openoffice-bin/openoffice-bin-3.2.1.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.2.1.ebuild?rev=1.4&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.2.1.ebuild?rev=1.4&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.2.1.ebuild?r1=1.3&r2=1.4 |
| 16 |
|
| 17 |
Index: openoffice-bin-3.2.1.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.2.1.ebuild,v |
| 20 |
retrieving revision 1.3 |
| 21 |
retrieving revision 1.4 |
| 22 |
diff -u -r1.3 -r1.4 |
| 23 |
--- openoffice-bin-3.2.1.ebuild 15 Nov 2010 11:10:48 -0000 1.3 |
| 24 |
+++ openoffice-bin-3.2.1.ebuild 5 Feb 2011 11:24:09 -0000 1.4 |
| 25 |
@@ -1,10 +1,10 @@ |
| 26 |
-# Copyright 1999-2010 Gentoo Foundation |
| 27 |
+# Copyright 1999-2011 Gentoo Foundation |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.2.1.ebuild,v 1.3 2010/11/15 11:10:48 tomka Exp $ |
| 30 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-3.2.1.ebuild,v 1.4 2011/02/05 11:24:09 suka Exp $ |
| 31 |
|
| 32 |
-EAPI="2" |
| 33 |
+EAPI="3" |
| 34 |
|
| 35 |
-inherit eutils fdo-mime rpm multilib |
| 36 |
+inherit eutils fdo-mime pax-utils prefix rpm multilib |
| 37 |
|
| 38 |
IUSE="gnome java kde" |
| 39 |
|
| 40 |
@@ -48,11 +48,11 @@ |
| 41 |
|
| 42 |
LICENSE="LGPL-2" |
| 43 |
SLOT="0" |
| 44 |
-KEYWORDS="amd64 x86" |
| 45 |
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" |
| 46 |
|
| 47 |
RDEPEND="!app-office/openoffice |
| 48 |
x11-libs/libXaw |
| 49 |
- sys-libs/glibc |
| 50 |
+ !prefix? ( sys-libs/glibc ) |
| 51 |
>=dev-lang/perl-5.0 |
| 52 |
app-arch/zip |
| 53 |
app-arch/unzip |
| 54 |
@@ -78,6 +78,8 @@ |
| 55 |
src_unpack() { |
| 56 |
|
| 57 |
unpack ${A} |
| 58 |
+ cp "${FILESDIR}"/{50-openoffice-bin,wrapper.in} "${T}" |
| 59 |
+ eprefixify "${T}"/{50-openoffice-bin,wrapper.in} |
| 60 |
|
| 61 |
cd "${S}" |
| 62 |
|
| 63 |
@@ -132,11 +134,11 @@ |
| 64 |
|
| 65 |
einfo "Installing OpenOffice.org into build root..." |
| 66 |
dodir ${INSTDIR} |
| 67 |
- mv "${WORKDIR}"/opt/openoffice.org/* "${D}${INSTDIR}" || die |
| 68 |
- mv "${WORKDIR}"/opt/openoffice.org3/* "${D}${INSTDIR}" || die |
| 69 |
+ mv "${WORKDIR}"/opt/openoffice.org/* "${ED}${INSTDIR}" || die |
| 70 |
+ mv "${WORKDIR}"/opt/openoffice.org3/* "${ED}${INSTDIR}" || die |
| 71 |
|
| 72 |
#Menu entries, icons and mime-types |
| 73 |
- cd "${D}${INSTDIR}/share/xdg/" |
| 74 |
+ cd "${ED}${INSTDIR}/share/xdg/" |
| 75 |
|
| 76 |
for desk in base calc draw impress math printeradmin qstart writer; do |
| 77 |
mv ${desk}.desktop openoffice.org-${desk}.desktop |
| 78 |
@@ -150,11 +152,11 @@ |
| 79 |
done |
| 80 |
|
| 81 |
# Make sure the permissions are right |
| 82 |
- fowners -R root:0 / |
| 83 |
+ use prefix || fowners -R root:0 / |
| 84 |
|
| 85 |
# Install wrapper script |
| 86 |
- newbin "${FILESDIR}/wrapper.in" ooffice |
| 87 |
- sed -i -e s/LIBDIR/$(get_libdir)/g "${D}/usr/bin/ooffice" || die |
| 88 |
+ newbin "${T}/wrapper.in" ooffice |
| 89 |
+ sed -i -e s/LIBDIR/$(get_libdir)/g "${ED}/usr/bin/ooffice" || die |
| 90 |
|
| 91 |
# Component symlinks |
| 92 |
for app in base calc draw impress math writer; do |
| 93 |
@@ -164,17 +166,17 @@ |
| 94 |
dosym ${INSTDIR}/program/spadmin /usr/bin/ooffice-printeradmin |
| 95 |
dosym ${INSTDIR}/program/soffice /usr/bin/soffice |
| 96 |
|
| 97 |
- rm -f "${D}${INSTDIR}/basis-link" || die |
| 98 |
+ rm -f "${ED}${INSTDIR}/basis-link" || die |
| 99 |
dosym ${INSTDIR}/basis3.2 ${INSTDIR}/basis-link |
| 100 |
|
| 101 |
# Change user install dir |
| 102 |
- sed -i -e "s/.openoffice.org\/3/.ooo3/g" "${D}${INSTDIR}/program/bootstraprc" || die |
| 103 |
+ sed -i -e "s/.openoffice.org\/3/.ooo3/g" "${ED}${INSTDIR}/program/bootstraprc" || die |
| 104 |
|
| 105 |
# Non-java weirdness see bug #99366 |
| 106 |
- use !java && rm -f "${D}${INSTDIR}/ure/bin/javaldx" |
| 107 |
+ use !java && rm -f "${ED}${INSTDIR}/ure/bin/javaldx" |
| 108 |
|
| 109 |
# prevent revdep-rebuild from attempting to rebuild all the time |
| 110 |
- insinto /etc/revdep-rebuild && doins "${FILESDIR}/50-openoffice-bin" |
| 111 |
+ insinto /etc/revdep-rebuild && doins "${T}/50-openoffice-bin" |
| 112 |
|
| 113 |
} |
| 114 |
|
| 115 |
@@ -183,15 +185,15 @@ |
| 116 |
fdo-mime_desktop_database_update |
| 117 |
fdo-mime_mime_database_update |
| 118 |
|
| 119 |
- [[ -x /sbin/chpax ]] && [[ -e /usr/$(get_libdir)/openoffice/program/soffice.bin ]] && chpax -zm /usr/$(get_libdir)/openoffice/program/soffice.bin |
| 120 |
+ pax-mark -m /usr/$(get_libdir)/openoffice/program/soffice.bin |
| 121 |
|
| 122 |
elog " openoffice-bin does not provide integration with system spell " |
| 123 |
elog " dictionaries. Please install them manually through the Extensions " |
| 124 |
elog " Manager (Tools > Extensions Manager) or use the source based " |
| 125 |
elog " package instead. " |
| 126 |
elog |
| 127 |
- elog " Dictionaries for english, french and spanish are provided in " |
| 128 |
- elog " /usr/$(get_libdir)/openoffice/share/extension/install " |
| 129 |
+ elog " Dictionaries for English, French and Spanish are provided in " |
| 130 |
+ elog " ${EPREFIX}/usr/$(get_libdir)/openoffice/share/extension/install " |
| 131 |
elog " Other dictionaries can be found at Suns extension site. " |
| 132 |
elog |
| 133 |
|
| 134 |
|
| 135 |
|
| 136 |
|
| 137 |
1.235 app-office/openoffice-bin/ChangeLog |
| 138 |
|
| 139 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?rev=1.235&view=markup |
| 140 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?rev=1.235&content-type=text/plain |
| 141 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice-bin/ChangeLog?r1=1.234&r2=1.235 |
| 142 |
|
| 143 |
Index: ChangeLog |
| 144 |
=================================================================== |
| 145 |
RCS file: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v |
| 146 |
retrieving revision 1.234 |
| 147 |
retrieving revision 1.235 |
| 148 |
diff -u -r1.234 -r1.235 |
| 149 |
--- ChangeLog 15 Nov 2010 11:10:48 -0000 1.234 |
| 150 |
+++ ChangeLog 5 Feb 2011 11:24:09 -0000 1.235 |
| 151 |
@@ -1,6 +1,11 @@ |
| 152 |
# ChangeLog for app-office/openoffice-bin |
| 153 |
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 154 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.234 2010/11/15 11:10:48 tomka Exp $ |
| 155 |
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 156 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.235 2011/02/05 11:24:09 suka Exp $ |
| 157 |
+ |
| 158 |
+ 05 Feb 2011; Andreas Proschofsky <suka@g.o> files/50-openoffice-bin, |
| 159 |
+ -openoffice-bin-3.2.0.ebuild, openoffice-bin-3.2.1.ebuild, files/wrapper.in: |
| 160 |
+ EAPI3 and prefix fixes, bug #315805, also clean up pax-stuff, bug #353587, |
| 161 |
+ remove outdated release |
| 162 |
|
| 163 |
15 Nov 2010; Thomas Kahle <tomka@g.o> openoffice-bin-3.2.1.ebuild: |
| 164 |
x86 stable per bug #340917 |
Archives