| 1 |
blueness 14/03/27 22:57:43 |
| 2 |
|
| 3 |
Modified: eudev-9999.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Install multilib libgudev, bug #506002 |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.44 sys-fs/eudev/eudev-9999.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild?rev=1.44&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild?rev=1.44&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild?r1=1.43&r2=1.44 |
| 15 |
|
| 16 |
Index: eudev-9999.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild,v |
| 19 |
retrieving revision 1.43 |
| 20 |
retrieving revision 1.44 |
| 21 |
diff -u -r1.43 -r1.44 |
| 22 |
--- eudev-9999.ebuild 25 Jan 2014 17:27:51 -0000 1.43 |
| 23 |
+++ eudev-9999.ebuild 27 Mar 2014 22:57:43 -0000 1.44 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2014 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild,v 1.43 2014/01/25 17:27:51 blueness Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild,v 1.44 2014/03/27 22:57:43 blueness Exp $ |
| 29 |
|
| 30 |
EAPI="5" |
| 31 |
|
| 32 |
@@ -24,7 +24,7 @@ |
| 33 |
SLOT="0" |
| 34 |
IUSE="doc gudev +hwdb kmod introspection +keymap +modutils +openrc +rule-generator selinux static-libs test" |
| 35 |
|
| 36 |
-COMMON_DEPEND="gudev? ( dev-libs/glib:2 ) |
| 37 |
+COMMON_DEPEND="gudev? ( dev-libs/glib:2[${MULTILIB_USEDEP}] ) |
| 38 |
kmod? ( sys-apps/kmod ) |
| 39 |
introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) |
| 40 |
selinux? ( sys-libs/libselinux ) |
| 41 |
@@ -135,6 +135,8 @@ |
| 42 |
--with-html-dir="/usr/share/doc/${PF}/html" |
| 43 |
--enable-split-usr |
| 44 |
--exec-prefix=/ |
| 45 |
+ |
| 46 |
+ $(use_enable gudev) |
| 47 |
) |
| 48 |
|
| 49 |
# Only build libudev for non-native_abi, and only install it to libdir, |
| 50 |
@@ -142,7 +144,6 @@ |
| 51 |
if multilib_build_binaries; then econf_args+=( |
| 52 |
--with-rootlibdir=/$(get_libdir) |
| 53 |
$(use_enable doc gtk-doc) |
| 54 |
- $(use_enable gudev) |
| 55 |
$(use_enable introspection) |
| 56 |
$(use_enable keymap) |
| 57 |
$(use_enable kmod libkmod) |
| 58 |
@@ -152,7 +153,7 @@ |
| 59 |
$(use_enable rule-generator) |
| 60 |
) |
| 61 |
else econf_args+=( |
| 62 |
- $(echo --disable-{gtk-doc,gudev,introspection,keymap,libkmod,modules,static,selinux,rule-generator}) |
| 63 |
+ $(echo --disable-{gtk-doc,introspection,keymap,libkmod,modules,static,selinux,rule-generator}) |
| 64 |
) |
| 65 |
fi |
| 66 |
ECONF_SOURCE="${S}" econf "${econf_args[@]}" |
| 67 |
@@ -160,18 +161,22 @@ |
| 68 |
|
| 69 |
multilib_src_compile() |
| 70 |
{ |
| 71 |
- if ! multilib_build_binaries; then |
| 72 |
- cd src/libudev || die "Could not change directory" |
| 73 |
+ if multilib_build_binaries; then |
| 74 |
+ emake |
| 75 |
+ else |
| 76 |
+ emake -C src/libudev |
| 77 |
+ emake -C src/gudev |
| 78 |
fi |
| 79 |
- emake |
| 80 |
} |
| 81 |
|
| 82 |
multilib_src_install() |
| 83 |
{ |
| 84 |
- if ! multilib_build_binaries; then |
| 85 |
- cd src/libudev || die "Could not change directory" |
| 86 |
+ if multilib_build_binaries; then |
| 87 |
+ emake DESTDIR="${D}" install |
| 88 |
+ else |
| 89 |
+ emake -C src/libudev DESTDIR="${D}" install |
| 90 |
+ emake -C src/gudev DESTDIR="${D}" install |
| 91 |
fi |
| 92 |
- emake DESTDIR="${D}" install |
| 93 |
} |
| 94 |
|
| 95 |
multilib_src_test() |
| 96 |
|
| 97 |
|
| 98 |
|
| 99 |
1.95 sys-fs/eudev/ChangeLog |
| 100 |
|
| 101 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/eudev/ChangeLog?rev=1.95&view=markup |
| 102 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/eudev/ChangeLog?rev=1.95&content-type=text/plain |
| 103 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/eudev/ChangeLog?r1=1.94&r2=1.95 |
| 104 |
|
| 105 |
Index: ChangeLog |
| 106 |
=================================================================== |
| 107 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v |
| 108 |
retrieving revision 1.94 |
| 109 |
retrieving revision 1.95 |
| 110 |
diff -u -r1.94 -r1.95 |
| 111 |
--- ChangeLog 22 Mar 2014 23:29:39 -0000 1.94 |
| 112 |
+++ ChangeLog 27 Mar 2014 22:57:43 -0000 1.95 |
| 113 |
@@ -1,6 +1,9 @@ |
| 114 |
# ChangeLog for sys-fs/eudev |
| 115 |
# Copyright 1999- Gentoo Foundation; Distributed under the GPL v2 |
| 116 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.94 2014/03/22 23:29:39 blueness Exp $ |
| 117 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.95 2014/03/27 22:57:43 blueness Exp $ |
| 118 |
+ |
| 119 |
+ 27 Mar 2014; Anthony G. Basile <blueness@g.o> eudev-9999.ebuild: |
| 120 |
+ Install multilib libgudev, bug #506002 |
| 121 |
|
| 122 |
*eudev-1.5.3 (22 Mar 2014) |
Archives