blueness 14/03/27 22:57:43 Modified: eudev-9999.ebuild ChangeLog Log: Install multilib libgudev, bug #506002 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Revision Changes Path 1.44 sys-fs/eudev/eudev-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild?rev=1.44&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild?rev=1.44&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild?r1=1.43&r2=1.44 Index: eudev-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- eudev-9999.ebuild 25 Jan 2014 17:27:51 -0000 1.43 +++ eudev-9999.ebuild 27 Mar 2014 22:57:43 -0000 1.44 @@ -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/sys-fs/eudev/eudev-9999.ebuild,v 1.43 2014/01/25 17:27:51 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild,v 1.44 2014/03/27 22:57:43 blueness Exp $ EAPI="5" @@ -24,7 +24,7 @@ SLOT="0" IUSE="doc gudev +hwdb kmod introspection +keymap +modutils +openrc +rule-generator selinux static-libs test" -COMMON_DEPEND="gudev? ( dev-libs/glib:2 ) +COMMON_DEPEND="gudev? ( dev-libs/glib:2[${MULTILIB_USEDEP}] ) kmod? ( sys-apps/kmod ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) selinux? ( sys-libs/libselinux ) @@ -135,6 +135,8 @@ --with-html-dir="/usr/share/doc/${PF}/html" --enable-split-usr --exec-prefix=/ + + $(use_enable gudev) ) # Only build libudev for non-native_abi, and only install it to libdir, @@ -142,7 +144,6 @@ if multilib_build_binaries; then econf_args+=( --with-rootlibdir=/$(get_libdir) $(use_enable doc gtk-doc) - $(use_enable gudev) $(use_enable introspection) $(use_enable keymap) $(use_enable kmod libkmod) @@ -152,7 +153,7 @@ $(use_enable rule-generator) ) else econf_args+=( - $(echo --disable-{gtk-doc,gudev,introspection,keymap,libkmod,modules,static,selinux,rule-generator}) + $(echo --disable-{gtk-doc,introspection,keymap,libkmod,modules,static,selinux,rule-generator}) ) fi ECONF_SOURCE="${S}" econf "${econf_args[@]}" @@ -160,18 +161,22 @@ multilib_src_compile() { - if ! multilib_build_binaries; then - cd src/libudev || die "Could not change directory" + if multilib_build_binaries; then + emake + else + emake -C src/libudev + emake -C src/gudev fi - emake } multilib_src_install() { - if ! multilib_build_binaries; then - cd src/libudev || die "Could not change directory" + if multilib_build_binaries; then + emake DESTDIR="${D}" install + else + emake -C src/libudev DESTDIR="${D}" install + emake -C src/gudev DESTDIR="${D}" install fi - emake DESTDIR="${D}" install } multilib_src_test() 1.95 sys-fs/eudev/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/eudev/ChangeLog?rev=1.95&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/eudev/ChangeLog?rev=1.95&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/eudev/ChangeLog?r1=1.94&r2=1.95 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- ChangeLog 22 Mar 2014 23:29:39 -0000 1.94 +++ ChangeLog 27 Mar 2014 22:57:43 -0000 1.95 @@ -1,6 +1,9 @@ # ChangeLog for sys-fs/eudev # Copyright 1999- Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.94 2014/03/22 23:29:39 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.95 2014/03/27 22:57:43 blueness Exp $ + + 27 Mar 2014; Anthony G. Basile <bluen...@gentoo.org> eudev-9999.ebuild: + Install multilib libgudev, bug #506002 *eudev-1.5.3 (22 Mar 2014)
