Version bump, wrt bug #460998, thanks to Sébastien P. <sebastien.picavet AT gmail.com> and Mikle Kolyada <zlog.gentoo AT gmail.com>, drop old

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

4 files changed, 175 insertions, 29 deletions

diff --git a/net-irc/iroffer-dinoex/ChangeLog b/net-irc/iroffer-dinoex/ChangeLog
index edf6675c2ee3..a410a1b18a23 100644
--- a/net-irc/iroffer-dinoex/ChangeLog
+++ b/net-irc/iroffer-dinoex/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-irc/iroffer-dinoex
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/iroffer-dinoex/ChangeLog,v 1.3 2013/02/25 18:35:58 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/iroffer-dinoex/ChangeLog,v 1.4 2013/05/11 18:10:51 pinkbyte Exp $
+
+*iroffer-dinoex-3.29 (11 May 2013)
+
+  11 May 2013; Sergey Popov <pinkbyte@gentoo.org> -iroffer-dinoex-3.28.ebuild,
+  +iroffer-dinoex-3.29.ebuild, +files/iroffer-dinoex-3.29-config.patch:
+  Version bump, wrt bug #460998, thanks to Sébastien P. <sebastien.picavet AT
+  gmail.com> and Mikle Kolyada <zlog.gentoo AT gmail.com>, drop old
 
 *iroffer-dinoex-3.28-r1 (25 Feb 2013)
 
diff --git a/net-irc/iroffer-dinoex/Manifest b/net-irc/iroffer-dinoex/Manifest
index cbbde65c3a91..ed967af25acf 100644
--- a/net-irc/iroffer-dinoex/Manifest
+++ b/net-irc/iroffer-dinoex/Manifest
@@ -1,24 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX iroffer-dinoex-3.29-config.patch 7014 SHA256 2d634a778eeff7fa5014b23b4608040f13708303a439cf6b61e605c610be3121 SHA512 dfb8930341ba93dfec9d29fa5ddb1d457d055e27c74d2dbfba197a17b16685810bf63dceeb19dc6182f8d8086825741cb5e87f952837265084acea0266e0f2e8 WHIRLPOOL 8a7229feb528f2cefd0599eee224b879327af4004b238e08b31f50953aa965e76a82946a209e799b7f7425e707660027e0fdc53a8f7d7df9f0987ed2fc8ef349
 AUX iroffer-dinoex-Werror.patch 498 SHA256 a475717491baac498f4865be62097bc75f31880bd5b6ff3888dbe04fc11effab SHA512 6d8b1e9410c90f635186749f0335e1de689333bcde2918453e7fd6e4ed3e917553d36cba694c1a8a4077a6e45c3019290cd56646aa39c6677802042e5ab131db WHIRLPOOL a6a8780ad4959246cecb4f9cea303222da4c76b25e04eab0c9b8dac3c41859c2f1c5e4445b3073f37170eb02dd9fd961c884850892b562f78c13f3319bc598b4
 AUX iroffer-dinoex-config.patch 6876 SHA256 2f0398e2b625822d37d40dbce849e2787a13b19aadd006c8d088252007016c71 SHA512 c681e06e6b7304b4e45cd23ec21d05a6af3d57cdd2ee8786409e26068ee30f18023076266575e00c75fc01777c4b01e209075e495df1a99be27bdb357ce71d83 WHIRLPOOL b4a89274fe44cebbc4b39d8fba39085c546b7bd5e2f4bcedc697faef2d7ffbace97f1e74375bc8854f51495fd25a3fde376298911ada1eded263d44051141298
 AUX iroffer-dinoex.conf 378 SHA256 e934eba1390e7492101c02dab4c3867dd9df61139063d072ce8115ef2bd23d0d SHA512 6dee05c4fdc5d8e62c9ac76406a7e85f1e944bb2b1f82237422f01002c6adceaf4f05073c3e378e3f61000652814292639640e1dcc2a0dbcd2bd68a76687d634 WHIRLPOOL a6a24945c1a144b4d4d818e0af0800673418ac29e92fc0e301d9088a7dbbe50a09a41c1c26e4bbebb13d6fd1df826e8bb757d2803302576ea19f743369d4b8a6
 AUX iroffer-dinoex.init 1254 SHA256 fff56047317659f20e0f8912295982479f2ead0a9d0456f5efb557285517e687 SHA512 394f6f09f7f73a63777329cce4ce478c08ea0b3cd65c13b4cfb191972e18028ab745ffa521003830f54198ced912d4df94b3ec7fb27680fa0a6cff94a3b16ca4 WHIRLPOOL e1102b0e148d32ee9ecca8120208c347889ac5079fb125614855945031d5e2512cee0fa67826248bd588a0a53b223451cc7325724d55fb5771a411627c35026f
 AUX iroffer-dinoex.logrotate 317 SHA256 9857064ee0eb2f08b3d1e68d995d1f730852fc0ec0c64565cc62239f32345a0f SHA512 3f2b7c8f2041dfd2114b37552fc12e35c545f68a20017112922c98982e9b8bfb0b3eac0447649bc2bfb967e7503eead541cf564d99c48eac4888f8550f32e30c WHIRLPOOL 82ee3b4631684cc79fd743fb78f068d2d6dd981a4146a6e0334b794a8adae39c4df66160d7d38852a2af9bf56267461b60222fb5490b0aa17643410b7ca75cae
 DIST iroffer-dinoex-3.28.tar.gz 526729 SHA256 b96e9415f506eb7c15edec53cbeb96946739ea697fb4fea819184b1d4535c1b1 SHA512 b7653062877feee0d009700357b6b72eebf14b8db0deb2e136808cf59108008e4944093f5e811386b3678f688f3317611a50017bf8c3e212848ef88338f9b13c WHIRLPOOL d6442c02e44e84990c4cb04e15ad2b409625ad82f5a3237cdd84accf86b42ccfcf1bf5a6309fea66364acdf1b93d6ed3a8023f6a78d5f14b92f0cea27c3a86b9
+DIST iroffer-dinoex-3.29.tar.gz 537027 SHA256 d96c307062552878d7594e280eef3a8669b4af955f1efe1d6e3e7ad660f9a6fb SHA512 bac4feaa0db11de3faed0beb7302cb090d3a6629a6c299bd1b4ee136bce7290f1a9fa998aab909f1fafe54f5577bed90f487d4b2592521a87d5d9ae7512eecb0 WHIRLPOOL 2917244bfc2c0d05f5660b767dfa39da6099e5388dedea5c2578a483fc52747959c296f65a71cd3a8a24740afca1c3fab8e7825052fec4ac5eadce558917fcd7
 EBUILD iroffer-dinoex-3.28-r1.ebuild 2860 SHA256 583590dee11930e95f6a45dc5f2049d6906e957616276905e38734c37ca0f209 SHA512 4b2b8891b4c7f5e49f7994dd4e382768f37ef01f6934408b1b01a39959996eadef8de3b2cace33f2c0f836438d23411992201c7df451c84f882a36f91883c929 WHIRLPOOL bb652986bc8a62a0b69b7d53a9dcae9e2bdd1e1f1509edf8c7b75645cb0bd2bcd93aea3a0ded0e504373c4e0db3de7fb8ecf1e646e4c5b0135a3956c91f43079
-EBUILD iroffer-dinoex-3.28.ebuild 2693 SHA256 3c26945c72cc5a856ed0ac627c2397c1c38993332656ece83e944f0337e7b587 SHA512 aeef07c26032e22e2fec5d8f8d20151e55a61a1cdab43f4ef0c00714e850ee52f6c6649339b6f72a74c3e8b57a38e83217a5dfcf103b5791214756c09f68b1b8 WHIRLPOOL 84e03a1e7c2fae4e9a66437b2963982e61daa364ceb07c23f9350140fd0f3dbbb82f6eb466ca747f3bdb2efeb3f7a651bafb5c1ae5c3b768c208371247360cf5
-MISC ChangeLog 1129 SHA256 350f3d5497bc2be68043cbc6fecca60c92a8a556bdb28ca1bd18b7f2ae73f5ea SHA512 f44a01590604d2623fa0bb8ece9dccecc7d1ee2805675c1e46ff2308007edcfb5123ca949642a8734f0a02470bd5f6db74e965997da8aac1e8fb97a99d6cb3d9 WHIRLPOOL 7bbd657b64510af0a3c2fd01b5b73092116f52502f8f23f6ec0ccec77d434a72393718cb2aababe72eaef6f060e110bf983cb3af51407a168792674e471b1fbe
+EBUILD iroffer-dinoex-3.29.ebuild 2774 SHA256 82928de24473a86b8f7fb08ffbd2e24bf8f7fcf81ed2eb40123860f7532d1273 SHA512 2ab8b01792b1ad9cb78fb0a95b49b2e255eb31df67fb21d125c6d0c7bcab94ce2ecc0f0be97389cca62641eec82da8625e1a73439f4a624cb3795bcb1fc03670 WHIRLPOOL 09b3ae24dac762de7a19655fe8fb0f0b5803ec515ff3dd7950fe4c4b5a7fdd7fc94701df4d6e51f9d2c86bd0aa19286a89abe39bfc4858544fb48e88c3f305d0
+MISC ChangeLog 1464 SHA256 f8b34876bcf2757f61368284e6b31eff6d4850957e86a254757d62b49059fe3e SHA512 ad51fa470337623f17081241235de6b158589fa9cd25bbc024fee0f6388a76e335b805cc2d3b9a858abbf1676ab76a1fcfb2a131c3c0c3450f7dce58a1b0aae8 WHIRLPOOL 8b86d1d885728a30fbe9fc343fa93b05c1cc24c14c5464f148c49f1765bed43dfe19910a24509769aaa1badbfbcc40ee6d490e806b24d5320867ad298bd2a705
 MISC metadata.xml 924 SHA256 2d7211f38abd446843a7a692626ac950f534cfd2ca1316c83b42a2e6e413845a SHA512 64dc490671edc6039986afdb0e5c227dbd524d44def8c2f38401436fdc037d13366212cd9fbca9e06b0ca28a41de4b8ea0cee0138e2e7e82e52b62e055d415ed WHIRLPOOL 5a3770267ebe226843f633b75353df7af4a0cf274a978e3ba6dbb469ab9163901bfc19876904fd6fca7e7c6070352dd738156ee4100cb939c86ea8ffda27b183
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRK68TAAoJECo/aRed9267x+0IAIqVvkv4fc7RWiSioLCWw+Tp
-gj1WjCyavDnZ32XTwz4gwAgsJ/hx4bmjbIw2+TvsBdErDQT49BuBLtf4zvM4pzb1
-5mPZ5rdKm3JtLqmRCUOgUJe7Ywo+cjAVvBdQiaQufeTsnMqzdsKhMf6jpizhsUSf
-gMleYPgsK24UZQvjzrznKXXlDeEMR4wMd4kSD2P9zJufergPwfozysmkOR5qhGcJ
-+VMZN5NMUlhZWaYpx3V2O12CnL4FTXoJsWy42SAywshIBPiFJfVyuAPc6vvEb5Ya
-iWPEM4QeT9ZuMhnBhuswXO61WDEA5pYYmMbUuR9kM5aMuJYKQ9vpU/81p/0lGYk=
-=kQSK
+iQEcBAEBCAAGBQJRjomwAAoJECo/aRed9267jQIH/1owqycMAY1DSDhCmwcGSYDW
+bVLA7Sre2RvPDJn9IKOmdakseJQJ9cMVdTEbVKbjZtURMhZ+/GUyqOMAL3up6/4D
+BBif0UXY+vDVv4tX0Tv88mPlqOm9YotvLNPXkKXQnx4SIL3JTnHJOMUbhLCmkeDG
+4ygYcLhMXyldNAGPbm8m27oqXmdAwdjDweM9P+IC4m9iQwV/Q8IkhxRztGrqVJBx
+YEWUTS3AObrQNs6EtwrYVFXjXeZie1gdUT7I82PjXZYSPe3A8QsmixaUZhgbctG+
+SYDRYuzvPBLTJLB8Wk7DPGKqZkuxDS9tCvFrr4oaXBYTM0l0W+vuWetDpACI2dI=
+=ib53
 -----END PGP SIGNATURE-----
diff --git a/net-irc/iroffer-dinoex/files/iroffer-dinoex-3.29-config.patch b/net-irc/iroffer-dinoex/files/iroffer-dinoex-3.29-config.patch
new file mode 100644
index 000000000000..5dc9d6183ef6
--- /dev/null
+++ b/net-irc/iroffer-dinoex/files/iroffer-dinoex-3.29-config.patch
@@ -0,0 +1,130 @@
+diff -ru iroffer-dinoex-3.29/beispiel.config iroffer-dinoex-3.29.NEW/beispiel.config
+--- iroffer-dinoex-3.29/beispiel.config	2013-02-01 08:28:18.000000000 +0100
++++ iroffer-dinoex-3.29.NEW/beispiel.config	2013-03-09 18:43:33.084000000 +0100
+@@ -15,19 +15,19 @@
+ ##############################################################################
+ ###                             - pid file -                               ###
+ ### Schreibt die Prozess-ID beim Start in diese Datei                      ###
+-pidfile mybot.pid
++pidfile /var/run/iroffer-dinoex/iroffer-dinoex.pid
+ 
+ ##############################################################################
+ ###                             - log file -                               ###
+ ### logfile gibt die Logdatei für den Bot an.                              ###
+-logfile mybot.log
++logfile /var/log/iroffer-dinoex/mybot.log
+ 
+ ##############################################################################
+ ###                            - log rotate -                              ###
+ ### logrotate gibt den Zeitraum vor, nach dem die Logdatei gewechselt      ###
+ ### wird, mögliche Werte "none" (nie), "monthly" (monatlich),              ###
+ ### "weekly" (wöchentlich), "daily" (täglich) und 1-24 (stündlich).        ###
+-logrotate weekly
++logrotate none
+ 
+ ##############################################################################
+ ###                         - expire logfiles -                            ###
+@@ -48,7 +48,7 @@
+ ### Diese Datei dient als allgemeines Datenlager für die bereitgestellten  ###
+ ### Dateien und die dazugehörigen statistische Daten. Hier werden auch die ###
+ ### Beschreibungen der Pakete gespeichert.                                 ###
+-statefile mybot.state
++statefile /var/lib/iroffer-dinoex/mybot.state
+ 
+ ##############################################################################
+ ###                          - old state file -                            ###
+@@ -74,7 +74,7 @@
+ ### als Packliste auf einer Webseite zu dienen, oder für andere Zwecke.    ###
+ ### Wenn xdcclistfileraw gesetzt ist, werden die IRC-Farbcode auch mit     ###
+ ### ausgegeben.                                                            ###
+-xdcclistfile mybot.txt
++xdcclistfile /var/lib/iroffer-dinoex/mybot.txt
+ #xdcclistfileraw
+ 
+ ##############################################################################
+diff -ru iroffer-dinoex-3.29/exemple.config iroffer-dinoex-3.29.NEW/exemple.config
+--- iroffer-dinoex-3.29/exemple.config	2013-02-01 08:26:21.000000000 +0100
++++ iroffer-dinoex-3.29.NEW/exemple.config	2013-03-09 18:45:35.340000000 +0100
+@@ -15,18 +15,18 @@
+ ##############################################################################
+ ###                             - pid file -                               ###
+ ### Écrit l'identifiant du processus dans ce fichier au lancement.         ###
+-pidfile monbot.pid
++pidfile /var/run/iroffer-dinoex/iroffer-dinoex.pid
+ 
+ ##############################################################################
+ ###                             - log file -                               ###
+ ### Écrit le journal du robot dans ce fichier.                             ###
+-logfile monbot.log
++logfile /var/log/iroffer-dinoex/mybot.log
+ 
+ ##############################################################################
+ ###                            - log rotate -                              ###
+ ### Archivage du journal jamais (« none »), quotidien (« daily »),         ###
+ ### hebdomadaire (« weekly ») ou mensuelle (« monthly »).                  ###
+-logrotate weekly
++logrotate none
+ 
+ ##############################################################################
+ ###                         - expire logfiles -                            ###
+@@ -44,7 +44,7 @@
+ ##############################################################################
+ ###                             - state file -                             ###
+ ### Fichier temporaire de stockage des informations d'état d'Iroffer.      ###
+-statefile monbot.state
++statefile /var/lib/iroffer-dinoex/mybot.state
+ 
+ ##############################################################################
+ ###                          - old state file -                            ###
+@@ -71,7 +71,7 @@
+ ### « xdcclistfile » et Iroffer écrira la liste XDCC dès que nécessaire.   ###
+ ### Si « xdcclistfileraw » est défini, le fichier sera écrit avec les      ###
+ ### caractères spéciaux IRC (couleur, format, etc.)                        ###
+-xdcclistfile monbot.txt
++xdcclistfile /var/lib/iroffer-dinoex/mybot.txt
+ #xdcclistfileraw
+ 
+ ##############################################################################
+diff -ru iroffer-dinoex-3.29/sample.config iroffer-dinoex-3.29.NEW/sample.config
+--- iroffer-dinoex-3.29/sample.config	2013-02-01 08:26:58.000000000 +0100
++++ iroffer-dinoex-3.29.NEW/sample.config	2013-03-09 18:46:30.612000000 +0100
+@@ -15,18 +15,18 @@
+ ##############################################################################
+ ###                             - pid file -                               ###
+ ### Writes the process id to this file on startup                          ###
+-pidfile mybot.pid
++pidfile /var/run/iroffer-dinoex/iroffer-dinoex.pid
+ 
+ ##############################################################################
+ ###                             - log file -                               ###
+ ### Writes logging information to this file.                               ###
+-logfile mybot.log
++logfile /var/log/iroffer-dinoex/mybot.log
+ 
+ ##############################################################################
+ ###                            - log rotate -                              ###
+ ### After the time given here a logfile will be rotated.                   ###
+ ### logrotate can be set to none, 1 - 24 hours, daily, weekly or monthly   ###
+-logrotate weekly
++logrotate none
+ 
+ ##############################################################################
+ ###                         - expire logfiles -                            ###
+@@ -44,7 +44,7 @@
+ ##############################################################################
+ ###                             - state file -                             ###
+ ### temporary storage for iroffer state information across restarts        ###
+-statefile mybot.state
++statefile /var/lib/iroffer-dinoex/mybot.state
+ 
+ ##############################################################################
+ ###                          - old state file -                            ###
+@@ -71,7 +71,7 @@
+ ### needed.                                                                ###
+ ### If xdcclistfileraw is set the file will be written with the IRC        ###
+ ### control characters included (color, formatting, etc..).                ###
+-xdcclistfile mybot.txt
++xdcclistfile /var/lib/iroffer-dinoex/mybot.txt
+ #xdcclistfileraw
+ 
+ ##############################################################################
diff --git a/net-irc/iroffer-dinoex/iroffer-dinoex-3.28.ebuild b/net-irc/iroffer-dinoex/iroffer-dinoex-3.29.ebuild
index d9c33066bb3a..76d6b15a068b 100644
--- a/net-irc/iroffer-dinoex/iroffer-dinoex-3.28.ebuild
+++ b/net-irc/iroffer-dinoex/iroffer-dinoex-3.29.ebuild
@@ -1,31 +1,30 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/iroffer-dinoex/iroffer-dinoex-3.28.ebuild,v 1.1 2013/02/08 11:44:38 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/iroffer-dinoex/iroffer-dinoex-3.29.ebuild,v 1.1 2013/05/11 18:10:51 pinkbyte Exp $
 
 EAPI=5
 
 PLOCALES="de en fr it"
+PLOCALE_BACKUP="en"
 
 inherit eutils l10n toolchain-funcs user
 
 DESCRIPTION="IRC fileserver using DCC"
 HOMEPAGE="http://iroffer.dinoex.net/"
-SRC_URI="http://iroffer.dinoex.net/${P}.tar.gz"
+SRC_URI="http://iroffer.dinoex.net/${P}.tar.gz
+	http://iroffer.dinoex.net/HISTORY/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+admin +blowfish curl debug geoip gnutls +http kqueue +memsave ruby ssl +telnet upnp"
+IUSE="+admin +blowfish +chroot curl debug geoip gnutls +http kqueue +memsave ruby ssl +telnet upnp"
 
 REQUIRED_USE="
 	admin? ( http )
 	gnutls? ( ssl )
 "
 
-# Dependency on NSS should be optional, but it causes automagic, so it is hard for now.
-#	chroot? ( dev-libs/nss )
-#	$(usex chroot '' '-no-chroot' '' '')\
-RDEPEND="dev-libs/nss
+RDEPEND="chroot? ( dev-libs/nss )
 	curl? (
 		net-misc/curl[ssl?]
 		gnutls? ( net-misc/curl[curl_ssl_gnutls] )
@@ -44,8 +43,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-config.patch"\
+	epatch "${FILESDIR}/${P}-config.patch"\
 	       "${FILESDIR}/${PN}-Werror.patch"
+	epatch_user
 	l10n_find_plocales_changes "" 'help-admin-' '.txt'
 }
 
@@ -60,6 +60,7 @@ src_configure() {
 		$(usex debug '-profiling' '' '' '')\
 		$(usex debug '-debug' '' '' '')\
 		$(usex geoip '-geoip' '' '' '')\
+		$(usex chroot '' '-no-chroot' '' '')\
 		$(usex curl '-curl' '' '' '' )\
 		$(usex gnutls  '-tls' '' '' '' '')\
 		$(usex upnp '-upnp' '' '' '')\
@@ -75,29 +76,35 @@ src_configure() {
 
 src_compile() {
 	# TODO: default compile targets always include chrooted target, which is not good
-	emake CC="$(tc-getCC)"
+	emake CC="$(tc-getCC)" $(l10n_get_locales)
 }
 
 myloc() {
-	use admin && dodoc help-admin-${1}.txt
+	emake DESTDIR="${D}" install-${1}
+
+	dodoc help-admin-${1}.txt
 	use http && dohtml doc/INSTALL-linux-${1}.html
+
+	insinto /etc/${PN}
+	case ${1} in
+	"de")
+		doins beispiel.config;;
+	"fr")
+		doins exemple.config;;
+	*)
+		doins sample.config;;
+	esac
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README* THANKS TODO
-
-	doman iroffer.1
-	doman xdcc.7
-
 	l10n_for_each_locale_do myloc
 
+	dodoc README* THANKS TODO
+	doman iroffer.1 xdcc.7
+
 	newinitd "${FILESDIR}/${PN}.init" ${PN}
 	newconfd "${FILESDIR}/${PN}.conf" ${PN}
 
-	insinto /etc/${PN}
-	doins sample.config
-
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}/${PN}.logrotate" ${PN}