[gentoo-commits] proj/gnome:master commit in: sys-libs/libosinfo/

[Gilles Dartiguelongue]

commit:     a040e803aa7b8f46d17cb259655e7db6dbefc073
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 20 16:16:41 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Apr 20 16:28:53 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a040e803

sys-libs/libosinfo: 0.2.7 → 0.2.10

---
 ...bosinfo-9999.ebuild => libosinfo-0.2.10.ebuild} | 27 ++++------------------
 sys-libs/libosinfo/libosinfo-9999.ebuild           |  3 ++-
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/sys-libs/libosinfo/libosinfo-9999.ebuild 
b/sys-libs/libosinfo/libosinfo-0.2.10.ebuild
similarity index 67%
copy from sys-libs/libosinfo/libosinfo-9999.ebuild
copy to sys-libs/libosinfo/libosinfo-0.2.10.ebuild
index ebe19a8..e3d99d8 100644
--- a/sys-libs/libosinfo/libosinfo-9999.ebuild
+++ b/sys-libs/libosinfo/libosinfo-0.2.10.ebuild
@@ -7,25 +7,16 @@ VALA_MIN_API_VERSION="0.16"
 VALA_USE_DEPEND="vapigen"
 
 inherit 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/";
+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 )"
-if [[ ${PV} = 9999 ]]; then
-       EGIT_REPO_URI="git://git.fedorahosted.org/${PN}.git"
-       KEYWORDS=""
-       IUSE="${IUSE} doc"
-else
-       
SRC_URI="http://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.gz";
-       KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
        >=dev-libs/glib-2:2
@@ -33,7 +24,7 @@ RDEPEND="
        dev-libs/libxml2:=
        net-libs/libsoup-gnome:2.4
        sys-apps/hwids
-       introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
+       introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
 "
 DEPEND="${RDEPEND}
        dev-libs/gobject-introspection-common
@@ -43,25 +34,17 @@ DEPEND="${RDEPEND}
        vala? ( $(vala_depend) )
 "
 
-if [[ ${PV} = 9999 ]]; then
-       DEPEND="${DEPEND}
-               doc? ( >=dev-util/gtk-doc-1.10 )"
-fi
-
-src_prepare() {
-       use vala && vala_src_prepare
-}
-
 src_configure() {
        # --enable-udev is only for rules.d file install
        econf \
                --disable-static \
-               $(use_enable doc gtk-doc) \
+               --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

diff --git a/sys-libs/libosinfo/libosinfo-9999.ebuild 
b/sys-libs/libosinfo/libosinfo-9999.ebuild
index ebe19a8..3ff1287 100644
--- a/sys-libs/libosinfo/libosinfo-9999.ebuild
+++ b/sys-libs/libosinfo/libosinfo-9999.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
        dev-libs/libxml2:=
        net-libs/libsoup-gnome:2.4
        sys-apps/hwids
-       introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
+       introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
 "
 DEPEND="${RDEPEND}
        dev-libs/gobject-introspection-common
@@ -62,6 +62,7 @@ src_configure() {
                $(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