From: Tomas Chvatal Date: Thu, 22 Sep 2011 12:39:04 +0000 (+0000) Subject: Goodbye to custom-cflags, cleanup a bit. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=63edfc06da7037e33d1cbb270e1aa70b35f8ee36;p=gentoo.git Goodbye to custom-cflags, cleanup a bit. Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64 --- diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index e9b475018f1c..558429ab0566 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.143 2011/09/22 11:00:54 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.144 2011/09/22 12:39:04 scarabeus Exp $ + + 22 Sep 2011; Tomáš Chvátal + libreoffice-9999-r1.ebuild: + Goodbye to custom-cflags, cleanup a bit. 22 Sep 2011; Tomáš Chvátal libreoffice-9999-r1.ebuild: diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 847c8f53ec59..06cb028e0494 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -173,23 +173,23 @@ EBUILD libreoffice-3.3.3.ebuild 18131 RMD160 9ac5d82927f327bff9ef1f37304f13239c0 EBUILD libreoffice-3.3.4.ebuild 18146 RMD160 1c71a223f37c402ab01d95b71dfa5af2c69f61af SHA1 18c1211e8eaf8c587f52ee303dc264c941e7c045 SHA256 d602a3efffc23cb848b1fdc667a0d7b1c9dde2502dfae0fb537fecb9ee744cc2 EBUILD libreoffice-3.4.3.2-r1.ebuild 18350 RMD160 54bbfb6be956667016eefe1dad15737cc44e1deb SHA1 59dafcc4461a5c8571f814b41843950420b54fdc SHA256 8f883984653e50045ec2404ce4286950bafd82cf31e97347edc38a61e1fe2b4d EBUILD libreoffice-3.4.9999-r1.ebuild 18444 RMD160 6209f79b7aee2ef034810b62a30d80a6c573e683 SHA1 76cd9106979325bbc55127c9a37d83514f179a11 SHA256 578c8666330d5e81c00f11127f6c671e780addb01ac8052dcf508388b691c8fb -EBUILD libreoffice-9999-r1.ebuild 17061 RMD160 35f7e01c169580a4b209547f05632f172070e272 SHA1 dd921557afe368ab64f781038ca542390c54e593 SHA256 7d2fff32a4156df321bd2d8ff0e870b77fb4e11bda6e4a6e652c442a1ecc99ca -MISC ChangeLog 27641 RMD160 1af171f96b070e907b4de93050d2aadd8d6138bb SHA1 8fe1ca7914968997971e2e1d3ac8f650e998e435 SHA256 c33e3c3d9a58c6fbc7e68cc7844963845c27b13b1d2838aa2383bc9062e75c0f +EBUILD libreoffice-9999-r1.ebuild 16494 RMD160 63a7e89d48e2f3ad9aa839db4a4a28cf43dc7118 SHA1 95ce753b26de7003082c432a22b1e12e63df03f5 SHA256 ff46abacf44fa75bc445f21db2bd2f41d3f55b74b26df9487fdde88acfe953f5 +MISC ChangeLog 27770 RMD160 d8af5c40d3b281ebb91f984e8f2e7020cc8b10ee SHA1 a75a607ff1f4d810618640050b311f40a975da76 SHA256 2ae02323a1c2e803ae14fe1b037e0880f0b1375a127a7bce0e946424ac659fe8 MISC metadata.xml 1060 RMD160 d45f264670abdfa12c42935b489af5f462f70189 SHA1 d3932fab9bb5ab0bc404a95c60fa6a03f08044bd SHA256 f7a39bf4b3077ec5bada9e35940d1a02dcf9a62b77a56cc6346f750528a1e092 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQIcBAEBAgAGBQJOexVFAAoJEOSiRoyO7jvoe4QP/Aoii1h1axikuABulrXTBAAF -Dh9srf8qjpkPjcLRac25prSFiWqGcBGj+7cAfik9Pow2K5NX/uhbi5yEOce4IKFA -xcc5mTx5yUyOUcc83TJO4KYuBZH3bgqEI8WxSu9ROzBQQOwewJqbfygE36OHonMI -/RXIxci8TDM6FB2+RV6/oPSULDFlOk4roLdtFoA3MYY3JOtI/geUrDkgQgZGG5fV -swATwVu0vnzTGcIqXmBr7qnkSYuVL9Yy1vHV+te8WNjuWRQo4Z2os8RgiFMaikpB -z2GOUYFrLYfpl9ZOn57jNjubr87O/VAKzrOg4ntr9Uh36hbLpP20y/P89Zaj6pbI -42yP7xQptojI/mWQASPdgV0qEnUitfPDavJwWXK3k0PlwuoMSrGCi/Z3x7OAbOT8 -t0TTCKxEqHgh1e6NTutlUlANKY2f69xLypLdbjfVnGicie1iUtyhXHzecamTdZGS -NImC47wxAJTzjHS9Lg2YM4LScsosBtGw6+5Y6+MHEAwJLo9uzNtRCbVN96omZZHr -ygZ8Y316YRR8ftK8Zwhzoz+XJRSd08EvCjQpjdPGGjY9G/IxEcdwyzmsNQF78N19 -TBydoqcxjo4pAt9tFtveMsRCSvNnGGMrwvDGq8YtFiK4HJgKmwVfV3fCf0Ag3tIm -hbop1wXis8mNmY0aT225 -=5eAa +iQIcBAEBAgAGBQJOeyxIAAoJEOSiRoyO7jvoe50P/1vC2cUC1qDlOO4tqbq/zwqa +LGh0rcMyS8I9xLpoGuhmHgepwicS9DyyKsiVTR/vAqVcIFfAi/lwkQTDxQii+28V +ksayAarjqmNQHnSr+H6r8ol7f2etHD94PPMRtSu6WwOj0aoB0gNf5abm3CQ1gQti +xz3xbYRlFeZk5zqBtZ1Hsbarp7CDYSAgB+9gqUFupojVkL6fgaWicW/wKXDh4B0a +xPpSpaav3qe4PQJPBhM+bnt9IwZ9v6FEMohfF/lZ+QJ14SEuf4lVmpTQfZ1D8JGd +r45u+scUJhwIundTmvb2D0z3vlkWVxM5UQ3ul+kkn3CJJbHDeLYJ9IiyoJ3EruLy +qmD6dyFZoeaCduGttNva89yALoElWWH4P/V4biwIbTySP6V/fNQLYxc2ibi4oUoE +fgqZvX5ET2pxPnHWfSFRse268yn/glxyccHMHISt/r8rXJ0e3Jclo9FPfnjGCqpZ +Jb7zfSgTtdllRvgGyWfmJKV5Ne/wFMHnuTmzDARL8p/94HgLkbSiHxGbgnkvYbcE +so3OdxB4I32AnQ0vAQ6W1u6fJu4HDLAefcbPsOKVlK/Cctam6aWPA9yc7pS94rmj +edizzEgpoJpvPr1Jog9lWTM+AA4fEnOXb21h+skeon6zYuUV0//ODJBgClN84Pwh +9CvXWrYrb8Ps04v7zXVE +=aXaJ -----END PGP SIGNATURE----- diff --git a/app-office/libreoffice/libreoffice-9999-r1.ebuild b/app-office/libreoffice/libreoffice-9999-r1.ebuild index b6239c6935f0..2ed3332315df 100644 --- a/app-office/libreoffice/libreoffice-9999-r1.ebuild +++ b/app-office/libreoffice/libreoffice-9999-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.19 2011/09/22 11:00:54 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.20 2011/09/22 12:39:04 scarabeus Exp $ EAPI=3 @@ -98,9 +98,8 @@ unset ADDONS_URI unset EXT_URI unset ADDONS_SRC -IUSE="binfilter +branding custom-cflags dbus debug eds gnome graphite -gstreamer gtk jemalloc kde ldap mysql nsplugin odk opengl svg templates test -+vba webdav" +IUSE="binfilter +branding dbus debug eds gnome +graphite gstreamer gtk +jemalloc +kde ldap mysql nsplugin odk opengl svg templates test +vba webdav" LICENSE="LGPL-3" SLOT="0" [[ ${PV} == *9999* ]] || KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" @@ -244,15 +243,6 @@ pkg_setup() { die "Too old gcc found." fi - if use custom-cflags; then - ewarn "You are using custom CFLAGS, which is NOT supported and can cause" - ewarn "all sorts of build and runtime errors." - ewarn - ewarn "Before reporting a bug, please make sure you rebuild and try with" - ewarn "basic CFLAGS, otherwise the bug will not be accepted." - ewarn - fi - if ! use gtk; then ewarn "If you want the LibreOffice systray quickstarter to work" ewarn "activate the 'gtk' use flag." @@ -319,13 +309,7 @@ src_unpack() { src_prepare() { # optimization flags export ARCH_FLAGS="${CXXFLAGS}" - use debug || export LINKFLAGSOPTIMIZE="${LDFLAGS}" - - # compiler flags - use custom-cflags || strip-flags - use debug || filter-flags "-g*" - # silent miscompiles; LO/OOo adds -O2/1/0 where appropriate - filter-flags "-O*" + export LINKFLAGSOPTIMIZE="${LDFLAGS}" base_src_prepare eautoreconf @@ -499,9 +483,6 @@ src_install() { newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN} || die rm -rf "${ED}"/etc/ - # hack fix the gdb printers upstream! - rm -rf "${ED}"/var/ - # symlink the plugin to system location if use nsplugin; then inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so