diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2014-01-31 08:07:39 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-01-31 08:07:39 +0000 |
| commit | a9d70a639d9ab08a8b4f7053ca53aa82ffb4836f (patch) | |
| tree | c6e2476bd8f9a49314481135032deb284e089e32 /dev-libs/apr-util | |
| parent | Convert myconf to an array to make it easier to maintain. (diff) | |
| download | gentoo-2-a9d70a639d9ab08a8b4f7053ca53aa82ffb4836f.tar.gz gentoo-2-a9d70a639d9ab08a8b4f7053ca53aa82ffb4836f.tar.bz2 gentoo-2-a9d70a639d9ab08a8b4f7053ca53aa82ffb4836f.zip | |
Simplify src_compile/src_install a bit -- no functional changes.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'dev-libs/apr-util')
| -rw-r--r-- | dev-libs/apr-util/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-libs/apr-util/apr-util-1.5.3.ebuild | 20 |
2 files changed, 10 insertions, 15 deletions
diff --git a/dev-libs/apr-util/ChangeLog b/dev-libs/apr-util/ChangeLog index b803fcc77a03..cf11b957d4db 100644 --- a/dev-libs/apr-util/ChangeLog +++ b/dev-libs/apr-util/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/apr-util # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.195 2014/01/31 08:05:02 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v 1.196 2014/01/31 08:07:39 vapier Exp $ + + 31 Jan 2014; Mike Frysinger <vapier@gentoo.org> apr-util-1.5.3.ebuild: + Simplify src_compile/src_install a bit -- no functional changes. 31 Jan 2014; Mike Frysinger <vapier@gentoo.org> apr-util-1.5.3.ebuild: Convert myconf to an array to make it easier to maintain. diff --git a/dev-libs/apr-util/apr-util-1.5.3.ebuild b/dev-libs/apr-util/apr-util-1.5.3.ebuild index 378bfb753612..5448a0d5ab57 100644 --- a/dev-libs/apr-util/apr-util-1.5.3.ebuild +++ b/dev-libs/apr-util/apr-util-1.5.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-1.5.3.ebuild,v 1.5 2014/01/31 08:05:02 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-1.5.3.ebuild,v 1.6 2014/01/31 08:07:39 vapier Exp $ EAPI="4" @@ -81,25 +81,17 @@ src_configure() { src_compile() { emake CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" - - if use doc; then - emake dox - fi + use doc && emake dox } src_install() { default - find "${ED}" -name "*.la" -exec rm -f {} + - find "${ED}usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -exec rm -f {} + + find "${ED}" -name "*.la" -delete + find "${ED}usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -delete + use static-libs || find "${ED}" -name "*.a" -delete - if use doc; then - dohtml -r docs/dox/html/* - fi - - if ! use static-libs; then - find "${ED}" -name "*.a" -exec rm -f {} + - fi + use doc && dohtml -r docs/dox/html/* # This file is only used on AIX systems, which Gentoo is not, # and causes collisions between the SLOTs, so remove it. |