Bump to 1.28.3, clean old. Thanks to slepnoga.

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key F8DBDADE)

7 files changed, 105 insertions, 10 deletions

diff --git a/app-emulation/libguestfs/ChangeLog b/app-emulation/libguestfs/ChangeLog
index 1d4cdf2216a4..b3a8694f6002 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.37 2014/11/17 23:30:21 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libguestfs/ChangeLog,v 1.38 2014/12/05 18:53:29 maksbotan Exp $
+
+*libguestfs-1.28.3 (05 Dec 2014)
+
+  05 Dec 2014; Maxim Koltsov <maksbotan@gentoo.org>
+  +files/1.28/0000_bug_499150.patch,
+  +files/1.28/0001_add_gentoo_names_to_configure.patch,
+  +files/1.28/0002_add_gentooway_to_remove_la_files.patch,
+  +files/1.28/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch,
+  +files/1.28/0103_disable_php_bindings_makefile.patch,
+  +libguestfs-1.28.3.ebuild, -libguestfs-1.24.0.ebuild:
+  Bump to 1.28.3, clean old. Thanks to slepnoga.
 
   17 Nov 2014; Andreas K. Huettel <dilfridge@gentoo.org>
   libguestfs-1.24.0.ebuild, libguestfs-1.26.1.ebuild:
diff --git a/app-emulation/libguestfs/files/1.28/0000_bug_499150.patch b/app-emulation/libguestfs/files/1.28/0000_bug_499150.patch
new file mode 100644
index 000000000000..1e0f1a32185e
--- /dev/null
+++ b/app-emulation/libguestfs/files/1.28/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.28/0001_add_gentoo_names_to_configure.patch b/app-emulation/libguestfs/files/1.28/0001_add_gentoo_names_to_configure.patch
new file mode 100644
index 000000000000..9d209ff53584
--- /dev/null
+++ b/app-emulation/libguestfs/files/1.28/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.28/0002_add_gentooway_to_remove_la_files.patch b/app-emulation/libguestfs/files/1.28/0002_add_gentooway_to_remove_la_files.patch
new file mode 100644
index 000000000000..38a591b811ed
--- /dev/null
+++ b/app-emulation/libguestfs/files/1.28/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.28/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch b/app-emulation/libguestfs/files/1.28/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.28/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.28/0103_disable_php_bindings_makefile.patch b/app-emulation/libguestfs/files/1.28/0103_disable_php_bindings_makefile.patch
new file mode 100644
index 000000000000..34ab42d27903
--- /dev/null
+++ b/app-emulation/libguestfs/files/1.28/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.24.0.ebuild b/app-emulation/libguestfs/libguestfs-1.28.3.ebuild
index 03f370b88d72..ec4b4037eb21 100644
--- a/app-emulation/libguestfs/libguestfs-1.24.0.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.28.3.ebuild
@@ -1,10 +1,11 @@
 # 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.24.0.ebuild,v 1.3 2014/11/17 23:30:21 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libguestfs/libguestfs-1.28.3.ebuild,v 1.1 2014/12/05 18:53:29 maksbotan Exp $
 
 EAPI="5"
 
 WANT_LIBTOOL=latest
+WANT_AUTOMAKE=1.14
 AUTOTOOLS_IN_SOURCE_BUILD=1
 
 inherit autotools-utils autotools versionator eutils \
@@ -12,7 +13,6 @@ 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"
@@ -20,10 +20,10 @@ 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}"
+SLOT="0/"${MY_PV_1}""
 
 KEYWORDS="~amd64"
-IUSE="erlang +fuse debug +ocaml doc +perl ruby static-libs
+IUSE="bash-completion erlang +fuse debug ocaml doc +perl ruby static-libs
 selinux systemtap introspection inspect-icons test lua"
 
 # Failires - doc
@@ -37,7 +37,7 @@ COMMON_DEPEND="
 	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]
+	>=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps]
 	sys-apps/fakeroot
 	sys-apps/file
 	app-emulation/libvirt
@@ -49,6 +49,10 @@ COMMON_DEPEND="
 	dev-libs/libpcre
 	sys-libs/readline
 	>=sys-libs/db-4.6
+	app-arch/xz-utils
+	app-arch/lzma
+	app-crypt/gnupg
+	app-arch/unzip[natspec]
 	perl? ( virtual/perl-ExtUtils-MakeMaker
 			>=dev-perl/Sys-Virt-0.2.4
 			virtual/perl-Getopt-Long
@@ -75,20 +79,22 @@ COMMON_DEPEND="
 	virtual/acl
 	sys-libs/libcap
 	lua? ( dev-lang/lua )
-	"
+	>=app-shells/bash-completion-2.0
+	dev-libs/yajl"
 
 DEPEND="${COMMON_DEPEND}
 	dev-util/gperf
 	doc? ( app-text/po4a )
 	ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake )
+	${AUTOTOOLS_DEPEND}
 	"
 RDEPEND="${COMMON_DEPEND}
 	app-emulation/libguestfs-appliance
 	"
 
-PATCHES=("${FILESDIR}"/1.24/0*.patch  )
+PATCHES=( "${FILESDIR}/${MY_PV_1}"/*.patch  )
 
-DOCS=(AUTHORS BUGS ChangeLog HACKING README  ROADMAP TODO)
+DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO )
 
 pkg_setup () {
 		CONFIG_CHECK="~KVM ~VIRTIO"
@@ -113,7 +119,9 @@ src_configure() {
 	export vmchannel_test=no
 
 	local myeconfargs=(
-		$(use_enable test gcc-warnings)
+		$(use_enable test werror)
+		--with-libvirt
+		--with-default-backend=libvirt
 		--disable-appliance
 		--disable-daemon
 		--with-extra="-gentoo"
@@ -126,6 +134,7 @@ src_configure() {
 		$(use_enable ocaml)
 		$(use_enable ruby)
 		--disable-haskell
+		--disable-golang
 		$(use_enable introspection gobject)
 		$(use_enable erlang)
 		$(use_enable systemtap probes)