From b5566278974bc8c5280a980ee352f0453a719790 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 16 Nov 2013 11:59:27 +0100
Subject: [PATCH] xen{,4.2}: update to 4.3.1 and 4.2.3 respectively.

Splitted xen pkg into smaller packages:
	- xen-hypervisor (contains just the hypervisor)
	- xen-libs (contains the shared libraries)
	- xen (contains all utilities)
---
 common/shlibs                            | 36 +++++++++-----------
 srcpkgs/xen-hypervisor                   |  1 +
 srcpkgs/xen-libs                         |  1 +
 srcpkgs/xen/template                     | 43 ++++++++++++++++++------
 srcpkgs/xen/xen-hypervisor.INSTALL       |  8 +++++
 srcpkgs/xen4.2-hypervisor                |  1 +
 srcpkgs/xen4.2-libs                      |  1 +
 srcpkgs/xen4.2/template                  | 33 ++++++++++++++----
 srcpkgs/xen4.2/xen4.2-hypervisor.INSTALL |  8 +++++
 9 files changed, 95 insertions(+), 37 deletions(-)
 create mode 120000 srcpkgs/xen-hypervisor
 create mode 120000 srcpkgs/xen-libs
 create mode 100644 srcpkgs/xen/xen-hypervisor.INSTALL
 create mode 120000 srcpkgs/xen4.2-hypervisor
 create mode 120000 srcpkgs/xen4.2-libs
 create mode 100644 srcpkgs/xen4.2/xen4.2-hypervisor.INSTALL

diff --git a/common/shlibs b/common/shlibs
index 0a2c959bb10..9cd79e2b0c6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -444,26 +444,22 @@ libopenobex.so.1 libopenobex-1.5_1
 libntfs-3g.so.84 ntfs-3g-2013.1.13_1
 libruby.so.1.9 ruby-1.9.3_1
 libruby.so.2.0 ruby-2.0.0_1
-libfsimage.so.1.0 xen-4.1.2_1
-libxenctrl.so.4.0 xen-4.1.2_1
-libxenstore.so.3.0 xen-4.1.2_1
-libflask.so.1.0 xen-4.1.2_1
-libblktap.so.3.0 xen-4.1.2_1
-libxenguest.so.4.0 xen-4.1.2_1
-libxenlight.so.1.0 xen-4.1.2_1
-libxlutil.so.1.0 xen-4.1.2_1
-libvhd.so.1.0 xen-4.1.2_1
-libblktapctl.so.1.0 xen-4.1.2_1
-libfsimage.so.1.0 xen4.2-4.1.2_1
-libxenctrl.so.4.0 xen4.2-4.1.2_1
-libxenstore.so.3.0 xen4.2-4.1.2_1
-libflask.so.1.0 xen4.2-4.1.2_1
-libblktap.so.3.0 xen4.2-4.1.2_1
-libxenguest.so.4.0 xen4.2-4.1.2_1
-libxenlight.so.1.0 xen4.2-4.1.2_1
-libxlutil.so.1.0 xen4.2-4.1.2_1
-libvhd.so.1.0 xen4.2-4.1.2_1
-libblktapctl.so.1.0 xen4.2-4.1.2_1
+libxenctrl.so.4.3 xen-libs-4.3_1<4.4
+libxenguest.so.4.3 xen-libs-4.3_1<4.4
+libxenstore.so.3.0 xen-libs-4.2.2_2
+libvhd.so.1.0 xen-libs-4.2.2_2
+libxlutil.so.4.3 xen-libs-4.3_1<4.4
+libxenlight.so.4.3 xen-libs-4.3_1<4.4
+libxenstat.so.0 xen-libs-4.2.2_2
+libblktapctl.so.1.0 xen-libs-4.2.2_2
+libblktap.so.3.0 xen-libs-4.2.2_2
+libfsimage.so.1.0 xen-libs-4.2.2_2
+libxenctrl.so.4.2 xen4.2-libs-4.2.3_1
+libxenguest.so.4.2 xen4.2-libs-4.2.3_1
+libxenstore.so.3.0 xen4.2-libs-4.2.3_1
+libvhd.so.1.0 xen4.2-libs-4.2.3_1
+libxlutil.so.1.0 xen4.2-libs-4.2.3_1
+libxenlight.so.2.0 xen4.2-libs-4.2.3_1
 libbabl-0.1.so.0 babl-0.1.10_1
 libgegl-0.2.so.0 gegl-0.2.0_1
 libiculx.so.49 icu-libs-49.1.2_1
diff --git a/srcpkgs/xen-hypervisor b/srcpkgs/xen-hypervisor
new file mode 120000
index 00000000000..90d35904416
--- /dev/null
+++ b/srcpkgs/xen-hypervisor
@@ -0,0 +1 @@
+xen
\ No newline at end of file
diff --git a/srcpkgs/xen-libs b/srcpkgs/xen-libs
new file mode 120000
index 00000000000..90d35904416
--- /dev/null
+++ b/srcpkgs/xen-libs
@@ -0,0 +1 @@
+xen
\ No newline at end of file
diff --git a/srcpkgs/xen/template b/srcpkgs/xen/template
index df85b56979c..fd14da15f07 100644
--- a/srcpkgs/xen/template
+++ b/srcpkgs/xen/template
@@ -1,19 +1,18 @@
 # Template file for 'xen'
 pkgname=xen
-version=4.3.0
+version=4.3.1
 wrksrc=xen-${version}
-revision=3
-short_desc="Xen Hypervisor and Utilities"
+revision=2
+short_desc="Xen utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://xen.org"
 license="GPL-2"
 distfiles="http://bits.xensource.com/oss-xen/release/$version/xen-$version.tar.gz"
-checksum=e1e9faabe4886e2227aacdbde74410653b233d66642ca1972a860cbec6439961
+checksum=3b5b7cc508b1739753585b5c25635471cdcef680e8770a78bf6ef9333d26a9fd
 long_desc="
  This package provides the official Xen Hypervisor and related utilities
  for starting/stopping/accessing unprivileged domains (domUs)."
 
-# Update this if support for ARM7 is added.
 only_for_archs="i686 x86_64"
 
 hostmakedepends="which wget bison pkg-config"
@@ -22,7 +21,7 @@ makedepends="lzo-devel openssl-devel e2fsprogs-devel zlib-devel gnutls-devel>=3.
  ncurses-devel liblzma-devel python-devel yajl-devel libuuid-devel libglib-devel iproute2
  bridge-utils dev86 acpica-utils pixman-devel"
 
-if [ "${XBPS_MACHINE}" = "x86_64" ]; then
+if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
 	makedepends+=" gcc-multilib"
 fi
 
@@ -67,6 +66,7 @@ do_install() {
 	rm -f ${DESTDIR}/{install,COPYING,README,usr/lib/lib}
 	rm -rf ${DESTDIR}/etc/udev
 	rm -f ${DESTDIR}//usr/libexec/qemu-bridge-helper
+	rm -rf ${DESTDIR}/usr/etc
 
 	# Move bash-completion to the correct dir.
 	vmkdir usr/share/bash-completion/completions
@@ -94,11 +94,35 @@ do_install() {
 	rm -f ${DESTDIR}/usr/share/examples/xen/xmexample*
 }
 
+# This package is only generated on x86_64.
+if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+
+xen-hypervisor_package() {
+	short_desc="Xen Hypervisor"
+	replaces="xen<4.3.1_2"
+	nostrip_files="xen-syms-${version}"
+	pkg_install() {
+		vmove boot
+	}
+}
+
+fi # !x86_64
+
 xen-devel_package() {
-	short_desc="Xen development files"
+	short_desc+=" - development files"
+	depends="xen-libs>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
+
+xen-libs_package() {
+	short_desc+=" - runtime libraries"
+	replaces="xen<4.3.1_2"
+	pkg_install() {
+		vmove "usr/lib/*.so.*"
 	}
 }
 
@@ -116,10 +140,9 @@ xen_package() {
 		openbios-ppc
 		openbios-sparc32
 		openbios-sparc64
-		palcode-clipper
-		xen-syms-${version}"
+		palcode-clipper"
 	pycompile_module="xen grub"
-	depends="iproute2 bridge-utils"
+	depends="iproute2 bridge-utils xen-hypervisor"
 	pkg_install() {
 		vmove all
 	}
diff --git a/srcpkgs/xen/xen-hypervisor.INSTALL b/srcpkgs/xen/xen-hypervisor.INSTALL
new file mode 100644
index 00000000000..1a38a462437
--- /dev/null
+++ b/srcpkgs/xen/xen-hypervisor.INSTALL
@@ -0,0 +1,8 @@
+case "${ACTION}" in
+post)
+	# Regenerates GRUB menu if it's installed.
+	if [ -x usr/sbin/grub-mkconfig ]; then
+		usr/sbin/grub-mkconfig -o boot/grub/grub.cfg
+	fi
+	;;
+esac
diff --git a/srcpkgs/xen4.2-hypervisor b/srcpkgs/xen4.2-hypervisor
new file mode 120000
index 00000000000..dcf8c41c510
--- /dev/null
+++ b/srcpkgs/xen4.2-hypervisor
@@ -0,0 +1 @@
+xen4.2
\ No newline at end of file
diff --git a/srcpkgs/xen4.2-libs b/srcpkgs/xen4.2-libs
new file mode 120000
index 00000000000..dcf8c41c510
--- /dev/null
+++ b/srcpkgs/xen4.2-libs
@@ -0,0 +1 @@
+xen4.2
\ No newline at end of file
diff --git a/srcpkgs/xen4.2/template b/srcpkgs/xen4.2/template
index aa2ae7e7087..48f9f588962 100644
--- a/srcpkgs/xen4.2/template
+++ b/srcpkgs/xen4.2/template
@@ -1,14 +1,14 @@
 # Template file for 'xen'
 pkgname=xen4.2
-version=4.2.2
+version=4.2.3
 wrksrc=xen-${version}
 revision=1
-short_desc="Xen Hypervisor and Utilities (4.2.x series)"
+short_desc="Xen Utilities (4.2.x series)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://xen.org"
 license="GPL-2"
 distfiles="http://bits.xensource.com/oss-xen/release/$version/xen-$version.tar.gz"
-checksum=c9bfe91a5e72f8545acebad9889d64368020359bfe18044c0e683133e55ae005
+checksum=69b6a73701383d609ad094a38925004e8595755fb39a6fafd579ba754e8667db
 long_desc="
  This package provides the official Xen Hypervisor and related utilities
  for starting/stopping/accessing unprivileged domains (domUs)."
@@ -67,7 +67,7 @@ do_install() {
 	rm -f ${DESTDIR}/boot/xen{,-4,-4.2}.gz
 	rm -f ${DESTDIR}/usr/sbin/xen-python-path
 	rm -f ${DESTDIR}/{install,COPYING,README,usr/lib/lib}
-	rm -rf ${DESTDIR}/etc/udev
+	rm -rf ${DESTDIR}/etc/{hotplug,udev}
 
 	# Move bash-completion to the correct dir.
 	vmkdir usr/share/bash-completion/completions
@@ -95,6 +95,16 @@ do_install() {
 	rm -f ${DESTDIR}/usr/share/examples/xen/xmexample*
 }
 
+xen4.2-hypervisor_package() {
+	short_desc="Xen hypervisor (4.2 series)"
+	provides="xen-hypervisor-${version}_${revision}"
+	replaces="xen-hypervisor>=0"
+	nostrip_files="xen-syms-${version}"
+	pkg_install() {
+		vmove boot
+	}
+}
+
 xen4.2-devel_package() {
 	short_desc+=" - development files"
 	provides="xen-devel-${version}_${revision}"
@@ -102,6 +112,16 @@ xen4.2-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}
+
+xen4.2-libs_package() {
+	short_desc+=" - runtime libraries"
+	provides="xen-libs-${version}_${revision}"
+	replaces="xen-libs>=0"
+	pkg_install() {
+		vmove "usr/lib/*.so.*"
 	}
 }
 
@@ -119,10 +139,9 @@ xen4.2_package() {
 		openbios-ppc
 		openbios-sparc32
 		openbios-sparc64
-		palcode-clipper
-		xen-syms-${version}"
+		palcode-clipper"
 	pycompile_module="xen grub"
-	depends="iproute2 bridge-utils"
+	depends="iproute2 bridge-utils xen-hypervisor"
 	provides="xen-${version}_${revision}"
 	replaces="xen>=0"
 	pkg_install() {
diff --git a/srcpkgs/xen4.2/xen4.2-hypervisor.INSTALL b/srcpkgs/xen4.2/xen4.2-hypervisor.INSTALL
new file mode 100644
index 00000000000..1a38a462437
--- /dev/null
+++ b/srcpkgs/xen4.2/xen4.2-hypervisor.INSTALL
@@ -0,0 +1,8 @@
+case "${ACTION}" in
+post)
+	# Regenerates GRUB menu if it's installed.
+	if [ -x usr/sbin/grub-mkconfig ]; then
+		usr/sbin/grub-mkconfig -o boot/grub/grub.cfg
+	fi
+	;;
+esac