Revbump to fix helpers and drivers installation. Fix PATH in init scripts and typos

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2BA7F3C!

5 files changed, 48 insertions, 29 deletions

diff --git a/app-misc/conmux/ChangeLog b/app-misc/conmux/ChangeLog
index 2c82d3de1cd7..9a7780f5940e 100644
--- a/app-misc/conmux/ChangeLog
+++ b/app-misc/conmux/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/conmux
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/conmux/ChangeLog,v 1.1 2013/10/29 21:12:59 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/conmux/ChangeLog,v 1.2 2013/10/31 20:01:54 hwoarang Exp $
+
+*conmux-0.15.1-r1 (31 Oct 2013)
+
+  31 Oct 2013; Markos Chandras <hwoarang@gentoo.org> +conmux-0.15.1-r1.ebuild,
+  -conmux-0.15.1.ebuild, files/conmux-registry.initd, files/conmux.initd:
+  Revbump to fix helpers and drivers installation. Fix PATH in init scripts and
+  typos
 
 *conmux-0.15.1 (29 Oct 2013)
 
diff --git a/app-misc/conmux/Manifest b/app-misc/conmux/Manifest
index c80e24630eab..1d106a0a98eb 100644
--- a/app-misc/conmux/Manifest
+++ b/app-misc/conmux/Manifest
@@ -2,29 +2,29 @@
 Hash: SHA256
 
 AUX conmux-registry.confd 120 SHA256 de73b8d55f90bda498a3f42a86b79289738a3a6846b81c44fe043c59d68928cc SHA512 aeae7f7d127d67e5ae96a63fbd694624d599fd329698ea72bd0fb5a4a0d29df3d60c5bdd750431acf13a36f53960af477b483a48324540eda5a4b55b266c081c WHIRLPOOL cdae2d4f3c9a1a9c782585dac955fbb29715ab7f4e96bbe5003fa944e3c191d5dce7b26d3708f89336f71fa41129b36d3a0603ebfc71f9e1706ce8ce6b48dd15
-AUX conmux-registry.initd 717 SHA256 ffbf2ff65f7d05442850a24ea1aa5e4849a07428b701702a942360043dce9f3b SHA512 058eb97b49f0a9298a4940162f1bef1e079f03874e6927b43db5c5152c35f435d89dcd083c7a7f4283f300924e911c89326bd954a451259892cff5c86b15e3c1 WHIRLPOOL 004fe68623687ba58586f5d1bfe31e3b848a8317e207c1732e2530c7a9c096a36e83e409a52eb90a4bdd36cbc3038e69f09652528e2f3a018136ad49c7d21943
+AUX conmux-registry.initd 829 SHA256 ac50e3bd2e86c225c2e49aaa6c43271730a4448228fb9d6f626e8329426acb42 SHA512 a3aca8442db82da89ce6462a585ea6094e183da9ff7c2119a034f03360d6576c9627ac3d496c6b655f7bc2415afe533663f675e81127c13912b9beab093fa1e5 WHIRLPOOL 35868af87b677b9a4873f4181e8caa57afeab66d10334fd94c91403396bb7893756344f1cd06f3d87906046762ed3b94f5b1376bb8e8c5fc1f568a70c87270b2
 AUX conmux.confd 432 SHA256 5f0f89ed25233677e52017573c188c48b6a9cccfe1dba3ad4338341ee844cf96 SHA512 50c6640f231e878817f31f399e8345d82c26bacbc8648d78b444eb572e7fad4c19d1f5b517474c412031dc65345723bffe95358542a6dd4af99a3007d12a7bc0 WHIRLPOOL 23ee4f04118b7536ea12e4c30b39d340ff11271784fc5cf3ed552a742ef0a035d07877a80f9c30751be7869d91a96e9aa2c46127df4ea053a6549bfdb559988c
-AUX conmux.initd 727 SHA256 08ba4c7872d0a83b457bada8a0053d0018ee9ef6c2852d461d9461e6be452aa6 SHA512 7c3eb62a56883b3d5496c6038a9ef1b43370e9791ae6caf033d2d20c9f4b7246483255ca6bffce36fc3ee25dd1049d62e80895a9c73a43fca281c4ccdc1573f8 WHIRLPOOL cdd840fcb484cca2e1fd935579aa65414c777853149e9000293705978a698712f104220731dcdc1fa3129624f2987f686bef91ccc9af6c402b015e40690b9d3f
+AUX conmux.initd 841 SHA256 156075e56a89a591a62492d0b3b624b48b1ab5d47f25f14c6feb5af609fb356b SHA512 7145823213118420e5bef1cdc19d3f810b5787ee82f4bfa5e4659d308bf2942ed843106ab0284c9f1b6cd86d588c70de8eeeb62ab32042b31ba665ca8ed53075 WHIRLPOOL 6ef6700e694acb518e71105298de5711ba214f02cb87e881a0a90ba6d8bde848612ba82e42813aec369985a020f1728c180f9a51eab340c5860b8aae2d1f7343
 DIST conmux-0.15.1.tar.gz 50713 SHA256 52e0e8d8ae2ad679e498f2a8c0a01ec536738e9daf09d88f9e256c349c5e9cb7 SHA512 8138d6d10b4382709828277503d1c23c52fd43109ebad79073be9003c39a9e62c2b7d9d6e78a9e81797c22871985e50a58df0d538ff63e3f580c9a229b520107 WHIRLPOOL 0d6ea7183063d5a3dee4e884ad4de9d694fa0c8116e94f8bee9ed80f26e5ed009a8ec889365b90efe34ffbb2e3f9c3c28a408924fb8b9c68a8c63ecfa0e5325b
-EBUILD conmux-0.15.1.ebuild 1787 SHA256 1ca1f3d27c9e31e54154bcdb9d765f04153dbb7af4a012e64123621ebb3e3616 SHA512 7c14db8e2466286de1b618438656ada9b3ca15bf3ba26ab608ed9fd012337fd0eba5ca62be90ed3b50242f6401d28d84986cabb9c32e7fcc124fc980fa1735f0 WHIRLPOOL 3a19d2a4272b7a001f6b64aca3ae40b73bceb3391ccf6e95adb7043f040912f12fba1b0c74ae00a8164df4835c1eda7b35a698d622cb98b402de285b4a3e5e3f
-MISC ChangeLog 484 SHA256 e95c7c77ce60ed59e5c24da944cafa04134a50b4b5506961bfe5f77dba8668c1 SHA512 64ca3ccce80c437af7fb26b95e43944c6e6b493c67d7807184d906e2c8353aa58c3bb5baec603d8b026c3d9683371ad81296bb96d410039c97cbb635f14d3709 WHIRLPOOL 4c070e33a1f9e655c05baef57ae1124d2436419037778e72eabcd8c9760d9ec58b3219a729330b2448d1a7583a41a21521674ebf0a723024f5295784872ff16b
+EBUILD conmux-0.15.1-r1.ebuild 2031 SHA256 c72e1e3e8f8eeaeba6f1bf355d9fa0afe26b67a8a28aeb574b6132d522002449 SHA512 8bf4e94c1b9623827872d0497cba48c498738fec826a153921e1d5e97a209af1b62cd448f98adaf4881513b755aaf46e81378270939d6959aeed7580a8d34d9e WHIRLPOOL 489fa69dbd2fa517de7ab218c1142a50f7e68b16ff08804a6502dd475fca2d86222a191d2e1109ecf1ef5fba00edf926627cc91fd5519a9c89e08ba17301c3c1
+MISC ChangeLog 759 SHA256 210e580501e4842da79838f0051e9fd36d0a3a2f101e980a4b00da55a93787c4 SHA512 78d63b068974c2c55b3714419c2bff9790f71e3b9711507ead13714d685d3795b82eee5252c401b2a62c797f65d382bf265367eb6741a20a0b378fc261d8e73a WHIRLPOOL b83712560e1d2bba79969d3e29a205c749cb6ffd5f2f1738a18894f89be01de0516a1b162c8800e1e14c1560ce5308226eb041f04faf08ea9d1067b47c242f7d
 MISC metadata.xml 496 SHA256 a26ad94fb939652b8c7522a21a042984d347a499b6b5bfe26acd38850ea6303e SHA512 449ce6302725d6ebdb556033ac688902d0edeb7d969fa072b68f182d6083c7cbc2cbd3c62ec873d9dfaefc4d42f68d48b0d9c2c8ecfdb21ff7272d794421fbb2 WHIRLPOOL d839e2f55282a9a7b0a2e7b5173b1090aa6021d2f6b3dcac4c61d7213b75a7819637af4d5b3b41aba52dcc2def75ab9aa31db9a4aa6c7c05d184e8112aa43627
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJScCR7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJScrbQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88WQ8QAMjCZOmT+/Keq8e6N5A2EHo8
-gizi5+K/vxBHCfe9VyF9JMHt9bXRpHpJEAcKOq29zwIE9+4qV0LU/bwnsAZ5yn4h
-vIbxJahi54+EmnG4sO62YleuI9gRrtIW3Z+61pVJgISQPi+Q5u1N2BLS0ypahzxe
-O4cdcEjvE+wJUtvdZ91O9PJSoyUqOI8+rrq81Fa1JRlxd9bUW7fvhasd4pTovBPM
-iGaS+9FhqNt03zntens2c/iZQH8JyvZas5XQxsljp0BEWSjpB50CnZ29l1BMC1av
-nryAzKCrGeog36+lsclvjDTQlSg/yfwJjwoRGmpqOfQXKqPibBuD4kwW/mjRVLXf
-H9OX5SjT/PnXmNi4VZQzG5wgh33NzAwqsMMQTvFvj2SLdXDtoHpCkA8uARVblnmw
-LALiISZ5KJ9FmzHKQdYzwNVjBqkWd50PfwZofE4I/9lcCch+H6uz0/ChyFj7ewmV
-ZjFXvN5/muEQfTF53GttIARap0pkVAizsINhc369KNBHaYbnz/JuDD7uH0PwrlQR
-+yNLWK7OvqGOnl0XpYfj/gvU3/TXlFaCtr9g6ybFs/pbNqeDcUypbVQ9UASFyRh9
-xgbSn8OEUHzAeRlRycWaOHfiFA4sVMUk/SOveua1Q5FHA2zF2qdwgl/po+qULCCE
-OdrAGwPFL9ir4XMzdxa9
-=YfIB
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88riwP/RoamKKUOnrb7jLDZe1gAp8P
+XEZlVSwPKzhmhNVj/7QGMO1KgFTBCShrj0eabCuKmTvtst8mZ1XBvF1z7J0Y+caI
+2ahUbLgkRyO7koanQRx2qdSE+rkWHYMKD2t5sfGZhSfkuGZbwSTM+3n3YybfhPNw
+Rx0fNLJ8WhuynDWtVMuo6/7ZbhTYmwVZsUUqNd6xgosTdN125+cuJOg90H0csSlY
+yP29t2rjyKjLgZZv+RpCbrP45Q0KdgS7tQ78R0y+yc7D+7K8igyBXjBxvRXu5eZF
+Y+Ty3Wu685NeyOrIfcuRZVNPucNirn3IzME5QsFoXqakOARLWJ0YjD9jhQKR/fM3
+H0b6QEX6uNy7j7E4ba6u85FpXmpdQxLUfQPWaIIXNhOnt0rynYkIjZMwnJrLCIrJ
+Q272IsYLluEQdDwzeBAo0bktyr3pCN/9YR+oIKqKnrZen5tQLkc4TMUQmHp/VuAZ
+P63eW4tDzgOPJdIS5dsNrbqnMKr5IEcv08iJSGGX1W+BPJ/Kls9ZzOHk2YJg5Yle
+hEZ1U1IDs8h2orJFRFAh9hmNomFlEjklnGUFv+iqNMMugWGbTNLvyUq5nTIUd0rf
++dz6Cz6CgZV/dfJsr31qMIIpfYhmfP1zGUOYJepkh0RVzZnZEwA69Jq8ZuBujnzZ
+A1xtr7MSNQlEflpd9Mpo
+=3iej
 -----END PGP SIGNATURE-----
diff --git a/app-misc/conmux/conmux-0.15.1.ebuild b/app-misc/conmux/conmux-0.15.1-r1.ebuild
index 236d9ce1e516..85f6f167c570 100644
--- a/app-misc/conmux/conmux-0.15.1.ebuild
+++ b/app-misc/conmux/conmux-0.15.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/conmux/conmux-0.15.1.ebuild,v 1.1 2013/10/29 21:12:59 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/conmux/conmux-0.15.1-r1.ebuild,v 1.1 2013/10/31 20:01:54 hwoarang Exp $
 
 EAPI=5
 
@@ -19,9 +19,17 @@ RDEPEND="dev-perl/IO-Multiplex
 	dev-perl/URI"
 DEPEND=""
 
+src_prepare() {
+	# manual installation of drivers and helpers
+	sed -i -e "/include/d" Makefile || die "Failed to fix Makefile"
+}
+
 src_install() {
 		perlinfo
 		emake BASE="${D}/usr" install
+		# helpers and drivers have been removed in src_prepare
+		insinto /usr/share/${PN}
+		doins -r drivers helpers
 		dodir /etc/${PN}
 		# no need to have the init script in /sbin
 		rm "${D}"/usr/sbin/start || die "failed to remove init script"
diff --git a/app-misc/conmux/files/conmux-registry.initd b/app-misc/conmux/files/conmux-registry.initd
index 736fecf6a8ac..4759d529e983 100755
--- a/app-misc/conmux/files/conmux-registry.initd
+++ b/app-misc/conmux/files/conmux-registry.initd
@@ -14,15 +14,17 @@ checkconfig() {
 
 start() {
 	checkconfig
-	ebegin "Starting conmux daemon"
-	touch ${CONMUX_REGISTRY_LOG} ${CONMUX_REGISTRY_FILE}
-	start-stop-daemon -b --start -p /run/conmux-registry.pid \
-		--exec /usr/sbin/conmux-registry \
-		${CONMUX_REGISTRY_PORT} ${CONMUX_REGISTRY_FILE}
+	# Make sure conmux finds everything
+	export PATH="${PATH}:/usr/share/conmux/drivers:/usr/share/conmux/helpers"
+	ebegin "Starting conmux registry daemon"
+	touch ${CONMUX_REGISTRY_LOG}
+	start-stop-daemon -b -m --start -p /run/conmux-registry.pid \
+		--exec /usr/sbin/conmux-registry -- ${CONMUX_REGISTRY_PORT} \
+			${CONMUX_REGISTRY_LOG}
 }
 
 stop() {
-	ebegin "Stopping conmux daemon"
+	ebegin "Stopping conmux registry daemon"
 	start-stop-daemon --stop --pidfile /run/conmux-registry.pid
 	eend $?
 }
diff --git a/app-misc/conmux/files/conmux.initd b/app-misc/conmux/files/conmux.initd
index 75f53de4445f..23485b547658 100755
--- a/app-misc/conmux/files/conmux.initd
+++ b/app-misc/conmux/files/conmux.initd
@@ -19,14 +19,16 @@ checkconfig() {
 
 start() {
 	checkconfig || exit 1
-	ebegin "Starting CONMUX daemon"
-	start-stop-daemon -b --start -1 ${CONMUX_LOG} \
+	# Make sure conmux finds everything
+	export PATH="${PATH}:/usr/share/conmux/drivers:/usr/share/conmux/helpers"
+	ebegin "Starting conmux daemon"
+	start-stop-daemon -m b --start -1 ${CONMUX_LOG} \
 		-2 ${CONMUX_LOG} -p /run/conmux.pid \
 		--exec /usr/sbin/conmux -- ${CONMUX_CONFIG}
 }
 
 stop() {
-	ebegin "Stopping CONMUX daemon"
+	ebegin "Stopping conmux daemon"
 	start-stop-daemon --stop --pidfile /run/conmux.pid
 	eend $?
 }