Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Andreas Proschofsky (suka)" <suka@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-office/libreoffice: ChangeLog libreoffice-3.3.0.ebuild
Date: Sat, 05 Feb 2011 08:58:15
Message-Id: 20110205085804.8790820054@flycatcher.gentoo.org
1 suka 11/02/05 08:58:04
2
3 Modified: ChangeLog libreoffice-3.3.0.ebuild
4 Log:
5 Cleanup work: Prefix fixes, remove outated deps and config-flags, fix pax
6
7 (Portage version: 2.1.9.35/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.9 app-office/libreoffice/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.9&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?rev=1.9&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/ChangeLog?r1=1.8&r2=1.9
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v
19 retrieving revision 1.8
20 retrieving revision 1.9
21 diff -u -r1.8 -r1.9
22 --- ChangeLog 2 Feb 2011 09:11:56 -0000 1.8
23 +++ ChangeLog 5 Feb 2011 08:58:04 -0000 1.9
24 @@ -1,6 +1,11 @@
25 # ChangeLog for app-office/libreoffice
26 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.8 2011/02/02 09:11:56 suka Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.9 2011/02/05 08:58:04 suka Exp $
29 +
30 + 05 Feb 2011; Andreas Proschofsky <suka@g.o> libreoffice-3.3.0.ebuild,
31 + files/gentoo-3.3.0.diff:
32 + Cleanup work: Prefix fixes, remove outated deps and config-flags, fix pax
33 + stuff
34
35 02 Feb 2011; Andreas Proschofsky <suka@g.o> libreoffice-3.3.0.ebuild:
36 Fix desktop files, thanks to Sanders Sweers <Sander.Sweers@×××××.com>, see
37
38
39
40 1.6 app-office/libreoffice/libreoffice-3.3.0.ebuild
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild?rev=1.6&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild?rev=1.6&content-type=text/plain
44 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild?r1=1.5&r2=1.6
45
46 Index: libreoffice-3.3.0.ebuild
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild,v
49 retrieving revision 1.5
50 retrieving revision 1.6
51 diff -u -r1.5 -r1.6
52 --- libreoffice-3.3.0.ebuild 2 Feb 2011 09:11:56 -0000 1.5
53 +++ libreoffice-3.3.0.ebuild 5 Feb 2011 08:58:04 -0000 1.6
54 @@ -1,6 +1,6 @@
55 # Copyright 1999-2011 Gentoo Foundation
56 # Distributed under the terms of the GNU General Public License v2
57 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild,v 1.5 2011/02/02 09:11:56 suka Exp $
58 +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild,v 1.6 2011/02/05 08:58:04 suka Exp $
59
60 EAPI="3"
61
62 @@ -12,9 +12,9 @@
63 PYTHON_DEPEND="2"
64 PYTHON_USE_WITH="threads"
65
66 -inherit autotools bash-completion check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde4-base multilib python toolchain-funcs
67 +inherit autotools bash-completion check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde4-base multilib pax-utils python toolchain-funcs
68
69 -IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap nsplugin odk opengl pam templates"
70 +IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap nsplugin odk opengl templates"
71
72 MY_PV=3.3.0.4
73 MY_P="${PN}-build-${MY_PV}"
74 @@ -140,8 +140,7 @@
75 >=media-libs/gst-plugins-base-0.10 )
76 java? ( >=dev-java/bsh-2.0_beta4
77 dev-java/lucene:2.3
78 - dev-java/lucene-analyzers:2.3
79 - dev-java/rhino:1.5 )
80 + dev-java/lucene-analyzers:2.3 )
81 nsplugin? ( net-libs/xulrunner:1.9
82 >=dev-libs/nspr-4.6.6
83 >=dev-libs/nss-3.11-r1 )
84 @@ -188,8 +187,6 @@
85 sys-libs/zlib
86 sys-apps/coreutils
87 dev-util/cppunit
88 - pam? ( sys-libs/pam
89 - sys-apps/shadow[pam] )
90 java? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* )
91 >=dev-java/ant-core-1.7 )
92 ldap? ( net-nds/openldap )"
93 @@ -211,7 +208,7 @@
94
95 # Check if we have enough RAM and free diskspace to build this beast
96 CHECKREQS_MEMORY="512"
97 - use debug && CHECKREQS_DISK_BUILD="12288" || CHECKREQS_DISK_BUILD="6144"
98 + use debug && CHECKREQS_DISK_BUILD="12288" || CHECKREQS_DISK_BUILD="7144"
99 check_reqs
100
101 strip-linguas ${LANGS}
102 @@ -287,11 +284,9 @@
103 echo "--with-jvm-path=/usr/$(get_libdir)/" >> ${CONFFILE}
104 echo "--with-system-beanshell" >> ${CONFFILE}
105 echo "--with-system-lucene" >> ${CONFFILE}
106 - echo "--with-system-rhino" >> ${CONFFILE}
107 echo "--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" >> ${CONFFILE}
108 echo "--with-lucene-core-jar=$(java-pkg_getjar lucene-2.3 lucene-core.jar)" >> ${CONFFILE}
109 echo "--with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers-2.3 lucene-analyzers.jar)" >> ${CONFFILE}
110 - echo "--with-rhino-jar=$(java-pkg_getjar rhino-1.5 js.jar)" >> ${CONFFILE}
111 fi
112
113 echo $(use_enable nsplugin mozilla) >> ${CONFFILE}
114 @@ -319,14 +314,12 @@
115 echo "--enable-minimizer" >> ${CONFFILE}
116 echo "--enable-presenter-console" >> ${CONFFILE}
117 echo "--enable-presenter-extra-ui" >> ${CONFFILE}
118 - echo "--enable-presenter-screen" >> ${CONFFILE}
119
120 # Misc stuff
121 echo "--disable-graphite" >> ${CONFFILE}
122 echo "--with-system-cppunit" >> ${CONFFILE}
123 echo "--with-system-openssl" >> ${CONFFILE}
124 echo "--with-system-redland" >> ${CONFFILE}
125 - echo "--without-writer2latex" >> ${CONFFILE}
126 echo "--without-junit" >> ${CONFFILE}
127
128 #fix desktop files bug #352955
129 @@ -373,13 +366,14 @@
130
131 cd "${S}"
132 ./configure --with-distro="Gentoo" \
133 + --prefix="${EPREFIX}"/usr \
134 + --sysconfdir="${EPREFIX}"/etc \
135 --with-arch="${ARCH}" \
136 --with-srcdir="${DISTDIR}" \
137 --with-lang="${LINGUAS_OOO}" \
138 --with-num-cpus="${JOBS}" \
139 --without-binsuffix \
140 --with-installed-ooo-dirname="libreoffice" \
141 - --with-tag="${MST}" \
142 --with-drink="True Blood" \
143 --without-git \
144 --with-split \
145 @@ -389,7 +383,6 @@
146 $(use_enable kde kde4) \
147 $(use_enable !debug strip) \
148 $(use_enable odk) \
149 - $(use_enable pam) \
150 $(use_with java) \
151 $(use_with templates sun-templates) \
152 --disable-access \
153 @@ -397,8 +390,8 @@
154 --enable-extensions \
155 --without-system-libwpd \
156 --without-system-libwpg \
157 - --mandir=/usr/share/man \
158 - --libdir=/usr/$(get_libdir) \
159 + --mandir="${EPREFIX}"/usr/share/man \
160 + --libdir="${EPREFIX}"/usr/$(get_libdir) \
161 || die "Configuration failed!"
162
163 }
164 @@ -438,10 +431,10 @@
165 fdo-mime_mime_database_update
166 BASHCOMPLETION_NAME=libreoffice && bash-completion_pkg_postinst
167
168 - ( [[ -x /sbin/chpax ]] || [[ -x /sbin/paxctl ]] ) && [[ -e /usr/$(get_libdir)/${PN}/program/soffice.bin ]] && scanelf -Xzm /usr/$(get_libdir)/${PN}/program/soffice.bin
169 + pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
170
171 # Add available & useful jars to LibreOffice classpath
172 - use java && /usr/$(get_libdir)/${PN}/${BASIS}/program/java-set-classpath $(java-config --classpath=jdbc-mysql 2>/dev/null) >/dev/null
173 + use java && "${EPREFIX}"/usr/$(get_libdir)/${PN}/${BASIS}/program/java-set-classpath $(java-config --classpath=jdbc-mysql 2>/dev/null) >/dev/null
174
175 kde4-base_pkg_postinst
Report Message
Find on MARC Find on Google Groups