From: Mike Frysinger <vapier@gentoo.org>
Date: Fri, 13 Jan 2012 16:07:46 +0000 (+0000)
Subject: Simplify ebuild a bit.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5a3a6512e9c91d9e70592ed657978ffc42856e5a;p=gentoo.git

Simplify ebuild a bit.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64
---

diff --git a/media-libs/libv4l/ChangeLog b/media-libs/libv4l/ChangeLog
index e60d89869728..15e87ef15bbb 100644
--- a/media-libs/libv4l/ChangeLog
+++ b/media-libs/libv4l/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libv4l
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libv4l/ChangeLog,v 1.60 2011/12/30 13:15:22 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libv4l/ChangeLog,v 1.61 2012/01/13 16:07:46 vapier Exp $
+
+  13 Jan 2012; Mike Frysinger <vapier@gentoo.org> libv4l-0.8.5.ebuild:
+  Simplify ebuild a bit.
 
   30 Dec 2011; Samuli Suominen <ssuominen@gentoo.org> -libv4l-0.8.1.ebuild,
   -libv4l-0.8.3.ebuild, -libv4l-0.8.4.ebuild:
diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest
index b89cd72e44ce..525b03ff8762 100644
--- a/media-libs/libv4l/Manifest
+++ b/media-libs/libv4l/Manifest
@@ -2,17 +2,23 @@
 Hash: SHA1
 
 DIST v4l-utils-0.8.5.tar.bz2 373882 RMD160 03d429774d2c8db84e8260826d5e8aaab3eca194 SHA1 0ea4c892c0a098ebf1a7dc92e419a65151e32c07 SHA256 c205848fbaf3489b97519dae04da31be4998bbc170a2ca9791357a8a549e594c
-EBUILD libv4l-0.8.5.ebuild 1027 RMD160 d56d4a1ebf813ef450f1badcb53ca009d9291767 SHA1 1ea134e6e7b5c8fc3b6f6348b448be3ec5f69fdf SHA256 b0078553a39e6b79b0a9419c55d0cd350b43172fec39093e454813cc3b77a65e
-MISC ChangeLog 7089 RMD160 7fc593f494a910625e3dfae86dd3598ed7e349e0 SHA1 0e55b4c50b8759a855951233980279be2060c3c8 SHA256 99c858d0fb3525efadbfce6974b29bdb833f50db4cb9aa8abe5ffe6f6019c58b
+EBUILD libv4l-0.8.5.ebuild 1020 RMD160 9275d66d4bd01fb690e49edaefacd98ab26b88e1 SHA1 d7a0b092df8e099f2b5d3ec8c976776f334a754b SHA256 4289312952a7a7e77439b75ddd13726eba6f5c54d254f88759da66006047eed5
+MISC ChangeLog 7183 RMD160 46c1861a5d7adb037280ff4a77f2ba11c099a196 SHA1 69f45f5acd31eb1513eea611a1a38e505c574410 SHA256 f0386515e5e0a2999392b2085e7f60527aa3bee7f135f8e8e76439bb7383bbdf
 MISC metadata.xml 1231 RMD160 a92472eb968a6ffee0271172713d86a793dabf54 SHA1 2333936286c7f79c44970d66eaa0fb0743665fe4 SHA256 80547ef9b74e128f3424789330baaad6ec48910e1c17412ce16e7b3ea4ff290a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJO/bkPAAoJEEdUh39IaPFNHsYH/13rBBrq74rlSpvhhiiZ/s6C
-1HR7e0ssCKvhEKQ1GHgAPZDNuBg4FC+LvGaumfL5YmZygjmmN03ZdASHU4Y+fvQa
-epj9evzpIByMzW8gc+zdRxH0zft/XtRX82n37Bhb4vCSAhAfnm187kohO8BprmlD
-AfewU5cCbSihKk3F5Vj7iHGU65g60i6xriQTFPICnI/IJxduAIo9i3j8RgHgiU7N
-dxx/yw7xi0TwivTrgu8yrOZ/kC9GUUZdIKzDrhr+my2GnjEjXcxMPhpT9IsnLooV
-owb8tEviWNv0KgXnopeqjagpVc65L4No955426KnUja1kWbDLOzZJFHpr6AA1HM=
-=AN7Y
+iQIcBAEBAgAGBQJPEFbYAAoJELEHsLL7fEFWUGkP/1hiLnBTldQZVvBNAvaBUkaJ
+smk7ctvrrq3ycMkzDfpp8/mm1I/zmFJ6Ma6fYWbKqx5udBOd0d2d2mqblHyW0awv
+tMbD0anePafTAbxQYi+SolVlvBHb8vd6VyrW03rvgb6CoaAsGFYX1BGegAmMz9Bp
+78q0Lmqfu1ZWJ2qDgBxFcACFO174RKMENZxX7AKCjVQk5JEoimbn2U3Jnm8HKI6V
+uLv6Ug2t6K8ekGd304hFRGN6lK9+ksCtVI1/Z6/4x4feQAFzxCAoFmp0uR1vlD0f
+7+/2sUyk3L0T292GEfHxwJ5zYHe/4kfNCGQ9wC3Sf8hyw5ivGlDkim2JAwkWe1mf
+BCgeX8Zob4JchafFv3rhGi7sX6quRUNlUsD84abQ4JP9rdseQluU3K/wO2uTY0Sw
+tZhoq347MFwzxDmjqCgamxHDLNfhxPnpUoj+hSgO8b9H0KteT9TSfcuQ6/7odqxc
+3/9/xUt54YbCAwtf8OZ362WTtYLA0S44tK0mCV/151BUOVcAPvOTjmtXpIAa+POG
+28AXP4lO+0zQg7u++sEB3R/YEg/s/LF0SgHaWV989W8iKrVvQAYplcEDyd7LYdmc
+KNnuSPAp05rsYw2OdYzDC58Cz6EIoqOPbr3TrAs6NHNNuCETUfFqCa9RDyfpTM0n
+lIa47g6P6UeHIqzlXqBg
+=MbTY
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libv4l/libv4l-0.8.5.ebuild b/media-libs/libv4l/libv4l-0.8.5.ebuild
index 5388dd096f8d..3b6caa7a02b7 100644
--- a/media-libs/libv4l/libv4l-0.8.5.ebuild
+++ b/media-libs/libv4l/libv4l-0.8.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libv4l/libv4l-0.8.5.ebuild,v 1.7 2011/12/30 13:14:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libv4l/libv4l-0.8.5.ebuild,v 1.8 2012/01/13 16:07:46 vapier Exp $
 
 EAPI=4
 inherit linux-info multilib toolchain-funcs
@@ -24,16 +24,20 @@ S=${WORKDIR}/${MY_P}
 
 CONFIG_CHECK="~SHMEM"
 
-src_compile() {
+src_prepare() {
+	sed -i \
+		-e "/^PREFIX =/s:=.*:= ${EPREFIX}/usr:" \
+		-e "/^LIBDIR =/s:/lib:/$(get_libdir):" \
+		-e "/^CFLAGS :=/d" \
+		Make.rules || die
 	tc-export CC
-	pushd lib
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" CFLAGS="${CFLAGS}"
-	popd
+}
+
+src_compile() {
+	emake -C lib
 }
 
 src_install() {
-	pushd lib
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
-	popd
+	emake -C lib DESTDIR="${D}" install
 	dodoc ChangeLog README.lib* TODO
 }