Fix missing parts for libexecdir migration, thanks Damien Granger in bug #432274

Package-Manager: portage-2.2.0_alpha122/cvs/Linux x86_64

4 files changed, 32 insertions, 16 deletions

diff --git a/net-misc/neatx/ChangeLog b/net-misc/neatx/ChangeLog
index 58db5681cd1e..fcfcecaa55e9 100644
--- a/net-misc/neatx/ChangeLog
+++ b/net-misc/neatx/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/neatx
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/neatx/ChangeLog,v 1.18 2012/08/21 13:34:00 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/neatx/ChangeLog,v 1.19 2012/08/23 12:30:40 voyageur Exp $
+
+*neatx-0.3.1_p59-r4 (23 Aug 2012)
+
+  23 Aug 2012; Bernard Cafarelli <voyageur@gentoo.org>
+  -neatx-0.3.1_p59-r3.ebuild, +neatx-0.3.1_p59-r4.ebuild,
+  files/neatx-0.3.1_p59-use_libexecdir.patch:
+  Fix missing parts for libexecdir migration, thanks Damien Granger in bug
+  #432274
 
 *neatx-0.3.1_p59-r3 (21 Aug 2012)
 
diff --git a/net-misc/neatx/Manifest b/net-misc/neatx/Manifest
index 4ec522193e61..bc06db7f62e2 100644
--- a/net-misc/neatx/Manifest
+++ b/net-misc/neatx/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX neatx-0.3.1_p59-use_libexecdir.patch 2691 SHA256 1182c7f9a54c5a69111f5208b18d152507579a779d10f75d5d46be28d27feb46 SHA512 c696469296053a31c57484da2259b9ca9da84d894f040154b210e6eb2ed434f1d5dad5cc897db42b1faf2c482d919aad71549a8885af5cb84299297fe7931eed WHIRLPOOL 3100e5dc8f0e3faf7ea4a5a262fca27cbafbd360167a0e72a0cd7609459e20f898cf47043734ae840c192ac730fd91dbe85c7b15073e0196601e948e2ea569c1
+AUX neatx-0.3.1_p59-use_libexecdir.patch 3098 SHA256 173bcf9f668ffc79d5e1feac9873dfb31a0e965be402c669b8add39c4bbfa881 SHA512 81d48ad92ff8d77b9483e38991e94194f72b01412fcff65d318417da201d775960c932c857bd5041a8742eafd71645afc54e4c4209bc663e8f9addc6924d80a6 WHIRLPOOL 9fd94db8de7dc14f73be366de7912c6cbbd52a1ed7a12dbeecafb5c278c14d1138659ebf1c5717776f2b9496f96c4d00dc6a69dbbe2ce30ef3db40efe0ba50a1
 DIST neatx-0.3.1_p59.tar.bz2 77036 SHA256 ed4eea8395ae884c9e4b206cbed0f54c4c7f4138ed608c7f6ad52c56b496e77d SHA512 62c81bbcba9ba3bdec6cd7660cf9ea431c15a700b091c3682a0d6f85b12cc22a9f730a4f57ba89ff6fda32b3502c130a5e857cb7d33c69e686dd5536247e4d9a WHIRLPOOL 5c0dfc6773fb13746c194134b269dce32e641f8716e7257824854535b366bb3dbc2c19099950b80339316ae541caabf84017d01ecafda7b86b10bd53103969e3
 EBUILD neatx-0.3.1_p59-r1.ebuild 3398 SHA256 ad6bcd7f28873778b7310b214738a1d27fd2cdf4e9b8f680c08f9f59880fc12d SHA512 4b6e5c09bb5b66da55b170a87fb849d7419c941e5feed5940ade46446ca4a0a43f58a66a24091076897c9f98e2eda3769a955f38a0a7e4ea66758425301f1bed WHIRLPOOL 19da4a8614195bc9c590b67aa36fea86b4aadc074ae9125e19ca24a4fd24b6797ba6d06531a274e6c27c698acd7eda6a612a9de9bdbf54b9bb8b966f49be56a1
 EBUILD neatx-0.3.1_p59-r2.ebuild 4144 SHA256 0f9a0a9ad5644f8bd1e12971fec71628ba5ad49d563200e31014537424a64592 SHA512 457d22c2db1747003fe78a65d0591c38cbe029bdb1f65b6decbae00006e0dfa3b53f770cd55157098f3a72b18b20a881978669bb58f3f85042df2cd158de5e5c WHIRLPOOL 90a6400c1d8f5317eb08fca0ec34171a94c5f5be3bb87728a8a0c2bfffec00203f507714206dbbd6c5aa865e3342bb6c570ada5a090ad32df0069ba225ded9ff
-EBUILD neatx-0.3.1_p59-r3.ebuild 4164 SHA256 59a61d595ee7ef04f7fe69bea0c9488412fd316cb611335414fea34fcd9b37ac SHA512 973a1bc6834f65e97f62a312836bd4aa589d051e32f980b5e3b5a757e22588fb8e74a89a66098301aecdd6ec94589ad3909133367d6ca2f7fdd7ff7f2cc13393 WHIRLPOOL cf1f3d00f5b52f00d38478ae7c327abc7f697895ed1503773d23b56a83b0af0fe0f303d302c52af496a16a9ef07a45946c7474dde5f155d7dcb900111c4a0410
-MISC ChangeLog 3280 SHA256 cccdf46c6c0a41325fef82295e28ededc239f0056fdedf5bec5f9e264fc13dd4 SHA512 2a380b4c59789653823820970b0f1a149d85b3a529b3839e6c368d463c961069f570dab4e3eeb26dcfbab499876e7dc4c9c6e5fad558a52faa8751820c44da1b WHIRLPOOL 9b3e96b3efcf2a1e513db7b3d02b7f36c7333117d22cbcd3a842ab1d6fd0abac4591421abae6a4c9505585ec0baceac15490616955de45851cc4786adcb9b29d
+EBUILD neatx-0.3.1_p59-r4.ebuild 4143 SHA256 613ac6ce42e8adc7d94ea0c9ee7e06ac8eab4cb588fb61a21be2dcd337cd5e0c SHA512 7ff67558cdf59845eae49ccbdc05dfcf6889a5f46ef64f15592767fff3a81c0b69e2f5f94fdf518eeac057409dd44a411e5ba36b3f8a4d3b35c5424c02b7dc32 WHIRLPOOL d0d4a551616c834cfb06739a3327f565e10f4b17de1cd57ac94a9c73d3d7a32ec3a8bc2541c83f2062b4f3649ee9046998a29f5dfc3d7a5f2f053e889a42c615
+MISC ChangeLog 3560 SHA256 30ea7532a536a498d744a674561c246bcbb8c6ca23a53fe1ccd2c599b38c9ca6 SHA512 89144aa7641b47f599cfd62bfe5ffafe742781af7aba56dd453be84be0d7be7e04f0ffdd1cfe6081c71848282a7024c93c4aa61b3b2ae89bb9c01537bccf38fa WHIRLPOOL eea6e9368607cf7d8b05c4bd96f003603e499d6af9761ea416a7c120eb5a033631443a9c9b5c5bdd4c94e3eb75e14ccd834c060bc7c665582b6adf941c098d6a
 MISC metadata.xml 334 SHA256 499f67f73f4048db1c41db8e934a720dd9cdc00b6a7a48bb774993ff40eb8d8a SHA512 03cf65aeb88cf3debdea302820a60a34b356a0da678b402393408890d8ca9db1c485a6860794c2c325807d195e556a099d311a4029a3b35981855badc17c6ec9 WHIRLPOOL 238cf0971bed408f5a66ff98fb5787d30b406478b1ba5be6884e5a489018e0897b0261a4c6fd33d070f81a025f2d3a2ce9ebb48117477eb69440a787f50b564a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlAzjlMACgkQFYEBGcdFJfJ7vwEAiCGUsptnAa8puwfi4UJD5ZKZ
-bU0gMl9HGf5k0ygtdX4A/idw2fJ7ga4vljYXcxqU1bQZURdYgepw16XM78hXzgS5
-=QayP
+iF4EAREIAAYFAlA2InsACgkQFYEBGcdFJfJ28QD/QYwrLzDxV5/mPcsmMQn7gMYT
+PkacUFAQzwJ69Xkh8vYA/jfDc7vQWbahXdnGr9qXlvAAIN/bqc8bhfez1neOAJGM
+=9Z5A
 -----END PGP SIGNATURE-----
diff --git a/net-misc/neatx/files/neatx-0.3.1_p59-use_libexecdir.patch b/net-misc/neatx/files/neatx-0.3.1_p59-use_libexecdir.patch
index 9deed572beef..c481048cdf28 100644
--- a/net-misc/neatx/files/neatx-0.3.1_p59-use_libexecdir.patch
+++ b/net-misc/neatx/files/neatx-0.3.1_p59-use_libexecdir.patch
@@ -1,6 +1,6 @@
 diff -Naur neatx.orig/Makefile.am neatx/Makefile.am
---- neatx.orig/Makefile.am	2012-08-21 12:09:25.504181479 +0200
-+++ neatx/Makefile.am	2012-08-21 12:11:55.254498131 +0200
+--- neatx.orig/Makefile.am	2012-08-23 12:01:14.290018757 +0200
++++ neatx/Makefile.am	2012-08-23 14:16:42.119497905 +0200
 @@ -16,7 +16,7 @@
  appdir = $(pkgpythondir)/app
  docdir = $(datadir)/doc/$(PACKAGE)
@@ -46,7 +46,15 @@ diff -Naur neatx.orig/Makefile.am neatx/Makefile.am
  	  echo 's#@PKGPYTHONDIR@#$(pkgpythondir)#g'; \
  	} > $@
  
-@@ -206,7 +206,7 @@
+@@ -199,14 +199,14 @@
+ $(LOG_WRAPPER): Makefile stamp-directories $(GEN_LOG_WRAPPER)
+ 	set -e; \
+ 	progname=`basename $@ | sed -e 's/-wrapper//'`; \
+-	$(GEN_LOG_WRAPPER) "$(pkglibdir)/$$progname" "$(DESTDIR)$(pythondir)" > $@ || rm -f $@
++	$(GEN_LOG_WRAPPER) "$(pkglibexecdir)/$$progname" "$(DESTDIR)$(pythondir)" > $@ || rm -f $@
+ 	chmod u+x $@
+ 
+ # We need to create symlinks because "make distcheck" will not install Python
  # files when building.
  srclinks: stamp-directories
  	set -e; \
@@ -56,8 +64,8 @@ diff -Naur neatx.orig/Makefile.am neatx/Makefile.am
  			$(LN_S) $(abs_top_srcdir)/$$i $$i; \
  		fi; \
 diff -Naur neatx.orig/lib/constants.py neatx/lib/constants.py
---- neatx.orig/lib/constants.py	2012-08-21 12:09:25.504181479 +0200
-+++ neatx/lib/constants.py	2012-08-21 12:12:46.964539145 +0200
+--- neatx.orig/lib/constants.py	2012-08-23 12:01:14.290018757 +0200
++++ neatx/lib/constants.py	2012-08-23 12:01:23.405734335 +0200
 @@ -40,14 +40,14 @@
  START_GNOME_COMMAND = "gnome-session"
  
diff --git a/net-misc/neatx/neatx-0.3.1_p59-r3.ebuild b/net-misc/neatx/neatx-0.3.1_p59-r4.ebuild
index 6807b8497748..8e6882f6e26e 100644
--- a/net-misc/neatx/neatx-0.3.1_p59-r3.ebuild
+++ b/net-misc/neatx/neatx-0.3.1_p59-r4.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/neatx/neatx-0.3.1_p59-r3.ebuild,v 1.1 2012/08/21 13:34:00 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/neatx/neatx-0.3.1_p59-r4.ebuild,v 1.1 2012/08/23 12:30:40 voyageur Exp $
 
 EAPI=4
 
 PYTHON_DEPEND="2"
-inherit eutils autotools python multilib user
+inherit eutils autotools python user
 
 DESCRIPTION="Google implementation of NX server"
 HOMEPAGE="http://code.google.com/p/neatx/"
@@ -123,12 +123,12 @@ pkg_postinst () {
 	# Other NX servers ebuilds may have already created the nx account
 	# However they use different login shell/home directory paths
 	if [[ ${ROOT} == "/" ]]; then
-		usermod -s /usr/$(get_libdir)/neatx/nxserver-login nx || die "Unable to set login shell of nx user!!"
+		usermod -s /usr/libexec/neatx/nxserver-login nx || die "Unable to set login shell of nx user!!"
 		usermod -d ${NX_HOME_DIR} nx || die "Unable to set home directory of nx user!!"
 	else
 		elog "If you had another NX server installed before, please make sure"
 		elog "the nx user account is correctly set to:"
-		elog " * login shell: /usr/$(get_libdir)/neatx/nxserver-login"
+		elog " * login shell: /usr/libexec/neatx/nxserver-login"
 		elog " * home directory: ${NX_HOME_DIR}"
 	fi