commit:     b4e6454ae40b3e49fc7809cf5159d59e78cb1baf
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 23 21:53:21 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Dec 23 21:53:21 2014 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b4e6454a

sys-libs/libosinfo: moved to gentoo-x86, sync live ebuild

Also, do not change directory for gtk-doc documentation.

---
 sys-libs/libosinfo/libosinfo-0.2.10.ebuild | 56 ------------------------------
 sys-libs/libosinfo/libosinfo-9999.ebuild   | 17 ++++-----
 2 files changed, 6 insertions(+), 67 deletions(-)

diff --git a/sys-libs/libosinfo/libosinfo-0.2.10.ebuild 
b/sys-libs/libosinfo/libosinfo-0.2.10.ebuild
deleted file mode 100644
index e3d99d8..0000000
--- a/sys-libs/libosinfo/libosinfo-0.2.10.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-VALA_MIN_API_VERSION="0.16"
-VALA_USE_DEPEND="vapigen"
-
-inherit udev vala
-
-DESCRIPTION="GObject library for managing information about real and virtual 
OSes"
-HOMEPAGE="http://fedorahosted.org/libosinfo/";
-SRC_URI="http://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.gz";
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-IUSE="+introspection +vala test"
-REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-       >=dev-libs/glib-2:2
-       >=dev-libs/libxslt-1.0.0:=
-       dev-libs/libxml2:=
-       net-libs/libsoup-gnome:2.4
-       sys-apps/hwids
-       introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-"
-DEPEND="${RDEPEND}
-       dev-libs/gobject-introspection-common
-       >=dev-util/gtk-doc-am-1.10
-       virtual/pkgconfig
-       test? ( dev-libs/check )
-       vala? ( $(vala_depend) )
-"
-
-src_configure() {
-       # --enable-udev is only for rules.d file install
-       econf \
-               --disable-static \
-               --disable-gtk-doc \
-               $(use_enable test tests) \
-               $(use_enable introspection) \
-               $(use_enable vala) \
-               --enable-udev \
-               --disable-coverage \
-               --with-html-dir=/usr/share/doc/${PF}/html \
-               --with-udev-rulesdir="$(get_udevdir)"/rules.d \
-               --with-usb-ids-path=/usr/share/misc/usb.ids \
-               --with-pci-ids-path=/usr/share/misc/pci.ids
-}
-
-src_install() {
-       default
-       prune_libtool_files
-}

diff --git a/sys-libs/libosinfo/libosinfo-9999.ebuild 
b/sys-libs/libosinfo/libosinfo-9999.ebuild
index 3ff1287..5d06b03 100644
--- a/sys-libs/libosinfo/libosinfo-9999.ebuild
+++ b/sys-libs/libosinfo/libosinfo-9999.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=5
+GCONF_DEBUG="no"
 VALA_MIN_API_VERSION="0.16"
 VALA_USE_DEPEND="vapigen"
 
-inherit udev vala
+inherit gnome2 udev vala
 if [[ ${PV} = 9999 ]]; then
        inherit gnome2-live
 fi
 
 DESCRIPTION="GObject library for managing information about real and virtual 
OSes"
-HOMEPAGE="http://fedorahosted.org/libosinfo/";
+HOMEPAGE="http://libosinfo.org/";
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
@@ -50,25 +51,19 @@ fi
 
 src_prepare() {
        use vala && vala_src_prepare
+       gnome2_src_prepare
 }
 
 src_configure() {
        # --enable-udev is only for rules.d file install
-       econf \
+       gnome2_src_configure \
                --disable-static \
-               $(use_enable doc gtk-doc) \
                $(use_enable test tests) \
                $(use_enable introspection) \
                $(use_enable vala) \
                --enable-udev \
                --disable-coverage \
-               --with-html-dir=/usr/share/doc/${PF}/html \
                --with-udev-rulesdir="$(get_udevdir)"/rules.d \
                --with-usb-ids-path=/usr/share/misc/usb.ids \
                --with-pci-ids-path=/usr/share/misc/pci.ids
 }
-
-src_install() {
-       default
-       prune_libtool_files
-}

Reply via email to