Version bump and cleanup

(Portage version: 2.1.3.7)

6 files changed, 52 insertions, 50 deletions

diff --git a/net-irc/charybdis/files/charybdis-1.1.0-paths.patch b/net-irc/charybdis/files/charybdis-1.1.0-paths.patch
deleted file mode 100644
index 721eb0b5de9e..000000000000
--- a/net-irc/charybdis/files/charybdis-1.1.0-paths.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: include/config.h
-===================================================================
---- include/config.h	(revision 911)
-+++ include/config.h	(working copy)
-@@ -48,7 +48,7 @@
-  */
- 
- /* dirs */
--#define DPATH   IRCD_PREFIX
-+#define DPATH   "/var/lib/charybdis"
- #define BINPATH IRCD_PREFIX "/bin/"
- #define MODPATH MODULE_DIR
- #define AUTOMODPATH MODULE_DIR "/autoload/"
-@@ -58,18 +58,18 @@
- #define HPATH  HELP_DIR "/opers"
- 
- /* files */
--#define SPATH    BINPATH "/ircd"	/* ircd executable */
--#define SLPATH   BINPATH "/servlink"	/* servlink executable */
--#define CPATH    ETCPATH "/ircd.conf"	/* ircd.conf file */
--#define KPATH    ETCPATH "/kline.conf"	/* kline file */
--#define DLPATH   ETCPATH "/dline.conf"	/* dline file */
--#define XPATH	 ETCPATH "/xline.conf"	/* xline file */
--#define RESVPATH ETCPATH "/resv.conf"	/* resv file */
--#define RPATH    ETCPATH "/ircd.rsa"	/* ircd rsa private keyfile */
--#define MPATH    ETCPATH "/ircd.motd"	/* MOTD file */
--#define LPATH    LOGPATH "/ircd.log"	/* ircd logfile */
--#define PPATH    ETCPATH "/ircd.pid"	/* pid file */
--#define OPATH    ETCPATH "/opers.motd"	/* oper MOTD file */
-+#define SPATH    BINPATH "/ircd"                   /* ircd executable */
-+#define SLPATH   BINPATH "/servlink"               /* servlink executable */
-+#define CPATH    ETCPATH "/ircd.conf"              /* ircd.conf file */
-+#define KPATH    "/var/lib/charybdis/kline.conf"   /* kline file */
-+#define DLPATH   "/var/lib/charybdis/dline.conf"   /* dline file */
-+#define XPATH    "/var/lib/charybdis/xline.conf"   /* xline file */
-+#define RESVPATH "/var/lib/charybdis/resv.conf"    /* resv file */
-+#define RPATH    ETCPATH "/ircd.rsa"               /* ircd rsa private keyfile */
-+#define MPATH    ETCPATH "/ircd.motd"              /* MOTD file */
-+#define LPATH    LOGPATH "/ircd.log"               /* ircd logfile */
-+#define PPATH    "/var/run/charybdis/ircd.pid"     /* pid file */
-+#define OPATH    ETCPATH "/opers.motd"             /* oper MOTD file */
- 
- /* IGNORE_BOGUS_TS
-  * Ignore bogus timestamps from other servers. Yes this will desync
diff --git a/net-irc/charybdis/files/charybdis-dircreate.patch b/net-irc/charybdis/files/charybdis-dircreate.patch
new file mode 100644
index 000000000000..a18205cf030f
--- /dev/null
+++ b/net-irc/charybdis/files/charybdis-dircreate.patch
@@ -0,0 +1,46 @@
+--- ./Makefile.in.orig	2006-05-17 16:49:13.000000000 +0200
++++ ./Makefile.in	2007-09-06 15:35:25.462195923 +0200
+@@ -110,25 +110,25 @@
+ install-mkdirs:
+ 	@echo "ircd: setting up ircd directory structure"
+ 	-@if test ! -d $(DESTDIR)$(prefix); then \
+-		mkdir $(DESTDIR)$(prefix); \
++		mkdir -p $(DESTDIR)$(prefix); \
+ 	fi
+ 	-@if test ! -d $(DESTDIR)$(bindir); then \
+-		mkdir $(DESTDIR)$(bindir); \
++		mkdir -p $(DESTDIR)$(bindir); \
+ 	fi
+ 	-@if test ! -d $(DESTDIR)$(confdir); then \
+-		mkdir $(DESTDIR)$(confdir); \
++		mkdir -p $(DESTDIR)$(confdir); \
+ 	fi
+ 	-@if test ! -d $(DESTDIR)$(mandir); then \
+-		mkdir $(DESTDIR)$(mandir); \
++		mkdir -p $(DESTDIR)$(mandir); \
+ 	fi
+ 	-@if test ! -d $(DESTDIR)$(moduledir); then \
+-		mkdir $(DESTDIR)$(moduledir); \
++		mkdir -p $(DESTDIR)$(moduledir); \
+ 	fi
+ 	-@if test ! -d $(DESTDIR)$(helpdir); then \
+-		mkdir $(DESTDIR)$(helpdir); \
++		mkdir -p $(DESTDIR)$(helpdir); \
+ 	fi
+ 	-@if test ! -d $(DESTDIR)$(logdir); then \
+-		mkdir $(DESTDIR)$(logdir); \
++		mkdir -p $(DESTDIR)$(logdir); \
+ 	fi
+ 	
+ install: install-mkdirs all
+--- ./modules/Makefile.in.orig	2006-03-06 04:43:02.000000000 +0100
++++ ./modules/Makefile.in	2007-09-06 15:37:10.468179952 +0200
+@@ -152,7 +152,7 @@
+ install-mkdirs:
+ 	@echo "ircd: setting up modular directory structure"
+ 	-@if test ! -d $(DESTDIR)$(moduledir); then \
+-                mkdir $(DESTDIR)$(moduledir); \
++                mkdir -p $(DESTDIR)$(moduledir); \
+         fi
+ 	-@if test -d $(DESTDIR)$(moduledir)-old; then \
+ 		rm -rf $(DESTDIR)$(moduledir)-old; \
diff --git a/net-irc/charybdis/files/digest-charybdis-1.1.0 b/net-irc/charybdis/files/digest-charybdis-1.1.0
deleted file mode 100644
index 968808ea5c64..000000000000
--- a/net-irc/charybdis/files/digest-charybdis-1.1.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a7b6f1282df42e4c184bec9eec6780e2 charybdis-1.1.0.tgz 750459
-RMD160 ca14dd24a15d9a558c5b8d4299a923eab3f313dd charybdis-1.1.0.tgz 750459
-SHA256 2eb642674d1d34bf69e86367ae2842afa78091a6779f7d9a3e03857ea6cf0690 charybdis-1.1.0.tgz 750459
diff --git a/net-irc/charybdis/files/digest-charybdis-2.1.0 b/net-irc/charybdis/files/digest-charybdis-2.1.0
deleted file mode 100644
index af80f78c7f3b..000000000000
--- a/net-irc/charybdis/files/digest-charybdis-2.1.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 beb1b25143491cc593e24289782934b4 charybdis-2.1.0.tgz 769477
-RMD160 5e7e919dd829d3370378a6ae9f6e40662a6be15e charybdis-2.1.0.tgz 769477
-SHA256 c9fb883cdbcb10ea27d3be682172a53e5d93710f2eaadb6772167d5a26929312 charybdis-2.1.0.tgz 769477
diff --git a/net-irc/charybdis/files/digest-charybdis-2.1.5 b/net-irc/charybdis/files/digest-charybdis-2.1.5
new file mode 100644
index 000000000000..310d7f08cb85
--- /dev/null
+++ b/net-irc/charybdis/files/digest-charybdis-2.1.5
@@ -0,0 +1,3 @@
+MD5 a3db4b3e702ae536d6a46525d449cd44 charybdis-2.1.5.tar.gz 787918
+RMD160 96444870b57d603be6df5bc226bc17d5042bee15 charybdis-2.1.5.tar.gz 787918
+SHA256 06d77e8947d0cef18e2dec942066ac673012351670175e40853eb340a8e93017 charybdis-2.1.5.tar.gz 787918
diff --git a/net-irc/charybdis/files/digest-charybdis-2.2.0 b/net-irc/charybdis/files/digest-charybdis-2.2.0
new file mode 100644
index 000000000000..16f45c3df849
--- /dev/null
+++ b/net-irc/charybdis/files/digest-charybdis-2.2.0
@@ -0,0 +1,3 @@
+MD5 a51f6b6f43872fe3d6bc31342a39f35b charybdis-2.2.0.tar.gz 798742
+RMD160 45bffe882c1dfc9ef7f378b58fd52009f8ef2647 charybdis-2.2.0.tar.gz 798742
+SHA256 90a837bb4c704bb6b5c7e13964b00e6d69b5fb90d04773e210d5399ca430c96c charybdis-2.2.0.tar.gz 798742