[gentoo-commits] gentoo-x86 commit in dev-libs/apr-util: apr-util-1.5.3.ebuild ChangeLog

[Mike Frysinger (vapier)]

vapier      14/01/31 08:07:39

  Modified:             apr-util-1.5.3.ebuild ChangeLog
  Log:
  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)

Revision  Changes    Path
1.6                  dev-libs/apr-util/apr-util-1.5.3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/apr-util/apr-util-1.5.3.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/apr-util/apr-util-1.5.3.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/apr-util/apr-util-1.5.3.ebuild?r1=1.5&r2=1.6

Index: apr-util-1.5.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/apr-util/apr-util-1.5.3.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- apr-util-1.5.3.ebuild	31 Jan 2014 08:05:02 -0000	1.5
+++ apr-util-1.5.3.ebuild	31 Jan 2014 08:07:39 -0000	1.6
@@ -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_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.



1.196                dev-libs/apr-util/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/apr-util/ChangeLog?rev=1.196&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/apr-util/ChangeLog?rev=1.196&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/apr-util/ChangeLog?r1=1.195&r2=1.196

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/apr-util/ChangeLog,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- ChangeLog	31 Jan 2014 08:05:02 -0000	1.195
+++ ChangeLog	31 Jan 2014 08:07:39 -0000	1.196
@@ -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@g.o> apr-util-1.5.3.ebuild:
+  Simplify src_compile/src_install a bit -- no functional changes.
 
   31 Jan 2014; Mike Frysinger <vapier@g.o> apr-util-1.5.3.ebuild:
   Convert myconf to an array to make it easier to maintain.