summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-01-13 16:07:46 +0000
committerMike Frysinger <vapier@gentoo.org>2012-01-13 16:07:46 +0000
commit1dbddc775d0e597ceb83aaef565d14cab08b0b91 (patch)
tree25446d98b3c532400acdbf2f8d25e598cdb160b7 /media-libs/libv4l
parentEnable mergelibs. (diff)
downloadgentoo-2-1dbddc775d0e597ceb83aaef565d14cab08b0b91.tar.gz
gentoo-2-1dbddc775d0e597ceb83aaef565d14cab08b0b91.tar.bz2
gentoo-2-1dbddc775d0e597ceb83aaef565d14cab08b0b91.zip
Simplify ebuild a bit.
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/libv4l')
-rw-r--r--media-libs/libv4l/ChangeLog7
-rw-r--r--media-libs/libv4l/libv4l-0.8.5.ebuild22
2 files changed, 18 insertions, 11 deletions
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/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
}