Clean old files

Package-Manager: portage-2.1.11.50/cvs/Linux x86_64
Manifest-Sign-Key: 0xD628E536

6 files changed, 14 insertions, 459 deletions

diff --git a/net-irc/inspircd/ChangeLog b/net-irc/inspircd/ChangeLog
index 31fdfb1f345f..45813995f886 100644
--- a/net-irc/inspircd/ChangeLog
+++ b/net-irc/inspircd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/inspircd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/ChangeLog,v 1.68 2013/02/10 19:02:39 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/ChangeLog,v 1.69 2013/02/19 15:11:07 nimiux Exp $
+
+  19 Feb 2013; Chema Alonso <nimiux@gentoo.org>
+  -files/inspircd-2.0.8-fix-path-builds.patch, -files/inspircd-2.0.8-init,
+  -files/inspircd-2.0.9-fix-path-builds.patch, -files/inspircd-2.0.9-init:
+  Clean companion files of old versions
 
   10 Feb 2013; Chema Alonso <nimiux@gentoo.org> inspircd-2.0.10.ebuild:
   Fix directory permissions. Thanks to ago for noticing.
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 098dd5a507c5..2dd1e05a27b5 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -3,22 +3,18 @@ Hash: SHA256
 
 AUX inspircd-2.0.10-fix-path-builds.patch 7231 SHA256 00bd6ab4a9cd823d33513eb339396d9e47e3c024b8f43ab613a37cc1fee1e291 SHA512 0a759d3b55b23dc8f4054b9a4554c8d68395a187be3853881445663f831e86fc1098866d0800c939054b6899f4bacf3dac16e076e01278b57a9335ca4e5b2884 WHIRLPOOL 7d45470db91a1871e9dc17f178b1439d00f2e063f3399c8a9c957ec39c43218a8ed9637d2f2731d1f1f272acb6e0007e704a40182ede568a45a41da6ea626a5e
 AUX inspircd-2.0.10-init 917 SHA256 6b0b81e69b156f5a8d85c2ae47ea904032de65584ee304342e5715c29710c368 SHA512 0c2be8690bcdfed10d645f73c615df16c952f4692e7bd7146a241d094b96dc55bfe128a62c1322880528d4113d8bf18cfa560392eaf95b52209eafc62100bbdb WHIRLPOOL 10953ecad02340adbf746a388e0e9d61ab32940707c84973d8581dd4f20fa677a8a1d80e332ae8d821e75e8c25029ba4aec32045d127743ab3d0fa7a888d0723
-AUX inspircd-2.0.8-fix-path-builds.patch 6546 SHA256 741ad48af6687b1297e27ac2956c0efcf952fe8989d7fa21405d403a8b3c9f61 SHA512 a075f9310208f2b7979d7be7071775fd2bb7eb281328e39cb57d3924e89858b70e96f8ea73d6d6e50e1cb58ea4cf7ee2f59cdac7d10f2aa7931022e45d570a2d WHIRLPOOL 88db7ffe4551740e546c7bc0cc5ebdcc3b542c273d8fffe18408b93c5062a6197dc7089cce122a04d4416be26f54f28dd351483ea96502ff76e1f4dfcea41a8d
-AUX inspircd-2.0.8-init 881 SHA256 e0ab7d50d316ce3ee38f0a0cc57e9fc73e01707bc4852cbed4922343188ec5b8 SHA512 98fc0db5cccbc74e99e08d7b0f2dc8f5191402c0e7d67d1c93da7d50c05301a32568613d84601acb6907c57127d7ebf2b8b0bf9de40dfacf1916c8680a5b1e00 WHIRLPOOL 4078114edb501a17f6e15697fe442dcc4c54089ab5db546b28484089d70c7c3a0c42ac897b114f1df7454a17b189dac7e6619b35d581c75cf11950bec9852b5d
-AUX inspircd-2.0.9-fix-path-builds.patch 7170 SHA256 5ef49564263b1806b7af1010c8a7b76a0cbc9d92dc32c7e63555d7324708fe3d SHA512 e6b9f28647ca5632932b79a513c732a6e3ecfbfce39a6145f94175035da293f956cf0b1981ff32000670bffa38f7111fee03782b6010c5a2be3bf2445b0fd659 WHIRLPOOL caea6e0e26f9140dc81a17385dbca31ce990e9c51a316fdc5eff22833e398debf1cdc986685515abef07d5ffead83722ff4afb92f280dd9b78ca64e19e057301
-AUX inspircd-2.0.9-init 881 SHA256 d2d3f20607bd4d814f12fd1006580ca4118eb9c48173e94ec036bcd72a9e6c95 SHA512 4834c9f505e94906621e6d2bfe0f188c900cf7948c62a5253e7b326515ff0b554f14495cc8ec19778cef1f9be88e309ab6168b3009477e5ab62d8554a89855eb WHIRLPOOL 77146ea63e6e37189cc44ee0f6edf0aabbe3cf352dcccb054cd22668a96624f63d133ed512039c0496dcdb1eac3228f46974e9f021c4bcc555894c338ae53c5c
 DIST inspircd-2.0.10.tar.gz 739126 SHA256 1f805a318677270a7bbf6a5abaeee5427e863a749ae69f16879014ff99a11f59 SHA512 fedff2e023066cedaa3ac5144aeff1ffc0930445cafcea1ebbed0946392cfa9a9ac42057151c70a8184af4d01d45f451c9b8d0481b7336f118e3e298875c9c27 WHIRLPOOL d6440e7e1db51518d9713a7df475984293be96e88a6ff00920617874bde5be54bafeeecc5e04a74e605efbdf812df13d99eccaee148a5e07efe730584091277f
 EBUILD inspircd-2.0.10.ebuild 2824 SHA256 5942ce639595ddc186352c8a1df5111258fb2310285c204ddeb88b541aba4a69 SHA512 d2ab27c78b3c73cd37c23dc7b6dfeec2adee184d0cbc7e7b5560b03d7b292929e16d0c9c030cfb0e67ac0d5ed496c6b2a033a5b1209f4e590ecae5d4cd9743fe WHIRLPOOL be8f38f224440582d532a7e91a2f5cce3a02ffd5f70ae93cd43120553e2bbd87c38e0cca83327d7d82f13eb6cee749d82f357b78d7fcecf10b1133740512ac34
-MISC ChangeLog 12315 SHA256 8761260189a00cb13e4953cd28bacb79c42fd6066cc7ac4f8f417768cae256b0 SHA512 7b93a8168cc0a0eec55fc37086972111bfb544dc82c99b32b8a9ec343afbc1b7ce1e58dd83094f265e63f7757289f47ad34b4872e6ec04a9ae32f40837d25ee2 WHIRLPOOL a2388aa5c904186fadfeb564dc10461d50bc792c759f8263e28cc2b55d11263d9f3ac9bb935ee1aa251d61021aeeacc807c9937fcbb68f075c3aa44d6858cee6
+MISC ChangeLog 12554 SHA256 a41fe649091a1a5b7434e3283c9e728938857809dbd1943eb53e5b13244fb29d SHA512 4cd3a767a4d5bcef075fd4b767e0060a55ab2e76d2a1e09d194cb5425a0fb3ba2d2aee8aa84d34a44a34132d942f6d51de062f510d2b16d421669e12285b4a1d WHIRLPOOL a358e84663c5ea3608de45571ae8401654d75018d9bed5aede13563cba6d2fdae0deb6ad97fcc5779fdd7352c7179ef194a84d6886321db2e795160813dea67a
 MISC metadata.xml 1319 SHA256 4bf44810be93b3e6660f742ea2d4813adb8841cf327373c9637efc72bd3247ff SHA512 8090fb408220adc8b6ea86b6d8f59258f73c459f024fb894ce5f54ae73ee7b3b5115ad97b9f1b9451eda4f3c3ee3a8611495b728d7a4478891eccb92dd3f985a WHIRLPOOL 8e063b30373f1d0af201b8098cb48788fd2a7695af016e73aa6a3238f1f174f1e531500aa9e7c42d940bd70b1a89222c504004494ba6b15ffa8e3afa5e2d1df4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRF+8RAAoJEA2sAkrWKOU2sJMIAI7sjHBmtHa8P5CcZQCoUHl7
-UZ+PSg7yyCQuiZi7NtuCJdijWWBQa9DChF7qz2hxxRSHKdCMB65Dr9OD8nAXveV+
-rB2+w7T/sY3wqSpt4uK5clN4QPSSvcFxFNOhWVgPg/y/SY6kX4gvidiMEhoRreyj
-pcHhfhHYc0kHvMh7dot+jBZnb01DIeRaoCBzJW16BWcMEemV3kwNGVlIMMTA7mnf
-QqMVi9t1go5sM7ND2kiVojJbveAzuTFyYhC+2QKRvINksoQnD+I42EVFTVIIyukQ
-dOLnzh2Qp3KX7ThwkXpxOe/ppN1/7rUohIopInqbBJGCOLMa6KI6spLlEG1rLVU=
-=CZC1
+iQEcBAEBCAAGBQJRI5ZNAAoJEA2sAkrWKOU2wXoH/RRrAZHEIxnDC3kE9QD2OSF5
+6nhdD/oY12tQaMBN9h2zKUplYY8HTUv5S3Z4M7BdvohycvskFBlYalCrMYy/M024
+m4HOo3Su1dXTwYDIs76EwOS5FHCG0aSk7s9wdeou3V6HOgHoSI2p58mpzByBMube
+X6DyqFtpYusmxa5gCODiGjB6T+gB/zbjeuutEe/EuVShEswhCO96Aia3KXav+kuB
+flPB6su9hlDY6kCmrVPznC+dayNkUMjiogZvivQa7TUqYrxGl79Z2+bZ/GEFlSUL
+SUCKMHzlPOP65+2eWsQ7U1KrkO5GkzX/t5wNCNMBLLhaJAEl4lhSH3KQOgX0Wnw=
+=CVjj
 -----END PGP SIGNATURE-----
diff --git a/net-irc/inspircd/files/inspircd-2.0.8-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.8-fix-path-builds.patch
deleted file mode 100644
index bebe3409cfab..000000000000
--- a/net-irc/inspircd/files/inspircd-2.0.8-fix-path-builds.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-diff -Nur a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example
---- a/docs/conf/inspircd.conf.example	2012-07-13 17:38:01.000000000 +0200
-+++ b/docs/conf/inspircd.conf.example	2012-07-21 20:03:39.116601423 +0200
-@@ -412,11 +412,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  -#-#-#-#-#-#-#-#-#-#
- #                                                                     #
-@@ -426,7 +426,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.
-@@ -472,7 +473,7 @@
- # the default of 'inspircd.pid' is used.                              #
- #                                                                     #
- 
--#<pid file="/path/to/inspircd.pid">
-+<pid file="/var/run/inspircd/inspircd.pid">
- 
- #-#-#-#-#-#-#-#-#-#-#-#-#- BANLIST LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#-#
- #                                                                     #
-@@ -945,7 +946,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
-@@ -957,10 +958,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-13 17:38:01.000000000 +0200
-+++ b/make/template/main.mk	2012-07-21 20:08:02.584307622 +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-13 17:38:01.000000000 +0200
-+++ b/src/modules/m_xline_db.cpp	2012-07-21 20:09:12.402434777 +0200
-@@ -99,7 +99,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);
-@@ -140,7 +140,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);
-@@ -156,7 +156,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.8-init b/net-irc/inspircd/files/inspircd-2.0.8-init
deleted file mode 100644
index 6cc1f0508a61..000000000000
--- a/net-irc/inspircd/files/inspircd-2.0.8-init
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/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.8-init,v 1.1 2012/07/22 08:36:51 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/files/inspircd-2.0.9-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.9-fix-path-builds.patch
deleted file mode 100644
index f679d7a491ed..000000000000
--- a/net-irc/inspircd/files/inspircd-2.0.9-fix-path-builds.patch
+++ /dev/null
@@ -1,205 +0,0 @@
-diff -Nur a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example
---- a/docs/conf/inspircd.conf.example	2012-10-07 00:29:07.000000000 +0200
-+++ b/docs/conf/inspircd.conf.example	2012-10-11 20:07:40.289924911 +0200
-@@ -412,11 +412,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  -#-#-#-#-#-#-#-#-#-#
- #                                                                     #
-@@ -426,7 +426,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.
-@@ -472,7 +473,7 @@
- # the default of 'inspircd.pid' is used.                              #
- #                                                                     #
- 
--#<pid file="/path/to/inspircd.pid">
-+<pid file="/var/run/inspircd/inspircd.pid">
- 
- #-#-#-#-#-#-#-#-#-#-#-#-#- BANLIST LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#-#
- #                                                                     #
-@@ -950,7 +951,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
-@@ -962,10 +963,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-10-07 00:29:07.000000000 +0200
-+++ b/make/template/main.mk	2012-10-11 22:20:37.139880112 +0200
-@@ -34,7 +34,7 @@
- SYSTEM = @SYSTEM@
- BUILDPATH = @BUILD_DIR@
- SOCKETENGINE = @SOCKETENGINE@
--CXXFLAGS = -pipe -fPIC -DPIC
-+MYCXXFLAGS = -fPIC -DPIC
- LDLIBS = -pthread -lstdc++
- LDFLAGS = 
- CORELDFLAGS = -rdynamic -L. $(LDFLAGS)
-@@ -50,9 +50,9 @@
- INSTMODE_LIB = 0644
- 
- @IFEQ $(CC) icc
--  CXXFLAGS += -Wshadow
-+  MYCXXFLAGS += -Wshadow
- @ELSE
--  CXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall
-+  MYCXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute
- @ENDIF
- 
- 
-@@ -72,38 +72,38 @@
-   LDLIBS += -lsocket -lnsl -lrt -lresolv
- @ENDIF
- @IFEQ $(SYSTEM) darwin
--  CXXFLAGS += -DDARWIN -frtti
-+  MYCXXFLAGS += -DDARWIN -frtti
-   LDLIBS += -ldl
-   CORELDFLAGS = -dynamic -bind_at_load -L. $(LDFLAGS)
-   PICLDFLAGS = -fPIC -shared -twolevel_namespace -undefined dynamic_lookup $(LDFLAGS)
- @ENDIF
- @IFEQ $(SYSTEM) interix
--  CXXFLAGS += -D_ALL_SOURCE -I/usr/local/include
-+  MYCXXFLAGS += -D_ALL_SOURCE -I/usr/local/include
- @ENDIF
- 
--@IFNDEF D
--  D=0
-+@IFNDEF DEBUGLEVEL
-+  DEBUGLEVEL=0
- @ENDIF
- 
- DBGOK=0
--@IFEQ $(D) 0
--  CXXFLAGS += -O2 -g1
-+@IFEQ $(DEBUGLEVEL) 0
-+  MYCXXFLAGS += -O2 -g1
-   HEADER = std-header
-   DBGOK=1
- @ENDIF
--@IFEQ $(D) 1
--  CXXFLAGS += -O0 -g3 -Werror
-+@IFEQ $(DEBUGLEVEL) 1
-+  MYCXXFLAGS += -O0 -g3 -Werror
-   HEADER = debug-header
-   DBGOK=1
- @ENDIF
--@IFEQ $(D) 2
--  CXXFLAGS += -O2 -g3
-+@IFEQ $(DEBUGLEVEL) 2
-+  MYCXXFLAGS += -O2 -g3
-   HEADER = debug-header
-   DBGOK=1
- @ENDIF
- FOOTER = finishmessage
- 
--CXXFLAGS += -Iinclude
-+MYCXXFLAGS += -Iinclude
- 
- @GNU_ONLY MAKEFLAGS += --no-print-directory
- 
-@@ -122,10 +122,12 @@
- @ENDIF
- 
- @IFDEF PURE_STATIC
--  CXXFLAGS += -DPURE_STATIC
-+  MYCXXFLAGS += -DPURE_STATIC
- @ENDIF
- 
--@DO_EXPORT RUNCC RUNLD CXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS
-+MYCXXFLAGS += $(CXXFLAGS)
-+
-+@DO_EXPORT RUNCC RUNLD MYCXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS
- @DO_EXPORT SOURCEPATH BUILDPATH PURE_STATIC SPLIT_CC
- 
- # Default target
-@@ -138,10 +140,10 @@
-     @GNU_ONLY TARGET = modules/$(M:.so=).so
- @ENDIF
- 
--@IFDEF T
-+@IFDEF TGT
-     HEADER =
-     FOOTER = target
--    TARGET = $(T)
-+    TARGET = $(TGT)
- @ENDIF
- 
- @IFEQ $(DBGOK) 0
-@@ -216,8 +218,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
-@@ -225,9 +227,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!          *"
-@@ -240,7 +242,7 @@
- 	@echo '  Data:' $(DATPATH)
- 	@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/make/unit-cc.pl b/make/unit-cc.pl
---- a/make/unit-cc.pl	2012-10-07 00:29:07.000000000 +0200
-+++ b/make/unit-cc.pl	2012-10-11 22:18:58.459880658 +0200
-@@ -97,7 +97,7 @@
- 	my $libs = '';
- 	my $binary = $ENV{RUNCC};
- 	if ($do_compile) {
--		$flags = $ENV{CXXFLAGS};
-+		$flags = $ENV{MYCXXFLAGS};
- 		$flags =~ s/ -pedantic// if nopedantic($file);
- 		$flags .= ' ' . getcompilerflags($file);
- 
diff --git a/net-irc/inspircd/files/inspircd-2.0.9-init b/net-irc/inspircd/files/inspircd-2.0.9-init
deleted file mode 100644
index e099a90696b5..000000000000
--- a/net-irc/inspircd/files/inspircd-2.0.9-init
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/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.9-init,v 1.1 2012/10/15 09:47:59 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 $?
-}