Bump to 1.26.1

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8DBDADE

8 files changed, 263 insertions, 7 deletions

diff --git a/app-emulation/libguestfs/ChangeLog b/app-emulation/libguestfs/ChangeLog
index 2b98084e1964..18a6c0fa35e4 100644
--- a/app-emulation/libguestfs/ChangeLog
+++ b/app-emulation/libguestfs/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-emulation/libguestfs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libguestfs/ChangeLog,v 1.34 2014/03/08 13:15:42 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libguestfs/ChangeLog,v 1.35 2014/05/01 19:23:28 maksbotan Exp $
+
+*libguestfs-1.26.1 (01 May 2014)
+
+  01 May 2014; Maxim Koltsov <maksbotan@gentoo.org>
+  +files/1.26/0000_bug_499150.patch,
+  +files/1.26/0001_add_gentoo_names_to_configure.patch,
+  +files/1.26/0002_add_gentooway_to_remove_la_files.patch,
+  +files/1.26/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch,
+  +files/1.26/0103_disable_php_bindings_makefile.patch,
+  +libguestfs-1.26.1.ebuild:
+  Bump to 1.26.1
 
   08 Mar 2014; Mikle Kolyada <zlogene@gentoo.org>
   -files/1.20/0001_add_gentoo_names_to_configure.patch,
diff --git a/app-emulation/libguestfs/Manifest b/app-emulation/libguestfs/Manifest
index 8e543c244024..6fdeea52929e 100644
--- a/app-emulation/libguestfs/Manifest
+++ b/app-emulation/libguestfs/Manifest
@@ -6,17 +6,26 @@ AUX 1.24/0002_add_gentooway_to_remove_la_files.patch 555 SHA256 fc65ce8df2f910c1
 AUX 1.24/0004_add_icoutils_configure_drop_automagic.patch 2163 SHA256 48575ced48bbcf1f4de318eb274a9d2dd4ecd65e7bf10cfeb8d322fc995307ce SHA512 d65b0682ee1900059f43b8fd211d84ef842dda3f436f14f00376aaec9d3d4100ace75a498140c5784edbe0c0398b35866fc6df7be5c4e8d7062c54246f45eeee WHIRLPOOL d654be999258db4f59677faf60ba62645e09331d5f751f1a2d96cab88bdab4f157ebd557fc0330819c9ccf445c88c502587c50c67bf6b94d156533a29b6403ff
 AUX 1.24/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch 508 SHA256 10d75b8c50995ac7ec07f7f7d98c41f4871dcb7094873398c8d71dff3cf8a7d9 SHA512 9801326dfd2fd39202f8bd0765b954c3947e829d9568bda9a50c14388b9e7d6855c2fd38976fe98cd1183163d220b3795ec1105becb49a9de34459bb2ea74112 WHIRLPOOL 595699b9084be65847de0bd5969d0f50392cd53d830dad30eca0a9a9c8f336e680c068db59864d9efa67f91e00268ef91ba6b843f192056eb09c291b113be05b
 AUX 1.24/0103_disable_php_bindings_makefile.patch 231 SHA256 f5b73f353746d7f945c8948e6b7bb2d192dd653a92124aefe578b49960179d1a SHA512 b359cd29ab9cb6edec5a4cab1d84b022ae6ff42c3adae75051ab0d8c87dda39fff17e02ada3a863177e3dd979dffd4958cbc3c71cdca89196c74f1ebd14a8da3 WHIRLPOOL 0e95d9b60744f4dae6c7599d899d57cbb9a8f656b3cbb5dc19667f679c472d749808932c8ec7826da26d3599f2d9f22b99410a2399048376e01ed9dde7284d5d
+AUX 1.26/0000_bug_499150.patch 406 SHA256 3811f091d4189327719aca7ffab726452a995b5b9ab287f54153aa9b5750fd44 SHA512 a131e49f9e9d3cf6080e0f3ad27805572a1e05a01f348a1ffad62b75d24cb72526bf68035b9a600fb1ae3864e813768a971c6b7d6f31f4a8467b4a6839ebb568 WHIRLPOOL da21e3d2aae5dc3339b50788de4e92756bce9411d4bb56344d503376d5ead4a7f4981ff5c67520811fd33914f5726d322ff6141c52c048c88bb1d1fbdb7ad058
+AUX 1.26/0001_add_gentoo_names_to_configure.patch 262 SHA256 0d18682bc8666cb3e6aab79731925acfae5a636b8ad6bb75b3dc4d63fae27dec SHA512 9e6ef0c0475c5b180bc0ca7ded197901e25383e0359c429514e9c0217b7059d5f900a19d30d7d864a386279be0fd45bd9d41c56062b48c11dff31a8f92c5b789 WHIRLPOOL dcc96a8e752653ca9aaa5676266ffe20b69bf168bb955428807f0134cbfc2dd379e5250919da0e9a48dfbd84d62ceb98c1acc0025e794aa5ecfaec02945e9783
+AUX 1.26/0002_add_gentooway_to_remove_la_files.patch 555 SHA256 fc65ce8df2f910c1ac1c4466c8f529fc442b136914b9f50ce1b910834349ca59 SHA512 5dd8f7a8eeed6e2e4e842cd9fb5fde5104ab47bfddcbe218107e181c3891350eb425648667c4d70becb437bbf52506035b20778ea3a7954f020e4a2be76f959b WHIRLPOOL e776522e5a2e14c3dea2f35ac3de1f36763ec6eaa2c29e2d32a062c4df2946268d54bd6be5216caf861979dc442ac9b0c2ce8a6b765a09f53ea56258cb0b6ef2
+AUX 1.26/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch 508 SHA256 10d75b8c50995ac7ec07f7f7d98c41f4871dcb7094873398c8d71dff3cf8a7d9 SHA512 9801326dfd2fd39202f8bd0765b954c3947e829d9568bda9a50c14388b9e7d6855c2fd38976fe98cd1183163d220b3795ec1105becb49a9de34459bb2ea74112 WHIRLPOOL 595699b9084be65847de0bd5969d0f50392cd53d830dad30eca0a9a9c8f336e680c068db59864d9efa67f91e00268ef91ba6b843f192056eb09c291b113be05b
+AUX 1.26/0103_disable_php_bindings_makefile.patch 231 SHA256 f5b73f353746d7f945c8948e6b7bb2d192dd653a92124aefe578b49960179d1a SHA512 b359cd29ab9cb6edec5a4cab1d84b022ae6ff42c3adae75051ab0d8c87dda39fff17e02ada3a863177e3dd979dffd4958cbc3c71cdca89196c74f1ebd14a8da3 WHIRLPOOL 0e95d9b60744f4dae6c7599d899d57cbb9a8f656b3cbb5dc19667f679c472d749808932c8ec7826da26d3599f2d9f22b99410a2399048376e01ed9dde7284d5d
 AUX env.file 47 SHA256 265f18ec70d803a243b16303638ef6347212a93318da71bd9e15b6dc7dc2d11a SHA512 74b5c63ab4421238b4e2c54dfc9579dea719101c0b9066341ddf3aa64ff1ed739e6d38e837b388ded1f741bc57c47a52772bf22ee52318acc5cb34908f1df1fd WHIRLPOOL 6dc3bbd8ed439f4ad3e51f0a0ebffd9490d14dba7c32fd8c39d6e0c8bbf11af344cc4bd445ef9f74c085b5160e3c6e97715b507cd46bb2a80d0920475d1d7301
 DIST libguestfs-1.24.0.tar.gz 11017148 SHA256 72771e793a4de53d1214ed9d000d93dd6b9958384fb354b917e2d3283d79f363 SHA512 e19a257ba049d038e322f6a53866b448262e48841abe54b8bd36dd94af894b8d4ef61fede6b35e085d81c702b00526d2ef1388b0a4170c780d5d7da2e0ae5ea2 WHIRLPOOL e80329e0b13ee25f7e40c6ae0500f50c9de242a0ea39f3c5f5b202ed121324de35d7dcf90498bd53025f485e615a536cc07f4e3f01a945017af532f218ae82c2
+DIST libguestfs-1.26.1.tar.gz 11912359 SHA256 d047f951e79cc2f00b62a7e8d4e3acf18bb69c6be0a75884158923828b5264f6 SHA512 080a90d54b2063e2bf133c456a0624d63678cf7f80aa485dc5fd0c1d3577056c9fb894fd4fec67cbab29ac70f3b1c9ab070cf86ba5a09a8c8fc266f490c68809 WHIRLPOOL 54193361453d8d51da8070d0b4b5fe4e28fbf5e39aedbb3991c6f20876fed8a9f9c41218048dec697894d06d0edb29c887030edb38da899eb336278dd60ad974
 EBUILD libguestfs-1.24.0.ebuild 3694 SHA256 74e185484aadcf35c1ae1c4cb49dc52d2445800f964ce852d000e1b4c63d106f SHA512 7f13ce0a1a213259f5529b5696ca94f865f4c8dbfa46136f7c03865b630fdb5fc8c7e9c8917e2ac927cbefa7714a8a2011e509103431a74088e746ed8d285e2b WHIRLPOOL cfdd357faeda3e084df7edafa6ff63cb0ecfb2ee33da0dc1b267e9e9b5c21fa613d49bd1c9ab0725f840191d21eb628ec55dcbc24fa9309ebf44d362bd47fbb6
-MISC ChangeLog 17645 SHA256 a74a36ec95a0dd1f4bc180d858632fec8c3bdf7a13cbe575fb1a08a7bf903b5c SHA512 199e8dc6be0720bc5f7ac897d067fc402b313c67aedeffc5fa9606a6012fbd957a825ff714f439fec0b81078e610b2b7d8b5ce3687dcb9d05b6c028d220cf98b WHIRLPOOL 2cb3a201b6fe5e3f880b11b628d0b4d245e9be75bad3b4a65b2ea42a7130eb82c790cc330cf69bf1627bb013d566d6ecc1356cd158bf8d63d662a60f3caaaf35
+EBUILD libguestfs-1.26.1.ebuild 3693 SHA256 767db9775c7aad080f606d5e65c05515fc65c4914899f27e3eb839122883b206 SHA512 42c197c555028923698d48878f4b93c06fd459e86fd2e610c8da4ca765b4ce0811496dd390f0157cd3b32834d862eb312a49def86432ce28502b289809dc650f WHIRLPOOL f06a969ef4d89068a8a757f9bd7ba5573e40b6f4bbae6d65467822bfcb3246c6852f386eef31361a6e789f6c4a8940f15b7253a74584cdf2838398114468f9ae
+MISC ChangeLog 18063 SHA256 5ffdcb5fbb2b697cc320c8fefcda6edada36416a0100a384b5d1ffcf58af17f5 SHA512 b21e9283041fa0252c4b81deadaf158f5bc5dcbf735c95cba49cd49d2f3fab1d2fd0d98dbbbeed54932ebf22d12070b8c85d699b6e4960e3c12e7532600bdebe WHIRLPOOL 4616054b798e14337bc1c4df035892c8c488d15d58a85da2194ea71ddee743c0ef2e4c5163788cb95508aafca919991e48b0f27b4d9d146b7ed4e8315dca3965
 MISC metadata.xml 1104 SHA256 608f76ad5aa195e6992e84c760b290d7a125d29c1b59c5531301da36e41e10af SHA512 17807bb807f9651bd2cb40c7f0b3d10329baff4f9026c973f4668fb2d2e046cb16a5c2f5d38cd6a1d3d2bd6b0e02cda1209aa484de90e914f127b63a0bd54c6d WHIRLPOOL f13ff36105bdd7a9093cc139e0eaa079f5693187c0306fb5e1b580341176291e04405c69dd4a7c4c6ceac8454f9356cb2537b7ce7518588d345ae8c35e39283e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iJwEAQEIAAYFAlMbGVwACgkQG9wOWsQutdb6cAQAiN2+3nEtc0QRwGNMcFtDwcRl
-65XLJ0YNeN7alOQq+UJqVqS3BEyTFLVJ2pTc2x1IXLyQS4BF3FTzTG/iq0/4NNvx
-H+r9lhvN9ddCtgOxV81lQna8tFZgq6xrQAvEOi6/7s3vfA3KUOEc6y4YktvZh2h/
-jMS3Lky8ibLq+pvCeGQ=
-=YE1G
+iQEcBAEBCAAGBQJTYp8oAAoJEAmJmMX429reS+sH/2tmcNv3mhFWm0ty3TGJe7Kw
+L1d1jHimYktmOkD6tirYASI1YqOO4mMkCcBLYH4LBpi0RjHhPCXR8WNv2lUadggy
+EhgWpdamCK379eRNeFzhDPbEnV9j61hghh8vll/K10prIRL2AQt/gHbZKMGUuvt9
+1jRygi341v0X+5BJmUjuQ7OHbY1F0jT4FWv+Nl/+P+wGj4YYcTTlksdurLjxbQz6
+CinyL/gCcMM++VT2WnHceCA5kvWZOSeAwQyaupzrfxIcWmZJLo9tXgRdmsOZcNMA
+7mL5M5NTienkTCvaNwwwhVX/keyOUbLp1Xz2zak+Lt5g+fILbNMtcH5LMSqkitE=
+=V+8w
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/libguestfs/files/1.26/0000_bug_499150.patch b/app-emulation/libguestfs/files/1.26/0000_bug_499150.patch
new file mode 100644
index 000000000000..1e0f1a32185e
--- /dev/null
+++ b/app-emulation/libguestfs/files/1.26/0000_bug_499150.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac	2014-01-24 19:04:05.633056872 +0100
++++ b/configure.ac	2014-01-24 19:04:34.685691757 +0100
+@@ -24,6 +24,7 @@
+ 
+ AC_INIT([libguestfs],libguestfs_major.libguestfs_minor.libguestfs_release)
+ AC_CONFIG_AUX_DIR([build-aux])
++AM_GNU_GETTEXT_VERSION(0.18.3)
+ 
+ dnl Initialize automake.  automake < 1.12 didn't have serial-tests and
+ dnl gives an error if it sees this, but for automake >= 1.13
diff --git a/app-emulation/libguestfs/files/1.26/0001_add_gentoo_names_to_configure.patch b/app-emulation/libguestfs/files/1.26/0001_add_gentoo_names_to_configure.patch
new file mode 100644
index 000000000000..9d209ff53584
--- /dev/null
+++ b/app-emulation/libguestfs/files/1.26/0001_add_gentoo_names_to_configure.patch
@@ -0,0 +1,15 @@
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -482,6 +482,11 @@
+         DISTRO=UBUNTU
+     fi
+ fi
++
++if test -f /etc/gentoo-release; then
++    DISTRO=GENTOO
++fi
++
+ if test -f /etc/arch-release; then
+     DISTRO=ARCHLINUX
+ fi
diff --git a/app-emulation/libguestfs/files/1.26/0002_add_gentooway_to_remove_la_files.patch b/app-emulation/libguestfs/files/1.26/0002_add_gentooway_to_remove_la_files.patch
new file mode 100644
index 000000000000..38a591b811ed
--- /dev/null
+++ b/app-emulation/libguestfs/files/1.26/0002_add_gentooway_to_remove_la_files.patch
@@ -0,0 +1,16 @@
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -1487,8 +1487,10 @@
+ 
+ dnl Replace libtool with a wrapper that clobbers dependency_libs in *.la files
+ dnl http://lists.fedoraproject.org/pipermail/devel/2010-November/146343.html
+-LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool'
+-AC_SUBST([LIBTOOL])
++dnl LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool'
++dnl AC_SUBST([LIBTOOL])
++LT_INIT
++
+ 
+ dnl Produce output files.
+ AC_CONFIG_HEADERS([config.h])
diff --git a/app-emulation/libguestfs/files/1.26/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch b/app-emulation/libguestfs/files/1.26/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch
new file mode 100644
index 000000000000..69b3ae6d0d2d
--- /dev/null
+++ b/app-emulation/libguestfs/files/1.26/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch
@@ -0,0 +1,21 @@
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -1491,11 +1491,12 @@
+ ])
+ 
+ # check for gtk-doc
+-m4_ifdef([GTK_DOC_CHECK], [
+-    GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
+-],[
+-    AM_CONDITIONAL([ENABLE_GTK_DOC], false)
+-])
++#m4_ifdef([GTK_DOC_CHECK], [
++#    GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
++#],[
++#    AM_CONDITIONAL([ENABLE_GTK_DOC], false)
++#])
++GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
+ 
+ dnl Library versioning.
+ MAX_PROC_NR=`cat $srcdir/src/MAX_PROC_NR`
diff --git a/app-emulation/libguestfs/files/1.26/0103_disable_php_bindings_makefile.patch b/app-emulation/libguestfs/files/1.26/0103_disable_php_bindings_makefile.patch
new file mode 100644
index 000000000000..34ab42d27903
--- /dev/null
+++ b/app-emulation/libguestfs/files/1.26/0103_disable_php_bindings_makefile.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.am b/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -88,9 +88,6 @@
+ if HAVE_HASKELL
+ SUBDIRS += haskell
+ endif
+-if HAVE_PHP
+-SUBDIRS += php
+-endif
+ if HAVE_ERLANG
+ SUBDIRS += erlang erlang/examples
+ endif
diff --git a/app-emulation/libguestfs/libguestfs-1.26.1.ebuild b/app-emulation/libguestfs/libguestfs-1.26.1.ebuild
new file mode 100644
index 000000000000..02830c65edb6
--- /dev/null
+++ b/app-emulation/libguestfs/libguestfs-1.26.1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libguestfs/libguestfs-1.26.1.ebuild,v 1.1 2014/05/01 19:23:28 maksbotan Exp $
+
+EAPI="5"
+
+WANT_LIBTOOL=latest
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit autotools-utils autotools versionator eutils \
+multilib linux-info perl-module base
+
+MY_PV_1="$(get_version_component_range 1-2)"
+MY_PV_2="$(get_version_component_range 2)"
+
+[[ $(( $(get_version_component_range 2) % 2 )) -eq 0 ]] && SD="stable" || SD="development"
+
+DESCRIPTION="Tools for accessing, inspect  and modifying virtual machine (VM) disk images"
+HOMEPAGE="http://libguestfs.org/"
+SRC_URI="http://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0/${MY_PV_1}"
+
+KEYWORDS="~amd64"
+IUSE="erlang +fuse debug +ocaml doc +perl ruby static-libs
+selinux systemtap introspection inspect-icons test lua"
+
+# Failires - doc
+# Failures - bash-completion, see GBZ #486306
+
+COMMON_DEPEND="
+	sys-libs/ncurses
+	sys-devel/gettext
+	>=app-misc/hivex-1.3.1
+	dev-libs/libpcre
+	app-arch/cpio
+	dev-lang/perl
+	app-cdr/cdrkit
+	>=app-emulation/qemu-1.2.2[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64,tci,systemtap?,selinux?,filecaps]
+	sys-apps/fakeroot
+	sys-apps/file
+	app-emulation/libvirt
+	dev-libs/libxml2:2
+	>=sys-apps/fakechroot-2.8
+	>=app-admin/augeas-1.0.0
+	sys-fs/squashfs-tools
+	dev-libs/libconfig
+	dev-libs/libpcre
+	sys-libs/readline
+	>=sys-libs/db-4.6
+	perl? ( virtual/perl-ExtUtils-MakeMaker
+			>=dev-perl/Sys-Virt-0.2.4
+			virtual/perl-Getopt-Long
+			virtual/perl-Data-Dumper
+			dev-perl/libintl-perl
+			>=app-misc/hivex-1.3.1[perl?]
+			dev-perl/String-ShellQuote
+			)
+	fuse? ( sys-fs/fuse )
+	introspection? (
+		>=dev-libs/gobject-introspection-1.30.0
+		dev-libs/gjs
+		)
+	selinux? ( sys-libs/libselinux  sys-libs/libsemanage )
+	systemtap? ( dev-util/systemtap )
+	ocaml? ( dev-lang/ocaml[ocamlopt]
+			dev-ml/findlib[ocamlopt]
+			dev-ml/ocaml-gettext
+			)
+	erlang? ( dev-lang/erlang )
+	inspect-icons? ( media-libs/netpbm
+			media-gfx/icoutils
+			)
+	virtual/acl
+	sys-libs/libcap
+	lua? ( dev-lang/lua )
+	"
+
+DEPEND="${COMMON_DEPEND}
+	dev-util/gperf
+	doc? ( app-text/po4a )
+	ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake )
+	"
+RDEPEND="${COMMON_DEPEND}
+	app-emulation/libguestfs-appliance
+	"
+
+PATCHES=( "${FILESDIR}/${MY_PV_1}"/*.patch  )
+
+DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO )
+
+pkg_setup () {
+		CONFIG_CHECK="~KVM ~VIRTIO"
+		[ -n "${CONFIG_CHECK}" ] && check_extra_config;
+}
+
+src_prepare() {
+	base_src_prepare
+	eaclocal
+	eautomake
+	eautoconf
+}
+
+src_configure() {
+
+	# Disable feature test for kvm for more reason
+	# i.e: not loaded module in __build__ time,
+	# build server not supported kvm, etc. ...
+	#
+	# In fact, this feature is virtio support and requires
+	# configured kernel.
+	export vmchannel_test=no
+
+	local myeconfargs=(
+		$(use_enable test gcc-warnings)
+		--disable-appliance
+		--disable-daemon
+		--with-extra="-gentoo"
+		--with-readline
+		--disable-php
+		--disable-python
+		--without-java
+		$(use_enable perl)
+		$(use_enable fuse)
+		$(use_enable ocaml)
+		$(use_enable ruby)
+		--disable-haskell
+		$(use_enable introspection gobject)
+		$(use_enable erlang)
+		$(use_enable systemtap probes)
+		$(use_enable lua)
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+
+}
+
+src_test() {
+	autotools-utils_src_test
+}
+
+src_install() {
+	strip-linguas -i po
+	autotools-utils_src_install "LINGUAS=""${LINGUAS}"""
+
+	use perl && fixlocalpod
+}
+
+pkg_postinst() {
+
+	if ! use perl ; then
+		einfo "Perl based tools NOT build"
+	fi
+	if ! use ocaml ; then
+		einfo "Ocaml based tools ( sysprep , ... ) NOT installed"
+	fi
+}