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

Package-Manager: portage-2.2.0_alpha169/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 101 insertions, 5 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/Manifest b/sys-libs/libosinfo/Manifest
index f0fe882b26d4..5ad15e21586a 100644
--- a/sys-libs/libosinfo/Manifest
+++ b/sys-libs/libosinfo/Manifest
@@ -1,14 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX libosinfo-0.2.6-destdir.patch 624 SHA256 a425e51347d95983414b8c58371dc3e183e6e30e1485e58c60d849da64daf143 SHA512 805c2be12406082e4ee2712eea0fe7b84f8d962faacf2f05f1014d6f967cc007d26d3202fa662074218ee2417803badbbd419dbd35698a86c1e550c7f7c8234d WHIRLPOOL 3f8ca1ef4a7fafa1e3a2f5c673542e01b44980365b9c806aaa2ce658d11b2106a15f9ec9ca6e514c8527a3e0a09bed7ac3f0cc2dc646a906c0465cc949e7c6be
 DIST libosinfo-0.2.4.tar.gz 1221090 SHA256 42023d5911feebd49acc15df1edde62c0717598985aff9533a34628bd26c78d7 SHA512 c50791013f4a566aba5ec1b14b2be8dc5d4eae532cecbc8e1cbcc2d4d917f8472b8fce32873f4251f5c5c7b374241c606a3ded17001cf243a62398549751c14e WHIRLPOOL 255ce07ccad6500fc6c4cafadce830e715310773271218683e8c503c5ce6c6263385ffff3b96b0161e7595ff1d91ccb29d1cf79d6107dac159bb643699e32f3c
+DIST libosinfo-0.2.6.tar.gz 1228644 SHA256 4c61a566d71e40936b8c327d63c2fa8287a03b50bac94a4d93cb094f17f71dc9 SHA512 e19d4e87844c79e00fb09d143e1e1cc5ab78ce50a78b45fd4a6235af992ddd499374ba91313863bd1838af2bc65d38e730c08243a2e0ac24827c51d1b5b4c669 WHIRLPOOL 425c6410ff00b4fe99ca7e39214228f16e052a1a294448d2fdaf4d9b74ccc8bbd5518be301933079411e747ea76fd3f5c3525dd0c6205835c0ff02ce180a8ec8
 EBUILD libosinfo-0.2.4.ebuild 1382 SHA256 96fc63857ca68a3822786f16d566fe08f3b6233db5398f8a3c71efe4b3249f9e SHA512 d4d5f7e21667145a1c04995faef02cf9452a8156164c5d7ed3739a696a419e513b7c42625f68ac1ff2ccd38ff2fa260cba5f0cd966b77c1422364a26e34a4c0f WHIRLPOOL 50de455c619a8fc6cd74f5994a1c5ab15babcd68d1987b96f4ef821fbdb023ef8ffa496316376571fa759c5dbb7458b59de8adadb01ef9daf701f1d77439bb9a
-MISC ChangeLog 3785 SHA256 058ba4aa63df132c37b3fd6cf859e516d4490ec129fa23c00e158aa6e240e8b5 SHA512 65890a45ccb0a589647372864a9394e9962468449f98877944b364c785b68a0c272212ef4f5a7c6156ef8d661c6e3dc22c443b0f66cd18cab9baf31908b46dbe WHIRLPOOL 217dd32c992548aaf4016a69e4028f7fdd3009aa115901de0a25aafc17737a2325561594e743edffa99c01e83da3964297b60459c49b76e9b1f1c194f5b00001
+EBUILD libosinfo-0.2.6.ebuild 1632 SHA256 fadeb75c83aba7bddbe3c1795d1f93c9f1845a53fdb2889a61ee19d76d65a6c8 SHA512 9e85479764e2dd2e2c6d378707cd1a317d7bb89c76bf374cb06408978d72b52010f384f68235ba21840e0a8146a629466e5dc861c35546add51be20d08e85a7f WHIRLPOOL 0cc842d0c107fcc8f0a514bd4194f296eab14a2a85588c8e71cc1bb92c80d98626d1c3bc7bbc9b80e429a7ef513ddf2a7d3181d024c1b7db68399a9fa8c441d1
+MISC ChangeLog 4072 SHA256 940c58807ae4bbbf5d22435d589d1f980b3869ed8d95662d5b748012a6858416 SHA512 fe56096180417c4a41a91283cd5b03da0c5b1235b8a5d3d19c975ba523b1e9055bd09f668ab13e77c8fd40aae7b5b37c10a70d997faf1e9e6ce026309e6e13dd WHIRLPOOL d97e143034f740f9f3b57aea70cb5324a4853158616b862f46a549b0610e0d358a93e48e9658a08245e02ff9c84560f6980008d9eab42a680ebefbf19ad490b0
 MISC metadata.xml 343 SHA256 f63e7ac53c26b3597f9b90aa85d0c365d30ca7080aa0b376340f15eef4423a91 SHA512 86f508e16c585c8ee807e356610ff9977b6f907bd394de9fbefa7e6d8dea456c856a80fb025c21113d91c6d8e9570a82853683174383769eba359d64dd7c30ad WHIRLPOOL 60e646074a3273e59d27688f1493af0fb0a07a73523da33b21092a7d88a48f956eefb93414b541b1657361ac89e304feeeca7fa7b1d155ae033ba63de4873a95
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFXHXUACgkQ1fmVwcYIWAZiwACcCbxNNTv90ASCXM5kz68xwBa/
-Uh8AoNYDgc66XdRt2Xx4rCcQoT9IjUWz
-=xjny
+iQEcBAEBCAAGBQJRVzFVAAoJEEdUh39IaPFNhgAH/1l+aXWzsQY/nU5M5hojRf4V
+cTU1vw2atbQ8a/AEmWALX1nIQsuOVGy8V5u4OlQy8hzXOhC4hpNhwjLT6avn2QLb
+oMxSXRt6YW8YTL9DckiO379M0mHB/ONIgni9enf/r+YLSuturYoJkBXEFqy3308Z
+ZEk4QBHnl2rTWoWUHnTeG43ZIr5KlGFurjLOQgTZjsVLhev1eJ0LDEizW/KmR0QL
+Dfjx9d7d9jfrCJi2XG9d9Gq2PPnzefSvkhkM2DJoMXLGmG2HMPaTini8G9xUx+4+
+phmvWZAjEkbQjzSVc3EluR03IntxyWM6Z/PmP1/HaETozuem4yqtMKrYENUkbps=
+=ACR0
 -----END PGP SIGNATURE-----
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
+}