Cleanup idea from floppym: just toss all entire install-exec-local deps; it does seem to work still. Still have some some libs and bins built into /usr/share/nova-agent, but much better.

Package-Manager: portage-2.2.10/cvs/Linux x86_64

3 files changed, 59 insertions, 2 deletions

diff --git a/app-emulation/openstack-guest-agents-unix/ChangeLog b/app-emulation/openstack-guest-agents-unix/ChangeLog
index 045053ab3317..b2fbacc98039 100644
--- a/app-emulation/openstack-guest-agents-unix/ChangeLog
+++ b/app-emulation/openstack-guest-agents-unix/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/openstack-guest-agents-unix
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/openstack-guest-agents-unix/ChangeLog,v 1.1 2014/06/22 02:06:59 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/openstack-guest-agents-unix/ChangeLog,v 1.2 2014/06/22 04:16:14 robbat2 Exp $
+
+*openstack-guest-agents-unix-1.39.0-r2 (22 Jun 2014)
+
+  22 Jun 2014; Robin H. Johnson <robbat2@gentoo.org>
+  +openstack-guest-agents-unix-1.39.0-r2.ebuild:
+  Cleanup idea from floppym: just toss all entire install-exec-local deps; it
+  does seem to work still. Still have some some libs and bins built into
+  /usr/share/nova-agent, but much better.
 
 *openstack-guest-agents-unix-1.39.0 (22 Jun 2014)
 *openstack-guest-agents-unix-1.39.0-r1 (22 Jun 2014)
diff --git a/app-emulation/openstack-guest-agents-unix/Manifest b/app-emulation/openstack-guest-agents-unix/Manifest
index 45a75c8338eb..aa6f7ee79e27 100644
--- a/app-emulation/openstack-guest-agents-unix/Manifest
+++ b/app-emulation/openstack-guest-agents-unix/Manifest
@@ -2,6 +2,7 @@ AUX openstack-guest-agents-unix-1.39.0-python2.patch 882 SHA256 dc57ff4800f9992e
 AUX patches-1.39.0-20140621.patch 13060 SHA256 8a8d71a9377d8002f5074591f2e574a467fa180d048eb4a143319b0d78789741 SHA512 8efbadd5c1aa232155bfe180414bc1f5b9abc13c970dde813fdbd6f01445d8ab9fe63814ac7b38506638d29253f31f91e6d97f82da6e285add50350e0b7ac186 WHIRLPOOL eb01e41e14ec1dceeda2834ecb273f785445408587c66b5a8115b0d9f6a647eadf52181c11be2bd63ba8066b966d530615d859704657e590d9a9feb6158cb970
 DIST openstack-guest-agents-unix-1.39.0.tar.gz 75013 SHA256 eaa22564c8da46c2c1c08e6c0ccd2507e181ffac66fa89f1d9ac2323a2a77d97 SHA512 4f7c4c1f2bc2c8ebda25dc8c0fa79c39e8e5a83040ff103f8c583d9142e71c6527d23e430da983e3a8c9add508298c31ec13a7e56d1db3b5338736dd470fec80 WHIRLPOOL 8e91593dcf6e1f0a8281a9a19946aa67c6e57acfcd5dd5739cddc9b0db0ea0952552f592f598a156140f5c8834fd47f9e20fddddec0f7648bcc40ebce0127d63
 EBUILD openstack-guest-agents-unix-1.39.0-r1.ebuild 1159 SHA256 93fe61620f9134b43b3b0e793c79676eedf2d8b95fd51c96d306286bc9babc66 SHA512 edee86a26a204e0e80af85cf2ac8930fbe648806befc5337fa5ce240d983e5149a4cdf20d0c5bd369717c5828b3c33b9415e237973de6c25e8101c3803af9362 WHIRLPOOL 300e5247c959e95bdffe1e213a999d1dcd75b7d9d4d36f9cd9aaff38e8a2afa25e522a2cf8d9cc34ea35d562258e8e92c8c34475bd7c1cfe7356a94a8f62d3ba
+EBUILD openstack-guest-agents-unix-1.39.0-r2.ebuild 1395 SHA256 700096faf9fb2745f27665248bc4ed87119fdb0fec86de580ebcbd10d07f29d1 SHA512 1223b30c0a8072ef12666e69b4dc630c42f03d1cc189d80b5466af36bd91ef419f26fde401c400439ee4fdcfd0f4101c3e78686452f26f78659e39e1505fe342 WHIRLPOOL 01581d88c32a65423937cfd0a3acbb6219bc86a223222015db4b3583ff7dbe87b751057474d8fd042a2cc1c726a7e95c40b8d38c1daa52fdc2777831661e7bac
 EBUILD openstack-guest-agents-unix-1.39.0.ebuild 774 SHA256 e44b3ac3df958ecab9dd917a75e43dce98374f8f5ffbb519809e25d81ad75646 SHA512 f93b8b7a3a6278de8760248da755fa6758650007685b254c22d92023ced4a99595764397526aee19dbb9117e6b4e4457b6e6ee165bcd790330780920d6e502b0 WHIRLPOOL 7bfbf8ed7eb87495902223994ad73b99c96bfe146f5197cc7de50a8915f82868a2afe3813c89fd261bfb031fa7d80fbcc8a99c6e6c1c960bda6dbd623867192a
-MISC ChangeLog 817 SHA256 a6c21b7dc80d08166beb2c9ac534cc1c37f86664fe0bd85adb0f2c9216051ab1 SHA512 1d27d97f0e4b1ba7f684a0c4fe49a8389898d9b3367cc47373ffb2f2fbc19fe870981d94e221752db84d42bec428ea6d3c0bcd124bd93a12e1780d844812fdc5 WHIRLPOOL b9246395d35a85c5437080cea1c31f82243e60f80f7ab021b4544eeb29fe29b00644102d2f59641c33e9009ff1c771abf09f389ff499d934a0cbaefbe604156c
+MISC ChangeLog 1167 SHA256 2de5b6310c378beb3349d7f904e5867adeea5510488e7afe31075899c5cdc538 SHA512 7bf327231d5853683f4615b895a06e3e54db9a45b2aa8835157eda7c210f4caf131d93ca5431e4f03d8b660090a3d8685a2f50ff8ae02d5e733616401bcd3e06 WHIRLPOOL 27605aebb41037fbb30385bed4f38c272c7e47957054832c0e137bb72c3bfca53afd36bcbe85c7656fbc62594e8d036808e27689d39709fcb1ffebdecef20ffc
 MISC metadata.xml 267 SHA256 19290f611bcff86b6df4bfaac3bc49155122dfa4c74944022d83eff85fbba8d2 SHA512 006202d6c85a067e739280c1cdc0c8c67b01b46c14fc80e8d22ef477f59a474ea57d31e3167c3b6a636cfa1ea02063317a3fc8c0f79afd83cb3a54e2b0755f42 WHIRLPOOL 4d81726431bcfb6de385dfebaf6e61176948c10a6a709cb4df9bcce51dbcbaea764ef8567b554351b65844771d738b060e5eec1fecd7210852dff1fa7f6893b0
diff --git a/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.0-r2.ebuild b/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.0-r2.ebuild
new file mode 100644
index 000000000000..64e47a6166c7
--- /dev/null
+++ b/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.0-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.0-r2.ebuild,v 1.1 2014/06/22 04:16:14 robbat2 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 ) # does not work with py3 yet
+
+inherit autotools eutils vcs-snapshot python-single-r1
+
+DESCRIPTION="Openstack Unix Guest Agent"
+HOMEPAGE="http://github.com/rackerlabs/openstack-guest-agents-unix"
+SRC_URI="https://github.com/rackerlabs/${PN}/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-util/patchelf
+	dev-python/pycrypto[${PYTHON_USEDEP}]
+	dev-python/pyxenstore[${PYTHON_USEDEP}]"
+
+# Fails to build if python2.5/python2.6 are present
+DEPEND="${RDEPEND}
+	!dev-lang/python:2.5
+	!dev-lang/python:2.6
+	${PYTHON_DEPS}"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/patches-1.39.0-20140621.patch \
+		"${FILESDIR}"/openstack-guest-agents-unix-1.39.0-python2.patch
+	# Ignore the deps of install-exec-local
+	sed -i -e '/^install-exec-local:/s,:.*,:,g' Makefile.am
+	# bashism fix
+	sed -r -i -e '/^export ([A-Z_]+)/{ s,^export ,,g; s,^([A-Z0-9_]+)(.*),\1\2; export \1,g; }' scripts/gentoo/nova-agent.in
+
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	doinitd scripts/gentoo/nova-agent
+}