Version bump wrt #460694. Use external pci.ids and usb.ids from sys-apps/hwids. Fix $(DESTDIR) handling in data/Makefile.am.

(Portage version: 2.2.0_alpha169/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 90 insertions, 1 deletions

diff --git a/sys-libs/libosinfo/ChangeLog b/sys-libs/libosinfo/ChangeLog
index 36eac694fe20..44007be6e1b5 100644
--- a/sys-libs/libosinfo/ChangeLog
+++ b/sys-libs/libosinfo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-libs/libosinfo
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libosinfo/ChangeLog,v 1.24 2013/03/30 17:14:28 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libosinfo/ChangeLog,v 1.25 2013/03/30 18:40:44 ssuominen Exp $
+
+*libosinfo-0.2.6 (30 Mar 2013)
+
+  30 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> +libosinfo-0.2.6.ebuild,
+  +files/libosinfo-0.2.6-destdir.patch:
+  Version bump wrt #460694. Use external pci.ids and usb.ids from
+  sys-apps/hwids. Fix $(DESTDIR) handling in data/Makefile.am.
 
   30 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org> -libosinfo-0.2.2.ebuild,
   -libosinfo-0.2.3.ebuild:
diff --git a/sys-libs/libosinfo/files/libosinfo-0.2.6-destdir.patch b/sys-libs/libosinfo/files/libosinfo-0.2.6-destdir.patch
new file mode 100644
index 000000000000..0f945e1e4651
--- /dev/null
+++ b/sys-libs/libosinfo/files/libosinfo-0.2.6-destdir.patch
@@ -0,0 +1,22 @@
+--- data/Makefile.am
++++ data/Makefile.am
+@@ -11,7 +11,8 @@
+ 	-wget -q -O $@ http://www.linux-usb.org/usb.ids
+ else
+ usb_ids_install:
+-	$(LN_S) $(USB_IDS) $(pkgdatadir)/db/usb.ids
++	-mkdir -p $(DESTDIR)$(pkgdatadir)/db/
++	$(LN_S) $(USB_IDS) $(DESTDIR)$(pkgdatadir)/db/usb.ids
+ INSTALL_DATA_HOOK_DEPS += usb_ids_install
+ endif
+ 
+@@ -22,7 +23,8 @@
+ 	-wget -q -O $@ http://pciids.sourceforge.net/v2.2/pci.ids
+ else
+ pci_ids_install:
+-	$(LN_S) $(PCI_IDS) $(pkgdatadir)/db/pci.ids
++	-mkdir -p $(DESTDIR)$(pkgdatadir)/db/
++	$(LN_S) $(PCI_IDS) $(DESTDIR)$(pkgdatadir)/db/pci.ids
+ INSTALL_DATA_HOOK_DEPS += pci_ids_install
+ endif
+ 
diff --git a/sys-libs/libosinfo/libosinfo-0.2.6.ebuild b/sys-libs/libosinfo/libosinfo-0.2.6.ebuild
new file mode 100644
index 000000000000..767981a8ef20
--- /dev/null
+++ b/sys-libs/libosinfo/libosinfo-0.2.6.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libosinfo/libosinfo-0.2.6.ebuild,v 1.1 2013/03/30 18:40:44 ssuominen Exp $
+
+EAPI=5
+VALA_MIN_API_VERSION="0.16"
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools eutils toolchain-funcs vala udev
+
+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"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+introspection +vala test"
+
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND=">=dev-libs/glib-2:2
+	>=dev-libs/libxslt-1.0.0:=
+	dev-libs/libxml2:=
+	net-libs/libsoup:2.4
+	net-libs/libsoup-gnome:2.4
+	sys-apps/hwids
+	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )"
+DEPEND="${RDEPEND}
+	dev-libs/gobject-introspection-common
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+	test? ( dev-libs/check )
+	vala? ( $(vala_depend) )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-destdir.patch
+	eautoreconf
+	vala_src_prepare
+}
+
+src_configure() {
+	# --enable-udev is only for rules.d file install
+	econf \
+		--disable-static \
+		$(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
+}