drop old, add new versions, request by slepnoga

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0xEAD50D64D8D3571A!)

5 files changed, 37 insertions, 309 deletions

diff --git a/app-emulation/libguestfs/ChangeLog b/app-emulation/libguestfs/ChangeLog
index 33fb6abaf4a3..65713d7bee52 100644
--- a/app-emulation/libguestfs/ChangeLog
+++ b/app-emulation/libguestfs/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-emulation/libguestfs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libguestfs/ChangeLog,v 1.29 2013/10/01 17:51:40 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libguestfs/ChangeLog,v 1.30 2013/10/21 07:04:59 qnikst Exp $
+
+*libguestfs-1.22.7 (21 Oct 2013)
+*libguestfs-1.24.0 (21 Oct 2013)
+
+  21 Oct 2013; Alexander Vershilov <qnikst@gentoo.org>
+  +libguestfs-1.22.7.ebuild, +libguestfs-1.24.0.ebuild,
+  -libguestfs-1.16.34.ebuild, -libguestfs-1.18.11.ebuild,
+  -libguestfs-1.20.4.ebuild, -libguestfs-1.22.6.ebuild:
+  drop old, add new versions, request by slepnoga
 
 *libguestfs-1.22.6 (01 Oct 2013)
 
diff --git a/app-emulation/libguestfs/libguestfs-1.16.34.ebuild b/app-emulation/libguestfs/libguestfs-1.16.34.ebuild
deleted file mode 100644
index 1e6a7a52a8bd..000000000000
--- a/app-emulation/libguestfs/libguestfs-1.16.34.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libguestfs/libguestfs-1.16.34.ebuild,v 1.1 2013/03/25 12:15:48 maksbotan Exp $
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit bash-completion-r1 autotools-utils versionator eutils \
-multilib linux-info perl-module
-
-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}"
-# Upstream NOT supported 32-bit version, keyword in own risk
-KEYWORDS="~amd64"
-IUSE="erlang +fuse debug +ocaml doc +perl nls ruby static-libs selinux systemtap introspection"
-
-# Failires - doc
-
-COMMON_DEPEND="
-	>=app-misc/hivex-1.3.1
-	dev-libs/libpcre
-	app-arch/cpio
-	dev-lang/perl
-	app-cdr/cdrkit
-	>=app-emulation/qemu-1.0[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64]
-	sys-apps/fakeroot
-	sys-apps/file
-	app-emulation/libvirt
-	dev-libs/libxml2:2
-	>=sys-apps/fakechroot-2.8
-	>=app-admin/augeas-0.7.1
-	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] )
-	erlang? ( dev-lang/erlang )
-	"
-
-DEPEND="${COMMON_DEPEND}
-	sys-apps/sed
-	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}"/1.18/*.patch  )
-
-DOCS=(AUTHORS BUGS HACKING README RELEASE-NOTES ROADMAP TODO)
-
-pkg_setup () {
-		CONFIG_CHECK="~KVM ~VIRTIO"
-		[ -n "${CONFIG_CHECK}" ] && check_extra_config;
-}
-
-src_prepare() {
-	autotools-utils_src_prepare
-}
-
-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=(
-		--disable-appliance
-		--disable-daemon
-		--with-drive-if=virtio
-		--with-net-if=virtio-net-pci
-		--with-extra="-gentoo"
-		--with-readline
-		--disable-php
-		--disable-python
-		--disable-java
-		--with-java-home=no
-		$(use_enable nls)
-		$(use_enable perl)
-		$(use_enable fuse)
-		$(use_enable ocaml)
-		$(use_enable ruby)
-		--disable-haskell
-		$(use_enable doc)
-		$(use_enable introspection gobject)
-		$(use_enable erlang)
-	)
-	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}"""
-
-	dobashcomp "${D}/etc"/bash_completion.d/guestfish-bash-completion.sh
-
-	rm -fr "${D}/etc"/bash* || die
-
-	newenvd "${FILESDIR}"/env.file 99"${PN}"
-
-	use perl && fixlocalpod
-}
diff --git a/app-emulation/libguestfs/libguestfs-1.18.11.ebuild b/app-emulation/libguestfs/libguestfs-1.18.11.ebuild
deleted file mode 100644
index 3ec3ed61583c..000000000000
--- a/app-emulation/libguestfs/libguestfs-1.18.11.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libguestfs/libguestfs-1.18.11.ebuild,v 1.1 2013/03/25 12:15:48 maksbotan Exp $
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit bash-completion-r1 autotools-utils versionator eutils \
-multilib linux-info perl-module
-
-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}"
-# Upstream NOT supported 32-bit version, keyword in own risk
-KEYWORDS="~amd64"
-IUSE="erlang +fuse debug ocaml doc +perl ruby static-libs
-selinux systemtap introspection inspect-icons"
-
-# Failires - doc
-
-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.0[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64,tci,systemtap?]
-	sys-apps/fakeroot
-	sys-apps/file
-	app-emulation/libvirt
-	dev-libs/libxml2:2
-	>=sys-apps/fakechroot-2.8
-	>=app-admin/augeas-0.7.1
-	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] )
-	erlang? ( dev-lang/erlang )
-	inspect-icons? ( media-libs/netpbm
-			media-gfx/icoutils )
-	"
-
-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}"/1.18/0*.patch  )
-
-DOCS=(AUTHORS BUGS HACKING README RELEASE-NOTES ROADMAP TODO)
-
-pkg_setup () {
-		CONFIG_CHECK="~KVM ~VIRTIO"
-		[ -n "${CONFIG_CHECK}" ] && check_extra_config;
-}
-
-src_prepare() {
-	autotools-utils_src_prepare
-}
-
-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=(
-		--disable-appliance
-		--disable-daemon
-		--with-drive-if=virtio
-		--with-net-if=virtio-net-pci
-		--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 doc)
-		$(use_enable introspection gobject)
-		$(use_enable erlang)
-		$(use_enable systemtap probes)
-	)
-	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}"""
-
-	dobashcomp "${D}/etc"/bash_completion.d/guestfish-bash-completion.sh
-
-	rm -fr "${D}/etc"/bash* || die
-
-	newenvd "${FILESDIR}"/env.file 99"${PN}"
-
-	use perl && fixlocalpod
-}
diff --git a/app-emulation/libguestfs/libguestfs-1.22.6.ebuild b/app-emulation/libguestfs/libguestfs-1.22.7.ebuild
index 47653d656107..e50dfa75619e 100644
--- a/app-emulation/libguestfs/libguestfs-1.22.6.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.22.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libguestfs/libguestfs-1.22.6.ebuild,v 1.1 2013/10/01 17:51:40 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libguestfs/libguestfs-1.22.7.ebuild,v 1.1 2013/10/21 07:04:59 qnikst Exp $
 
 EAPI="5"
 
@@ -23,7 +23,7 @@ LICENSE="GPL-2 LGPL-2"
 SLOT="0/${MY_PV_1}"
 
 KEYWORDS="~amd64"
-IUSE="erlang +fuse debug ocaml doc +perl ruby static-libs
+IUSE="erlang +fuse debug +ocaml doc +perl ruby static-libs
 selinux systemtap introspection inspect-icons test lua"
 
 # Failires - doc
@@ -153,10 +153,10 @@ src_install() {
 
 pkg_postinst() {
 
-	if !use perl ; then
+	if ! use perl ; then
 		einfo "Perl based tools NOT build"
 	fi
-	if !use ocaml ; then
+	if ! use ocaml ; then
 		einfo "Ocaml based tools ( sysprep , ... ) NOT installed"
 	fi
 }
diff --git a/app-emulation/libguestfs/libguestfs-1.20.4.ebuild b/app-emulation/libguestfs/libguestfs-1.24.0.ebuild
index d1b71c46559d..ed935b3ada5c 100644
--- a/app-emulation/libguestfs/libguestfs-1.20.4.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.24.0.ebuild
@@ -1,15 +1,14 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libguestfs/libguestfs-1.20.4.ebuild,v 1.1 2013/03/25 12:15:48 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libguestfs/libguestfs-1.24.0.ebuild,v 1.1 2013/10/21 07:04:59 qnikst Exp $
 
 EAPI="5"
 
 WANT_LIBTOOL=latest
-AUTOTOOLS_AUTORECONF=1
 AUTOTOOLS_IN_SOURCE_BUILD=1
 
-inherit  bash-completion-r1 autotools-utils versionator eutils \
-multilib linux-info perl-module
+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)"
@@ -24,10 +23,11 @@ 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"
+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
@@ -74,6 +74,7 @@ COMMON_DEPEND="
 			)
 	virtual/acl
 	sys-libs/libcap
+	lua? ( dev-lang/lua )
 	"
 
 DEPEND="${COMMON_DEPEND}
@@ -85,7 +86,7 @@ RDEPEND="${COMMON_DEPEND}
 	app-emulation/libguestfs-appliance
 	"
 
-PATCHES=("${FILESDIR}"/1.20/0*.patch  )
+PATCHES=("${FILESDIR}"/1.24/0*.patch  )
 
 DOCS=(AUTHORS BUGS ChangeLog HACKING README  ROADMAP TODO)
 
@@ -95,7 +96,10 @@ pkg_setup () {
 }
 
 src_prepare() {
-	autotools-utils_src_prepare
+	base_src_prepare
+	eaclocal
+	eautomake
+	eautoconf
 }
 
 src_configure() {
@@ -109,6 +113,7 @@ src_configure() {
 	export vmchannel_test=no
 
 	local myeconfargs=(
+		$(use_enable test gcc-warnings)
 		--disable-appliance
 		--disable-daemon
 		--with-extra="-gentoo"
@@ -121,11 +126,10 @@ src_configure() {
 		$(use_enable ocaml)
 		$(use_enable ruby)
 		--disable-haskell
-		$(use_enable doc)
 		$(use_enable introspection gobject)
 		$(use_enable erlang)
 		$(use_enable systemtap probes)
-		--disable-lua
+		$(use_enable lua)
 	)
 	autotools-utils_src_configure
 }
@@ -143,9 +147,15 @@ src_install() {
 	strip-linguas -i po
 	autotools-utils_src_install "LINGUAS=""${LINGUAS}"""
 
-	dobashcomp "${D}/etc"/bash_completion.d/guestfish-bash-completion.sh
+	use perl && fixlocalpod
+}
 
-	rm -fr "${D}/etc"/bash* || die
+pkg_postinst() {
 
-	use perl && fixlocalpod
+	if ! use perl ; then
+		einfo "Perl based tools NOT build"
+	fi
+	if ! use ocaml ; then
+		einfo "Ocaml based tools ( sysprep , ... ) NOT installed"
+	fi
 }