[net-irc/inspircd] Revision bump to 2.0.7.

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

5 files changed, 336 insertions, 2 deletions

diff --git a/net-irc/inspircd/ChangeLog b/net-irc/inspircd/ChangeLog
index aa898bb00035..f12ab912cd33 100644
--- a/net-irc/inspircd/ChangeLog
+++ b/net-irc/inspircd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/inspircd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/ChangeLog,v 1.50 2012/06/23 17:16:04 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/ChangeLog,v 1.51 2012/07/07 12:35:20 nimiux Exp $
+
+*inspircd-2.0.7 (07 Jul 2012)
+
+  07 Jul 2012; Chema Alonso <nimiux@gentoo.org> +inspircd-2.0.7.ebuild,
+  +files/inspircd-2.0.7-fix-path-builds.patch, +files/inspircd-2.0.7-init:
+  Revision bump to 2.0.7
 
   23 Jun 2012; Chema Alonso <nimiux@gentoo.org> inspircd-2.0.6_rc1.ebuild,
   +files/inspircd-2.0.6_rc1-gcc-4.7.patch, metadata.xml:
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index e643ba1d0dfd..a3bac5325e40 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX init.d_inspircd 835 SHA256 9342982271398f3572305b8bd83007d9f0aab3ee374c19044153dd5b16cf5780 SHA512 e2f0f738c3ca4dd6846fff3d53ff137730d5a539dcf7adba08e50d8429efb93a48a9edfcb35bdb31da7ca381341acd1c1342b64eb573fb6ca9b21253142d9f84 WHIRLPOOL 92745c2f72203e35055673d4e4b0529b0ee788731e543e0db92ca72bbe4c1e6d90ff6539548337d35664990a6d3513ab44d13b18e54e9ef4a8b5db2eb9517371
 AUX inspircd-2.0.5-r1-fix-make-config.patch 3967 SHA256 2b7d9ac477190c521d1e8b2a9d1a81aa87c8f54322af68ddf31d814485f388aa SHA512 f66203b61002ddd2e1effc6e34f5b7ccbbbf776367ff81bff52fbc0124cd8bb152c681e46dd5138f1febaf94b198fd43d964ebb7fcc8b3a8a8f7566531ee3605 WHIRLPOOL e93f9e55a7679913795b74d4e107794d967d9d5cef5eed2ffde33763ee0e1319fd90ce19a11f823ba2ce0d780fc9002254052c625d96cd5e933b9aaca3744916
 AUX inspircd-2.0.5-r1-init 884 SHA256 750c68cee92603b99b5f0f28ac7655555bab583b86d50f44d23676facdfe089c SHA512 6d9f83666237f002a71c3c1aca689521e2919ab38803735833720828757bfd2888251f73337a94b63f7b1d9c0e38b564f3b7c842614e22ac5dfc3cf22c8f951e WHIRLPOOL 842655b8eac8b3714d51a5178f58f18c7825b0853f4b8eb94e00fb960115af0b3774e98d17a95779ceb499fe18147674e1e909b926db8b8915686bae0450fdca
@@ -5,6 +8,8 @@ AUX inspircd-2.0.5-r2-fix-paths-build.patch 6004 SHA256 099a6715ccacfd49dafcd46a
 AUX inspircd-2.0.6-init 881 SHA256 b4a70f07020cddb8190126ff063a8e698bfc0e13a8fedd555ba3167da13cac68 SHA512 a8dfe2855a578ce92564e4bef4994fbad06962d84ebf6d4155f9b93b1ae6742a5accb2bed667166e450e74ee84f7f3737b80707b3ad76162a47c11852de4953c WHIRLPOOL 00f4deeb78d42cdc96892285c8fae28b31c627c4b6247dcb5931e5f4439fa0de93ec4a20a166c3dd9660d1d40ad52090b7bdac0c1fb7ead5ba5df5d4dfef466f
 AUX inspircd-2.0.6_rc1-fix-path-builds.patch 4821 SHA256 0d332c24166aae07a5d7be5b6faf3ea14a4c0354889670989ba8475d1ff4ea76 SHA512 95a5794d146dfc7af85015f14941dc62f7957f298a22b3c5da2e0a8d0fcb2500015427ccc9d200cf4328fd8960365b95be776108078085bfcd5a156924349196 WHIRLPOOL 99643af0a2b0b1e686b5906517e990ee330d5bbf4e29210538801a3f5e9038c4b73f47adb0c74c53271b57f2bd99bba65f820434d9f5420bdc731ad77e9b785e
 AUX inspircd-2.0.6_rc1-gcc-4.7.patch 313 SHA256 20a0a308bab97277a5cd9cd0a22a5ca831c4dc8c6a813a456c088e2ba4fc80f7 SHA512 d8d5681a7285a98e5ed9917dc366c364f11d559af98b1294e5d968be97e631237ec45f2f001cb6b89b5f9a5977505f0bf6b450c00a84ac3390cc170df4c1200f WHIRLPOOL 777e018e1e7908c3c2c64867f29799fdf4fe917b7b6869f0fc2ac859d13aecde3e7f24089ed859774dec2c45841e7e3c7e00c2b79d2aae8eb609a9ec6dae4322
+AUX inspircd-2.0.7-fix-path-builds.patch 6546 SHA256 6cfa69f464c38d4b49c6d908f848a78e378d62c19afe5d6ddc7be54e4f0996a6 SHA512 a94c0a08f28629d37decafaf60147ccfdac3d4a42600e11f7d5472cbc1948f300b20b438957c6aacd91734c52a47207d4187491cab07fca505a9e508b95dac6f WHIRLPOOL d43d459065d2289fe4b0d635ca42224b7874b4b81f96bcb0df4c3b9f77bee47263136038944c627894e1e3281aee416141ed61c7625b23ef3a2108d9b334d139
+AUX inspircd-2.0.7-init 881 SHA256 8833e1c406230603ec983f4e293f0fce05f34167309ecbb714a65ee08da7c293 SHA512 11f6155a4490ec498d54ae022cc5e36d6f3f22f6769811d0ab6d9036d826cb9f74c1017b69d5e13403298c1058b24610080a59536324cd38bcc14565b192256a WHIRLPOOL b39ce99a1192c7cf8109229d7963ead4c2d109b7d21bd191e3629516d2acf9aba6c5052f0dfbd9d684a4777bb3e03b343f7a2c7a59b85ce93191d0c736e0d00c
 AUX inspircd-fix-config.patch 2656 SHA256 ab88c2ef4b4670283a2e3f4c32d4fd212b508ab53899ee1694bb71df5f9d96a1 SHA512 e1832051a30c21c88a27b91bc26bc2879b2529e47063c9b08eafcd33e0ad7c66e82dc853dcc04720233560d9af3d22f6deae566e82dd164ed84b94316150b0bc WHIRLPOOL a48b4a0fabcc03193d4b5d8583dbe0349df8f66658a10aeac2c6f420972d6713edd555ccca199caf5831e1a954f4f66acf02440e1822d39d6e7f7dff80e247eb
 AUX inspircd-init.d 754 SHA256 041986c91a218c1cdc4d88f78da915990dd4de565c9b3cca3cf2fb15ef38db8f SHA512 96e63e17f5885db3c27179370e632bc4065970e2c36ec34160e0f73197ddb3b0d963d413f05fe673542454e4ddaaa7971a35b3c5f1ceabb2634a632291fa8b86 WHIRLPOOL 188bf5d197c88bfb5a140dd41f0d2bb77226bab6869d2ce8b1323132fed05d22966606393e708fc80d14fcabd5acf52d6c3c2ecf7a63c141c48cc229f4acab0e
 DIST InspIRCd-1.2.8.tar.bz2 637194 SHA256 fa856ddb6d7ab2b4dc6aa6b0f58bbb2360823ce296d4e9dd0f18d630d8c7cee5 SHA512 d1065325c86c400d5686526744f959cecd9cdb575a6d06f1cd4193b6ebc4ba1f480e2694a8dcb2591d7e5743ee361c7f4e515e40969c75b46439f932f36a4930 WHIRLPOOL 07e47a866bf0c30c81c9b24f9d7a42075b99793543e5584c515288b3678e2c2cbd24aa5a4cb70f4ef8570e31f7cee2bbc195381c93485cdc3da54504a2d6b9ae
@@ -12,6 +17,7 @@ DIST InspIRCd-2.0.3.tar.bz2 579960 SHA256 f3d89a2a37137948c7f4e5b40f6670a0129327
 DIST InspIRCd-2.0.4.tar.bz2 579791 SHA256 19c5ff6b52b4b5f9f18ec63de28618dee31c634b0bcecedadcd6a5c6e310fb1e SHA512 844889957c3d21f1f0b5bd3b6ecdd5c26fc4a2d13a7fa7069c27c220d88c576ec00fd0de0d97e417428531318504d90060833e26a665e9575a40278f7635b472 WHIRLPOOL 1d3e3718bbc2076910ce272096dd2faa57e4ab23922b2a0cb1144ba8c7101c7df576eccf9b8aae2312f4b8106cbda493e0a9db328e7b48b91474424aefa0197c
 DIST InspIRCd-2.0.5.tar.bz2 575852 SHA256 425bf79ae1348b398ce6d2348f6cc8baeebe8125f62337e98c136942223f4fc6 SHA512 7bc94a1edfe54412abc56429de5a9475dd142c7242de12cc9dc8d004f2942768bb84a88c2e97815c15597a7aa5bc9063e87890c572841771ad57fa1df46148d6 WHIRLPOOL 0149e45f8714f6b5c9cf3c718742e000e739264acae3862dd3be4bee320029f0c461bdd9c2a41b45b4b4af084d98de57092e50d44f5c7434c6b9c5f85fdbfb3c
 DIST InspIRCd-2.0.6rc1.tar.bz2 576727 SHA256 9c3c7385cb7f62224750c6dc3dcc3c26cfaabedbdb5d7f4fc56636d031cde0d1 SHA512 dfae47957e2df61f5f2a07f6dcb4516ffac45e15f6ce9f8a0ba1ff2559fdd12d28f302f44a47d86c216aa6d17ee29f9fb01f20746dd49d00a260ddd3d11053c7 WHIRLPOOL 57d429528a6747ffc4a1a24eeed1bf7e0f326405fe245b8d8515fd9d7900c745e4aea3d6c3e407e735f6fd355fcbc9d6d5158e0c3ed518c1dfcc6a8befc71ad4
+DIST InspIRCd-2.0.7.tar.bz2 591342 SHA256 7052330853f68fcd7271ed613698fe50a56c1dfe929b07458c385f8f59c46ed2 SHA512 52b94107033e3ae1185c876eb41babb1c676df4eadeca63478bbdb65b780f1690d62a38087c25b33a026d644a8221fdbbfe6d938e0948176951d313fe8ab6c08 WHIRLPOOL 9aa42be9ccd8d357594b7360f7a0e36ea4fdbeaefb9bd36307b277ea6d2e4a33b259a0b839ff0a6064c339d0702da5e694de5790743b71c62a643023b508b642
 EBUILD inspircd-1.2.8.ebuild 3372 SHA256 221f5ec40bf3b23bfffd85059509aa8819ad6c332dd18b4148035caeebc0063b SHA512 c5a0c1e9b24c31e7dbfd79b4c04babb6fce4ed9580bd8db990d9b087f9269b3b4dbf4dd6073b63c8ded6687aec00d80dfca4ba12803988303ed7c9d2e254585b WHIRLPOOL e8a00a05562a98e4aad6e8214ed99ffb736a29a37295adaf165b016dc9c00709aa9592e63e581662e9e5c7d1092e00d8f972eec40a2105660a937b7275fb03eb
 EBUILD inspircd-2.0.3.ebuild 3517 SHA256 7a8c434d8e354fceb267ac22adc5ca233d591abda4afccadb387b47c2d612ecb SHA512 852b7162022c41cc5c51dff0c6785da4fe91011b28715a9fe065a84ecb929fd1a9ff9f366ea45653084d793c7d19f1fbfc7b07c3c776ebeb22918b8c4a107928 WHIRLPOOL 05022412202aa48b3632dc192169b0fc1b067d5968330d50b25cdc720325b264541957b3a9e342afc09efe7520a08b115145b5d3fbb13f9964fdc604958284bc
 EBUILD inspircd-2.0.4.ebuild 3517 SHA256 28123b7d4aee666617fa4efcb736eedbb94936fcc24fb09f0a2179ae09f1685c SHA512 da7d28ed725f6bc6ff43e962c7b9dc52493649d9c52009c7f402a18221d7b740934f0a44cb1ca43e0a973e022cf463ab0f81b07af6e791ced7c7742f101ca418 WHIRLPOOL 82ddcde792d6b00c9ef2fa4c4f66ba5f8d0fad42c1743ef2f4cf7c7a538697b080dc9ba95deee00681e873aade9b20620c371171e1a5d4ce90f45e1b05f7c36f
@@ -19,5 +25,17 @@ EBUILD inspircd-2.0.5-r1.ebuild 2824 SHA256 75414d9322a17bf971cfb38c4eb4a887a45b
 EBUILD inspircd-2.0.5-r2.ebuild 2838 SHA256 c973cbe03ab53bdf062393165bf827f8e24c5752f99656d6192250258647d814 SHA512 2f109b1325da749265086bb83e749da50d697e38ec2f7b6fc6538fb8aea176715790776c804a67a59543ac0be9d4add64def484a11ab853e16d34739bb13119b WHIRLPOOL bf136e9668bd0c006b3ee88eeaa6314aaa793478505f2fd6a2b9550a7be1db21c79df5c73dd1f1afb6424a80dd82d79867b99299fc230cb8c45b8bdb1f1662d5
 EBUILD inspircd-2.0.5.ebuild 3230 SHA256 83bb52a4f4ffc57ecc89493389e6679d9304c746827e7b76ecfdf054e855913a SHA512 c26ff10dc385d862b140d21fd9dcb5f3a5412eb7d3a596947cbc0eeb276db1096fa6f10bcdcb839056574903c9cf53e26ad772e2e93ceeb3e1f9a86f9eb358aa WHIRLPOOL 7bede173b21fec58eb00b19e2ad4ea489d0b0814fba6662b97c1ffb8d6af423a7694c196be9d84489fbc0834e63d213484c914a96ff27f2bab34d5c5c444e101
 EBUILD inspircd-2.0.6_rc1.ebuild 3088 SHA256 1a5fc4f530e10bb33b6c372d6081a2a9e8e6ddfdc0cb6ef8ed015ccbdd902dd4 SHA512 54f40acffcfe63a4642002e83bcb2609734bf07f7bff1fbafd848d20967d46282b2fdf246ea8136afea3d1f78fed7064904976ebfd55097344ca4cd0b538c29a WHIRLPOOL 96d2a7dff164a077a775491fc226680a0218c490c3f8fcbcc92090f599bb9451d20bcc70ad66b9b34d4c3399aa3da959e93153f3b9115b6321b363566d383e87
-MISC ChangeLog 9329 SHA256 7590c9926d450744ee5871f9394047097ec8dab0ffcdef134dc0fa9b8f101761 SHA512 ca17f09dcf733fb7738fefec383f9db78be14756bc0ccd4f1290f12ea53019bdb0c1f377b1f2ba2f0f8725f8338e89f3ea4acd2aaf26ffe7f0a5433449a6eed0 WHIRLPOOL 7754150c3491dcfb9ad685a1c0083748448159f3e3d6cb963fb4facc123825fb543607d91837be11aab416c8cd409f6eec5db4abcb7301b1089f67beb14d9686
+EBUILD inspircd-2.0.7.ebuild 2848 SHA256 542baf3cadc30b8749f032fe0323155a3e0260496acf8d0a6448d0c3acb40921 SHA512 060413cd3c1d4727a5195e40bdaab6c0d075ae3579d1bca78abaaa87e519867e2fabbc5491f04897a028e92ef2b3faf240ca69c2a54e625e249a115b736d6a53 WHIRLPOOL 3f99bddf49cc9934ca8be81c400194411f5c0ca99c05d70483374a79cd6a493d28aaaf9bf79df3a9acdf27ce8980c8a9f7133f10faf0d9e1014e01f4a7985299
+MISC ChangeLog 9533 SHA256 4b65da16ac38b6529f9c8a7698b844caaf05b61ae8845e8cd21904ccbc45667e SHA512 6881098c711e9aee266e2acaec0585458497de5e272dceef760f663675dad2c2c319f0119ee14bd47d3b67123487fb106ced7588249e0460fa48cb5e4940e2c2 WHIRLPOOL 71bb809d913954ba72b2f53ff1df8b22b0bd323a6e27410bbd1bbb70074b60f1029a921d69a6f06fd0cbad79c6ca79055d34ee081ac2ddafdbcebf7165db29ea
 MISC metadata.xml 1379 SHA256 6f296c9f2e66bea15aef45aac846f564eb4a3d4ef71d4c6d850723bfce4da0f7 SHA512 71a974d150356c011aafa029b0a1e3323b6e9ba37ff8955f8220bf0a9314471aea98432ba7252cf333612be553fc32cd11ffedbd93e7be84a92b07a727f4a5a1 WHIRLPOOL 506f9bba57dae99e4a3e78204fd6e10b4508be888852bfc6dffbc6717c0f6195968d8868851449501d6457724f73efc4a967395b179e98c234fc1d4ca61ab176
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJP+C1OAAoJEA2sAkrWKOU2EyAH/iAxjPLkfchISOFNIdZvYMYp
+J7lnImfnzzGYd5LjcowTii+6cFuRN9eCZUPPFELHmuUxcvH0mchrSqALonGl/lFc
+0kGDmknt8Z96IJ7mtgsSUOUhP32clu//MZW4iA0rTcBh8aXXR66/zawwjNF5pCaB
+vZdFDraYAYrWEUnw2uoA5/x+6lNZRgAAtrDz30SmawEejLL3GFI+gETbGRY89pCS
+mjkzH+yjj/6P2HsdaZZ7gQO27m2EpkaSxBQMr6e5mx3637Qyxg1lDyXjt18PyZ93
+eoN4/rZxqqKZoQXRWIwQ94bdAgjx060HD0ju3zimTEJnIdMEb2ff2XnP5nm56FA=
+=T5PZ
+-----END PGP SIGNATURE-----
diff --git a/net-irc/inspircd/files/inspircd-2.0.7-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.7-fix-path-builds.patch
new file mode 100644
index 000000000000..26d6ff27b999
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-2.0.7-fix-path-builds.patch
@@ -0,0 +1,165 @@
+diff -Nur a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example
+--- a/docs/conf/inspircd.conf.example	2012-07-01 22:54:27.000000000 +0200
++++ b/docs/conf/inspircd.conf.example	2012-07-05 19:38:16.299999762 +0200
+@@ -404,11 +404,11 @@
+ 
+ # This file has all the information about oper classes, types and o:lines.
+ # You *MUST* edit it.
+-<include file="conf/opers.conf.example">
++<include file="/etc/inspircd/opers.conf.example">
+ 
+ # This file has all the information about server links and ulined servers.
+ # You *MUST* edit it if you intend to link servers.
+-<include file="conf/links.conf.example">
++<include file="/etc/inspircd/links.conf.example">
+ 
+ #-#-#-#-#-#-#-#-#-#-  MISCELLANEOUS CONFIGURATION  -#-#-#-#-#-#-#-#-#-#
+ #                                                                     #
+@@ -418,7 +418,8 @@
+ #   motd - displayed on connect and when a user executes /MOTD
+ #   rules - displayed when the user executes /RULES
+ # Modules can also define their own files
+-<files motd="conf/inspircd.motd.example" rules="conf/inspircd.rules.example">
++<files motd="/etc/inspircd/inspircd.motd.example"
++       rules="/etc/inspircd/inspircd.rules.example">
+ 
+ # Example of an executable file include. Note this will be read on rehash,
+ # not when the command is run.
+@@ -464,7 +465,7 @@
+ # the default of 'inspircd.pid' is used.                              #
+ #                                                                     #
+ 
+-#<pid file="/path/to/inspircd.pid">
++<pid file="/var/run/inspircd/inspircd.pid">
+ 
+ #-#-#-#-#-#-#-#-#-#-#-#-#- BANLIST LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ #                                                                     #
+@@ -937,7 +938,7 @@
+ # provide almost all the features of InspIRCd. :)                     #
+ #                                                                     #
+ # The default does nothing -- we include it for simplicity for you.   #
+-<include file="conf/modules.conf.example">
++<include file="/etc/inspircd/modules.conf.example">
+ 
+ # Here are some pre-built modules.conf files that closely match the
+ # default configurations of some popular IRCd's. You still may want to
+@@ -949,10 +950,10 @@
+ # recommended that you make your own modules file based on modules.conf.example.
+ 
+ # Settings similar to UnrealIRCd defaults.
+-#<include file="conf/modules/modules.conf.unreal">
++#<include file="/etc/inspircd/modules/modules.conf.unreal">
+ 
+ # Settings similar to Charybdis IRCd defaults.
+-#<include file="conf/modules/modules.conf.charybdis">
++#<include file="/etc/inspircd/modules/modules.conf.charybdis">
+ 
+ 
+ #########################################################################
+diff -Nur a/make/template/main.mk b/make/template/main.mk
+--- a/make/template/main.mk	2012-07-01 22:54:27.000000000 +0200
++++ b/make/template/main.mk	2012-07-05 20:13:44.789999705 +0200
+@@ -80,22 +80,22 @@
+   CXXFLAGS += -D_ALL_SOURCE -I/usr/local/include
+ @ENDIF
+ 
+-@IFNDEF D
+-  D=0
++@IFNDEF DEBUGLEVEL
++  DEBUGLEVEL=0
+ @ENDIF
+ 
+ DBGOK=0
+-@IFEQ $(D) 0
++@IFEQ $(DEBUGLEVEL) 0
+   CXXFLAGS += -O2 -g1
+   HEADER = std-header
+   DBGOK=1
+ @ENDIF
+-@IFEQ $(D) 1
++@IFEQ $(DEBUGLEVEL) 1
+   CXXFLAGS += -O0 -g3 -Werror
+   HEADER = debug-header
+   DBGOK=1
+ @ENDIF
+-@IFEQ $(D) 2
++@IFEQ $(DEBUGLEVEL) 2
+   CXXFLAGS += -O2 -g3
+   HEADER = debug-header
+   DBGOK=1
+@@ -137,10 +137,10 @@
+     @GNU_ONLY TARGET = modules/$(M:.so=).so
+ @ENDIF
+ 
+-@IFDEF T
++@IFDEF TGT
+     HEADER =
+     FOOTER = target
+-    TARGET = $(T)
++    TARGET = $(TGT)
+ @ENDIF
+ 
+ @IFEQ $(DBGOK) 0
+@@ -215,8 +215,8 @@
+ 	@-install -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)/data
+ 	@-install -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)/logs
+ 	@-install -d -m $(INSTMODE_DIR) $(BINPATH)
+-	@-install -d -m $(INSTMODE_DIR) $(CONPATH)/examples/aliases
+-	@-install -d -m $(INSTMODE_DIR) $(CONPATH)/examples/modules
++	@-install -d -m $(INSTMODE_DIR) $(CONPATH)/aliases
++	@-install -d -m $(INSTMODE_DIR) $(CONPATH)/modules
+ 	@-install -d -m $(INSTMODE_DIR) $(MODPATH)
+ 	[ $(BUILDPATH)/bin/ -ef $(BINPATH) ] || install -m $(INSTMODE_BIN) $(BUILDPATH)/bin/inspircd $(BINPATH)
+ @IFNDEF PURE_STATIC
+@@ -224,9 +224,9 @@
+ @ENDIF
+ 	-install -m $(INSTMODE_BIN) @STARTSCRIPT@ $(BASE) 2>/dev/null
+ 	-install -m $(INSTMODE_LIB) tools/gdbargs $(BASE)/.gdbargs 2>/dev/null
+-	-install -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)/examples
+-	-install -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/examples/aliases
+-	-install -m $(INSTMODE_LIB) docs/conf/modules/*.conf.* $(CONPATH)/examples/modules
++	-install -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)
++	-install -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/aliases
++	-install -m $(INSTMODE_LIB) docs/conf/modules/*.conf.* $(CONPATH)/modules
+ 	@echo ""
+ 	@echo "*************************************"
+ 	@echo "*        INSTALL COMPLETE!          *"
+@@ -238,7 +238,7 @@
+ 	@echo '  Modules:' $(MODPATH)
+ 	@echo 'To start the ircd, run:' $(BASE)/inspircd start
+ 	@echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf
+-	@echo 'Examples are available at:' $(CONPATH)/examples/
++	@echo 'Examples are available at:' $(CONPATH)/
+ 
+ @GNU_ONLY RCS_FILES = $(wildcard .git/index src/version.sh)
+ @BSD_ONLY RCS_FILES = src/version.sh
+diff -Nur a/src/modules/m_xline_db.cpp b/src/modules/m_xline_db.cpp
+--- a/src/modules/m_xline_db.cpp	2012-07-01 22:54:27.000000000 +0200
++++ b/src/modules/m_xline_db.cpp	2012-07-05 19:42:57.689999753 +0200
+@@ -88,7 +88,7 @@
+ 		 *		-- w00t
+ 		 */
+ 		ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Opening temporary database");
+-		f = fopen("data/xline.db.new", "w");
++		f = fopen("/var/lib/inspircd/data/xline.db.new", "w");
+ 		if (!f)
+ 		{
+ 			ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Cannot create database! %s (%d)", strerror(errno), errno);
+@@ -136,7 +136,7 @@
+ 		}
+ 
+ 		// Use rename to move temporary to new db - this is guarenteed not to fuck up, even in case of a crash.
+-		if (rename("data/xline.db.new", "data/xline.db") < 0)
++		if (rename("/var/lib/inspircd/data/xline.db.new", "/var/lib/inspircd/data/xline.db") < 0)
+ 		{
+ 			ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Cannot move new to old database! %s (%d)", strerror(errno), errno);
+ 			ServerInstance->SNO->WriteToSnoMask('a', "database: cannot replace old with new db: %s (%d)", strerror(errno), errno);
+@@ -152,7 +152,7 @@
+ 		char linebuf[MAXBUF];
+ 		unsigned int lineno = 0;
+ 
+-		f = fopen("data/xline.db", "r");
++		f = fopen("/var/lib/inspircd/data/xline.db", "r");
+ 		if (!f)
+ 		{
+ 			if (errno == ENOENT)
diff --git a/net-irc/inspircd/files/inspircd-2.0.7-init b/net-irc/inspircd/files/inspircd-2.0.7-init
new file mode 100644
index 000000000000..3180e5c14815
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-2.0.7-init
@@ -0,0 +1,38 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/files/inspircd-2.0.7-init,v 1.1 2012/07/07 12:35:20 nimiux Exp $
+
+extra_commands="rehash version"
+
+depend() {
+	need net
+	provide ircd
+}
+
+start() {
+	ebegin "Starting InspIRCd"
+	start-stop-daemon --start --quiet --user inspircd \
+		--exec /usr/bin/inspircd -- \
+		--config /etc/inspircd/inspircd.conf \
+		--logfile /var/log/inspircd/ircd.log &> /dev/null
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping InspIRCd"
+	start-stop-daemon --stop --quiet --exec /usr/bin/inspircd
+	eend $?
+}
+
+rehash() {
+	ebegin "Rehashing InspIRCd"
+	/usr/lib/inspircd/inspircd.launcher/inspircd rehash &> /dev/null
+	eend $?
+}
+
+version() {
+	ebegin "Retrieve InspIRCd version"
+	/usr/lib/inspircd/inspircd.launcher/inspircd version
+	eend $?
+}
diff --git a/net-irc/inspircd/inspircd-2.0.7.ebuild b/net-irc/inspircd/inspircd-2.0.7.ebuild
new file mode 100644
index 000000000000..8e44e2de8f8a
--- /dev/null
+++ b/net-irc/inspircd/inspircd-2.0.7.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/inspircd-2.0.7.ebuild,v 1.1 2012/07/07 12:35:20 nimiux Exp $
+
+EAPI=4
+
+inherit eutils flag-o-matic multilib
+
+DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
+HOMEPAGE="http://inspircd.github.com/"
+SRC_URI="http://github.com/inspircd/inspircd/downloads/InspIRCd-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="geoip gnutls ipv6 ldap mysql postgres sqlite ssl"
+
+RDEPEND="
+	dev-lang/perl
+	ssl? ( dev-libs/openssl )
+	geoip? ( dev-libs/geoip )
+	gnutls? ( net-libs/gnutls dev-libs/libgcrypt )
+	ldap? ( net-nds/openldap )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql-server )
+	sqlite? ( >=dev-db/sqlite-3.0 )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	# Patch the inspircd launcher with the inspircd user
+	sed -i -e "s/@UID@/${PN}/" "${S}/make/template/${PN}" || die
+
+	epatch "${FILESDIR}/${PF}-fix-path-builds.patch"
+}
+
+src_configure() {
+	local extras=""
+	local essl="--enable-openssl"
+	local egnutls="--enable-gnutls"
+	local dipv6="--disable-ipv6"
+
+	use geoip && extras="${extras}m_geoip.cpp,"
+	use gnutls && extras="${extras}m_ssl_gnutls.cpp,"
+	use ldap && extras="${extras}m_ldapauth.cpp,"
+	use mysql && extras="${extras}m_mysql.cpp,"
+	use postgres && extras="${extras}m_pgsql.cpp,"
+	use sqlite && extras="${extras}m_sqlite3.cpp,"
+	use ssl && extras="${extras}m_ssl_openssl.cpp,"
+
+	# allow inspircd to be built by root
+	touch .force-root-ok || die
+
+	if [ -n "${extras}" ]; then
+		./configure --disable-interactive \
+			--enable-extras=${extras} || die
+	fi
+
+	use !ssl && essl=""
+	use !gnutls && egnutls=""
+	use ipv6 && dipv6=""
+
+	./configure \
+		--disable-interactive \
+		--prefix="/usr/$(get_libdir)/${PN}" \
+		--config-dir="/etc/${PN}" \
+		--binary-dir="/usr/bin" \
+		--module-dir="/usr/$(get_libdir)/${PN}/modules" \
+		${essl} ${egnutls} ${dipv6} || die
+}
+
+src_compile() {
+	append-cxxflags -Iinclude -fPIC
+	emake LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+	emake INSTUID=${PN} \
+		BINPATH="${D}/usr/bin" \
+		BASE="${D}/usr/$(get_libdir)/${PN}/inspircd.launcher" \
+		MODPATH="${D}/usr/$(get_libdir)/${PN}/modules/" \
+		CONPATH="${D}/etc/${PN}" install
+
+	insinto /usr/include/"${PN}"
+	doins include/*
+
+	diropts -o"${PN}" -g"${PN}"
+	dodir "/var/run/${PN}" "/var/lib/${PN}/data"
+
+	newinitd "${FILESDIR}/${PF}-init" "${PN}"
+	keepdir "/var/log/${PN}"/
+}
+
+pkg_postinst() {
+	elog "Before starting ${PN} the first time you should create"
+	elog "the /etc/${PN}/${PN}.conf file."
+	elog "You can find example configuration files under /etc/${PN}"
+	elog "Read the ${PN}.conf.example file carefully before starting "
+	elog "the service."
+	elog
+}