[gentoo-commits] gentoo-x86 commit in sys-fs/device-mapper: ChangeLog device-mapper-1.02.27.ebuild

["Mike Frysinger (vapier)" <vapier@gentoo.org>]

vapier      08/10/26 03:03:36

  Modified:             ChangeLog device-mapper-1.02.27.ebuild
  Log:
  Enable pkg-config and tweak how we install into /lib #235256 by Xake.
  (Portage version: 2.2_rc12/cvs/Linux 2.6.26.2 x86_64)

Revision  Changes    Path
1.121                sys-fs/device-mapper/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/device-mapper/ChangeLog?rev=1.121&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/device-mapper/ChangeLog?rev=1.121&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/device-mapper/ChangeLog?r1=1.120&r2=1.121

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/ChangeLog,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- ChangeLog	26 Oct 2008 02:55:25 -0000	1.120
+++ ChangeLog	26 Oct 2008 03:03:36 -0000	1.121
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/device-mapper
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/ChangeLog,v 1.120 2008/10/26 02:55:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/ChangeLog,v 1.121 2008/10/26 03:03:36 vapier Exp $
+
+  26 Oct 2008; Mike Frysinger <vapier@gentoo.org>
+  device-mapper-1.02.27.ebuild:
+  Enable pkg-config and tweak how we install into /lib #235256 by Xake.
 
   26 Oct 2008; Mike Frysinger <vapier@gentoo.org>
   files/device-mapper.rc-1.02.22-r3:



1.2                  sys-fs/device-mapper/device-mapper-1.02.27.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/device-mapper/device-mapper-1.02.27.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/device-mapper/device-mapper-1.02.27.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/device-mapper/device-mapper-1.02.27.ebuild?r1=1.1&r2=1.2

Index: device-mapper-1.02.27.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/device-mapper-1.02.27.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- device-mapper-1.02.27.ebuild	28 Jun 2008 09:10:48 -0000	1.1
+++ device-mapper-1.02.27.ebuild	26 Oct 2008 03:03:36 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/device-mapper-1.02.27.ebuild,v 1.1 2008/06/28 09:10:48 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/device-mapper/device-mapper-1.02.27.ebuild,v 1.2 2008/10/26 03:03:36 vapier Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -27,8 +27,10 @@
 
 src_compile() {
 	econf \
+		--libdir=/$(get_libdir) \
 		--sbindir=/sbin \
 		--enable-dmeventd \
+		--enable-pkgconfig \
 		$(use_enable selinux) \
 		CLDFLAGS="${LDFLAGS}" || die "econf failed"
 	emake || die "compile problem"
@@ -37,24 +39,22 @@
 src_install() {
 	emake install DESTDIR="${D}" || die
 
-	# move shared libs to /
-	mv "${D}"/usr/$(get_libdir) "${D}"/ || die "move libdir"
-	dolib.a lib/ioctl/libdevmapper.a || die "dolib.a"
+	dolib.a lib/ioctl/libdevmapper.a || die
 	gen_usr_ldscript libdevmapper.so
+	dolib.a dmeventd/libdevmapper-event.a || die
+	gen_usr_ldscript libdevmapper-event.so
 
 	insinto /etc
-	doins "${FILESDIR}"/dmtab
+	doins "${FILESDIR}"/dmtab || die
 	insinto /lib/rcscripts/addons
-	doins "${FILESDIR}"/dm-start.sh
+	doins "${FILESDIR}"/dm-start.sh || die
 
 	newinitd "${FILESDIR}"/device-mapper.rc-1.02.22-r3 device-mapper || die
 	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper || die
 
 	newinitd "${FILESDIR}"/1.02.22-dmeventd.initd dmeventd || die
-	dolib.a dmeventd/libdevmapper-event.a || die
-	gen_usr_ldscript libdevmapper-event.so
 
-	insinto /etc/udev/rules.d/
+	insinto /etc/udev/rules.d
 	newins "${FILESDIR}"/64-device-mapper.rules-1.02.22-r5 64-device-mapper.rules
 
 	dodoc INSTALL INTRO README VERSION WHATS_NEW