net-irc/irker: Version bump, document syslog in conf.d, handle IRKERD_LOGFILE checkpath only when IRKERD_LOGFILE is defined and not IRKERD_LOGLEVEL which is independant, drop python-3 support, drop Register-author_name-as-author-instead-of-email-user.patch that is now merged

Package-Manager: portage-2.2.10

8 files changed, 40 insertions, 96 deletions

diff --git a/net-irc/irker/ChangeLog b/net-irc/irker/ChangeLog
index c420bc59..b60615b0 100644
--- a/net-irc/irker/ChangeLog
+++ b/net-irc/irker/ChangeLog
@@ -1,3 +1,17 @@
+*irker-2.9 (06 Jun 2014)
+
+  06 Jun 2014; Bertrand Jacquin <beber@meleeweb.net>
+  +files/2.9-irkerhook-Register-author_name-as-author-instead-of-.patch,
+  +files/2.9-irkerhook-Remove-file-listing.patch, +irker-2.9.ebuild,
+  -files/2.7-Git-Fixed-presentation-of-branches-containing-front-.patch,
+  -files/2.7-Register-author_name-as-author-instead-of-email-user.patch,
+  -files/2.7-irkerhook-Remove-file-listing.patch, -irker-2.7.ebuild,
+  files/irkerd.confd, files/irkerd.initd:
+  net-irc/irker: Version bump, document syslog in conf.d, handle IRKERD_LOGFILE
+  checkpath only when IRKERD_LOGFILE is defined and not IRKERD_LOGLEVEL which is
+  independant, drop python-3 support, drop Register-author_name-as-author-
+  instead-of-email-user.patch that is now merged
+
   27 Apr 2014; Bertrand Jacquin <beber@meleeweb.net> irker-2.7.ebuild:
   net-irc/irker: Drop python-2.6 support
 
diff --git a/net-irc/irker/Manifest b/net-irc/irker/Manifest
index a2bc3fd6..1dea8fd2 100644
--- a/net-irc/irker/Manifest
+++ b/net-irc/irker/Manifest
@@ -1,9 +1,8 @@
-AUX 2.7-Git-Fixed-presentation-of-branches-containing-front-.patch 1544 SHA256 332b325839a412fd0f17f96aa14b898bdfabfcc8da933f49381f74f698f19dc8 WHIRLPOOL cf4690211055b611156d1498e325a2612a01b6f413627d04a1bb7a8f278c50f8a4c1d80a8d0f2188a6a3af1add1544725a0466bc87f01600fe0cff186ba4f45b
-AUX 2.7-Register-author_name-as-author-instead-of-email-user.patch 1637 SHA256 c742b823b0a14452604d63b6ad5a4f5490f6c923641ddda1ec46fc714a37fed4 WHIRLPOOL a27111384b551daaad88d44441686d6ed939b6e70bdf20509bd699580f970c28b1b046294590c15c0affcf6d68e034be81ee397c0b48b833ff89249ef487fd3a
-AUX 2.7-irkerhook-Remove-file-listing.patch 6023 SHA256 97ff5bbdfb91dd0c07f339e248fa67acc030502d855784dff0f1b9aff6da6a1e WHIRLPOOL 862b9f2b4a35be9b9f92f07861656c8e4a33d602b76229e95473cbc87dad849eb2db4eb043d25dab7dfa41cc549a667e41f2ea8fc9192985ce2887b3303fd791
-AUX irkerd.confd 508 SHA256 e564b3427f08be4bc232afcbed5e86caf129153e88da113f87b81342904d8a5e WHIRLPOOL d89c267abd723477ef7ee2b03d7958a1cb4db032a3d29efa865ca7be9e92a151672d432974774259df45cc217dd5ad48a92f7362cf427f8161e0eb9065f2e703
-AUX irkerd.initd 1401 SHA256 0cd9461cd6c2b260eeb726b4028d9aa2dfbe70ed4511f8c7dd0c1112175df6aa WHIRLPOOL 99c16fada3c9547cdbe4d007e5fd0cc8c068fa16193127385d83f549acdd0bdd5bb3b0da8f49ea0dc849626a217c2c38dc66ed94ba9e5d7d52468dbd56a81801
-DIST irker-2.7.tar.gz 39679 SHA256 d4d2513e7baa9282f461d128a52ca0e6b7f22600c0c674734ef29119a14bb779 WHIRLPOOL 0893ddaee80d4bf13d4d5f3ec4e0b55e7212bba29909b7c2532bcdfb901cb833a990e7e217063cb6b2e20404f699b8fb1ccd184803afec0cf13f4afd83df92bb
-EBUILD irker-2.7.ebuild 2216 SHA256 fe6e65d9fd51103c1408b10ef1a98f203ae302e653884840374935d695dbc8ab WHIRLPOOL dc1babbe39fc940ea05e483f3c5362d1cb124bac3130a4e01b19ee4e29da04247b198e35f995af793bfbadc938d95acc468043df9b51825ff850e12bfe186d8a
-MISC ChangeLog 4848 SHA256 05ae5aafdf97352939790d762f77ecb7c3b561454fc90c55470553dcd389fcd1 WHIRLPOOL dd1bc1ca9b2e84c6da6e7a0f9093ffd46771eb96d57cfc1cfe743ab721a9ede2b7fb253ae556c1bf2b405c925804ed3ee4bc6a256dd199628e5e64c244336e94
+AUX 2.9-irkerhook-Register-author_name-as-author-instead-of-.patch 1596 SHA256 59b9003957b0767e8e972469b4c2da7749d6b7e9be3791f99aca700afd80797c WHIRLPOOL b9830086fd92d58f08c339deab41d22284f5d6f42a6f76e7107248e5124579f3341ff928a530b3688d451cb5ba0d6c366e3a4159ee309fd12d3438a0aeeed933
+AUX 2.9-irkerhook-Remove-file-listing.patch 5970 SHA256 f8de5befb68a7532fbf6d327d4eb0332aa116ebc3fa9a19599cd48544dcaec0f WHIRLPOOL f606e945203911ab5658773dd68ba61931d486e858ada037ac84723bf3445b24f9cbc246e41d5bc83eb2b07e86ff82ed693af25ade68ed5097b4e41226079de4
+AUX irkerd.confd 474 SHA256 ae185817636a5537514d6269eb273602a3043e963ea5d4f2f83f5d3438c8fa2b WHIRLPOOL 6089ed013d01fa611871fce3f82569ca9d7e7d9069e2aa89817f6732dd2edda4f2d8ba9462a8195ec896bbc6d2df2770fdd476212e554c012fe0fb78a8e72886
+AUX irkerd.initd 1210 SHA256 1ca07247036df6dbac2f355044bc66a9b8188ff14af57f84611f711827c1a817 WHIRLPOOL 2c9f3f44e28533d302b0a151e48eb5a63ed414466e9d64ce7bc7cb239ae6b4bd27fa13a9193c7245207733dc2e9047ff3407dda5061791d5b9cf7e625d71a300
+DIST irker-2.9.tar.gz 41050 SHA256 1c743a86275e8bf91f133b70943a1296d960e2dcc8c5e8dd894bc9a3c9a824b5 WHIRLPOOL d1c76f1bcc329b4720a823714b1bb6aae81af5913f627474f5b938ac54e09da22f3fbb58f89d79dba0f4833e3a47efeb8f13d2dfffd7a8a2f97c49cf8db200cd
+EBUILD irker-2.9.ebuild 1609 SHA256 6f2ca63af09c064518e8656fc085ac43c271403bec9a48622b21d4bd5e75e7de WHIRLPOOL 9eae0e477b0ed05d1cd6f2da747308df9dc0b9cbb271879805538b22910d32fc41eab6afa3bc35f08d16b6cc4bd2579ad5c49be8ace7e711cfdc5787d07e5983
+MISC ChangeLog 5612 SHA256 7e69e132e3656d90c6896ab2a769a39f1947ca22565916c2013d422c9c85face WHIRLPOOL 81e36f212a147a8acec165ce6adeed080697a677f5665acfb7d5274c730a5343dbb19c644827c236eee4c1b01963694959aea946c3db345e03d98feff0b4f2c4
 MISC metadata.xml 251 SHA256 1dc1bab1ff96244c27b9b58c2fe2d28ce1a98c05f6524fac17a81bdcd7595126 WHIRLPOOL b295e8385062a941df1bd67b2fadb95b44b2d640189ad6b3c1deca82bd5204c7096a65bd681aa3120b248f71621c4d2224ae0849eb4e81030a2709e3fdefa752
diff --git a/net-irc/irker/files/2.7-Git-Fixed-presentation-of-branches-containing-front-.patch b/net-irc/irker/files/2.7-Git-Fixed-presentation-of-branches-containing-front-.patch
deleted file mode 100644
index 84e14a07..00000000
--- a/net-irc/irker/files/2.7-Git-Fixed-presentation-of-branches-containing-front-.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 6bcd90c94d2faf586f2730c591de8175238b043d Mon Sep 17 00:00:00 2001
-From: Tom Hacohen <tom@stosb.com>
-Date: Tue, 24 Sep 2013 16:45:42 +0100
-Subject: [PATCH 3/3] Git: Fixed presentation of branches containing
- front-slashes.
-
-Many projects use hierarchical branch names, for example:
-"devs/tasn/feature-branch"
-Before this commit, the branch above would be printed as "feature-branch"
-instead of "devs/tasn/feature-branch".
-
-Signed-off-by: Bertrand Jacquin <beber@meleeweb.net>
----
- irkerhook.py | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/irkerhook.py b/irkerhook.py
-index f2f82cf..82281e3 100755
---- a/irkerhook.py
-+++ b/irkerhook.py
-@@ -39,7 +39,7 @@ default_channels = "irc://chat.freenode.net/#commits"
- 
- version = "2.7"
- 
--import os, sys, commands, socket, urllib, subprocess, locale, datetime
-+import os, sys, commands, socket, urllib, subprocess, locale, datetime, re
- from pipes import quote as shellquote
- try:
-     import simplejson as json	# Faster, also makes us Python-2.5-compatible
-@@ -258,7 +258,8 @@ class GitExtractor(GenericExtractor):
-     def commit_factory(self, commit_id):
-         "Make a Commit object holding data for a specified commit ID."
-         commit = Commit(self, commit_id)
--        commit.branch = os.path.basename(self.refname)
-+        # Get rid of refs/*/ for cleaner output.
-+        commit.branch = re.sub(r"^refs/[^/]*/", "", self.refname)
-         # Compute a description for the revision
-         if self.revformat == 'raw':
-             commit.rev = commit.commit
diff --git a/net-irc/irker/files/2.7-Register-author_name-as-author-instead-of-email-user.patch b/net-irc/irker/files/2.9-irkerhook-Register-author_name-as-author-instead-of-.patch
index a19da1f4..c459887b 100644
--- a/net-irc/irker/files/2.7-Register-author_name-as-author-instead-of-email-user.patch
+++ b/net-irc/irker/files/2.9-irkerhook-Register-author_name-as-author-instead-of-.patch
@@ -1,15 +1,15 @@
-From 108e898c600cf7a80a3d01a83a270c7579460b42 Mon Sep 17 00:00:00 2001
+From 8775a9d04b720cf5fb9ce8220e643b3731ea3cb7 Mon Sep 17 00:00:00 2001
 From: Bertrand Jacquin <beber@meleeweb.net>
 Date: Mon, 23 Sep 2013 23:10:23 +0200
-Subject: [PATCH 1/3] Register author_name as author instead of email userpart
+Subject: [PATCH 1/2] irkerhook: Register author_name as author instead of
+ email userpart
 
-Signed-off-by: Bertrand Jacquin <beber@meleeweb.net>
 ---
  irkerhook.py | 11 ++---------
  1 file changed, 2 insertions(+), 9 deletions(-)
 
 diff --git a/irkerhook.py b/irkerhook.py
-index 5f15032..36a875e 100755
+index 1ee62fe..536848b 100755
 --- a/irkerhook.py
 +++ b/irkerhook.py
 @@ -275,15 +275,8 @@ class GitExtractor(GenericExtractor):
diff --git a/net-irc/irker/files/2.7-irkerhook-Remove-file-listing.patch b/net-irc/irker/files/2.9-irkerhook-Remove-file-listing.patch
index cbbb38c2..f8e2293b 100644
--- a/net-irc/irker/files/2.7-irkerhook-Remove-file-listing.patch
+++ b/net-irc/irker/files/2.9-irkerhook-Remove-file-listing.patch
@@ -1,15 +1,14 @@
-From 82376d74107035950ef4181fdc889ae9409378b6 Mon Sep 17 00:00:00 2001
+From 77c87a35a1013ccd6914c89bdf7a7722696e0ad2 Mon Sep 17 00:00:00 2001
 From: Bertrand Jacquin <beber@meleeweb.net>
 Date: Mon, 7 Oct 2013 13:33:30 +0200
-Subject: [PATCH 2/3] irkerhook: Remove file listing
+Subject: [PATCH 2/2] irkerhook: Remove file listing
 
-Signed-off-by: Bertrand Jacquin <beber@meleeweb.net>
 ---
  irkerhook.py | 34 +++-------------------------------
  1 file changed, 3 insertions(+), 31 deletions(-)
 
 diff --git a/irkerhook.py b/irkerhook.py
-index 36a875e..f2f82cf 100755
+index 536848b..0ad2b22 100755
 --- a/irkerhook.py
 +++ b/irkerhook.py
 @@ -57,7 +57,6 @@ class Commit:
@@ -77,7 +76,7 @@ index 36a875e..f2f82cf 100755
  def hg_hook(ui, repo, **kwds):
 @@ -423,27 +415,7 @@ def ship(extractor, commit, debug):
              sys.stderr.write("irkerhook.py: could not decode JSON: %s\n" % data)
-             raise SystemExit, 1
+             raise SystemExit(1)
  
 -    # Rewrite the file list if too long. The objective here is only
 -    # to be easier on the eyes.
diff --git a/net-irc/irker/files/irkerd.confd b/net-irc/irker/files/irkerd.confd
index f176e624..42ae7323 100644
--- a/net-irc/irker/files/irkerd.confd
+++ b/net-irc/irker/files/irkerd.confd
@@ -6,14 +6,13 @@
 # Nick-Server password
 # IRKERD_PASSWORD=""
 
-# Log file, intended for debug purpose only, no logrotate will
-# handle this logfile
+# Log file, if none syslog is used (facility daemon)
 # IRKERD_LOGFILE=""
 
 # Debug Level (critical, error, warning, info, debug)
 # IRKERD_LOGLEVEL=""
 
-# To run an anonymous irkerd safely. It should not able able
+# To run an anonymous irkerd safely. It should not be able
 # to write to anywhere on your system
 # IRKERD_USER=""
 
diff --git a/net-irc/irker/files/irkerd.initd b/net-irc/irker/files/irkerd.initd
index dcc1dfb5..5973cbc7 100755
--- a/net-irc/irker/files/irkerd.initd
+++ b/net-irc/irker/files/irkerd.initd
@@ -7,8 +7,6 @@
 
 : ${IRKERD_NICK:=}
 : ${IRKERD_PASSWORD:=}
-: ${IRKERD_LOGFILE:=/var/log/${RC_SVCNAME}.log}
-: ${IRKERD_LOGLEVEL:=0}
 : ${IRKERD_USER:=nobody}
 
 depend() {
@@ -16,12 +14,7 @@ depend() {
 }
 
 start () {
-	if [[ ${IRKERD_LOGLEVEL} ]] ; then
-		IRKERD_OPTS="${IRKERD_OPTS} -d ${IRKERD_LOGLEVEL}"
-
-		ewarn "IRKERD_LOGLEVEL is intended to be used for debugging purpose only"
-		ewarn "No logrotate can handle ${IRKERD_LOGFILE}"
-
+	if [[ ${IRKERD_LOGFILE} ]] ; then
 		checkpath -f \
 			-o "${IRKERD_USER}" \
 			"${IRKERD_LOGFILE}" \
@@ -32,9 +25,10 @@ start () {
 		die "IRKERD_USER is mandatory"
 	fi
 
-	[[ -n "${IRKERD_LOGFILE}"  ]] && IRKERD_OPTS="${IRKERD_OPTS} -l ${IRKERD_LOGFILE}"
-	[[ -n "${IRKERD_NICK}"     ]] && IRKERD_OPTS="${IRKERD_OPTS} -n ${IRKERD_NICK}"
-	[[ -n "${IRKERD_PASSWORD}" ]] && IRKERD_OPTS="${IRKERD_OPTS} -p ${IRKERD_PASSWORD}"
+	[[ ${IRKERD_LOGLEVEL} ]] && IRKERD_OPTS="${IRKERD_OPTS} -d ${IRKERD_LOGLEVEL}"
+	[[ ${IRKERD_LOGFILE}  ]] && IRKERD_OPTS="${IRKERD_OPTS} -l ${IRKERD_LOGFILE}"
+	[[ ${IRKERD_NICK}     ]] && IRKERD_OPTS="${IRKERD_OPTS} -n ${IRKERD_NICK}"
+	[[ ${IRKERD_PASSWORD} ]] && IRKERD_OPTS="${IRKERD_OPTS} -p ${IRKERD_PASSWORD}"
 
         ebegin "Starting ${RC_SVCNAME}"
         start-stop-daemon --start \
diff --git a/net-irc/irker/irker-2.7.ebuild b/net-irc/irker/irker-2.9.ebuild
index ec892205..47687ba0 100644
--- a/net-irc/irker/irker-2.7.ebuild
+++ b/net-irc/irker/irker-2.9.ebuild
@@ -3,7 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/net-irc/irker/irker-1.20.ebuild,v 1.1 2013/05/22 03:40:55 patrick Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_2,3_3} )
+PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="ssl"
 
 inherit python-r1 systemd eutils
@@ -26,10 +26,7 @@ DEPEND="virtual/python-argparse[${PYTHON_USEDEP}]
 
 src_prepare() {
 	# https://gitorious.org/irker/irker/merge_requests/25
-	epatch "${FILESDIR}/${PV}-Register-author_name-as-author-instead-of-email-user.patch"
-	# https://gitorious.org/irker/irker/merge_requests/24
-	epatch "${FILESDIR}/${PV}-Git-Fixed-presentation-of-branches-containing-front-.patch"
-
+	epatch "${FILESDIR}/${PV}-irkerhook-Register-author_name-as-author-instead-of-.patch"
 	epatch "${FILESDIR}/${PV}-irkerhook-Remove-file-listing.patch"
 
 	# Rely on systemd eclass for systemd service install
@@ -44,31 +41,12 @@ src_install() {
 		emake DESTDIR="${ED}" install
 
 		python_doscript "${ED}/usr/bin/irkerd"
+		# Not installed with the default Makefile
+		python_doscript irk irkerhook.py
 	}
 
 	python_foreach_impl python_install
 
-	# irkerhook.py and irk does not yet support >=dev-lang/python-3
-	#
-	# Not yet functionnal for irkerhook.py
-	#    File "/usr/lib/python-exec/python3.3/irkerhook.py", line 417
-	#      raise SystemExit, 1
-	#                      ^
-	# SyntaxError: invalid syntax
-	#
-	# Remove that hack as soon as possible
-	(
-		python_install () {
-			# Not installed with the default Makefile
-			python_doscript irk irkerhook.py
-		}
-
-		PYTHON_COMPAT_OVERRIDE=( python2_7 )
-		_PYTHON_COMPAT_OVERRIDE_WARNED=true
-
-		python_foreach_impl python_install
-	)
-
 	newinitd "${FILESDIR}/irkerd.initd" irkerd
 	newconfd "${FILESDIR}/irkerd.confd" irkerd