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

(Portage version: 2.2.0_alpha122/cvs/Linux x86_64)

3 files changed, 26 insertions, 10 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/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