--- jenkins-bin-1.595.ebuild.org	2015-01-14 17:08:26.816828705 +0100
+++ jenkins-bin-1.595.ebuild	2015-01-14 18:09:24.533498690 +0100
@@ -22,11 +22,20 @@
 
 S=${WORKDIR}
 
-JENKINS_DIR=/var/lib/jenkins
-
 pkg_setup() {
+	export JENKINS_DIR="${JENKINS_DIR:=/var/lib/jenkins}"
 	enewgroup jenkins
 	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+
+	# make sure user has correct HOME as flipping between
+	# the standard jenkins pkg and this one was possible in
+	# the past
+	if [[ $(egethome jenkins) != ${JENKINS_DIR} ]]; then
+		ewarn "From this version on, the homedir of the jenkins user cannot be changed"
+		ewarn "dynamically after the installation. For homedir different from"
+		ewarn "/var/lib/jenkins set JENKINS_DIR in your make.conf and re-emerge."
+		esethome jenkins "${JENKINS_DIR}"
+	fi
 }
 
 src_install() {