diff options
author | José María Alonso <nimiux@gentoo.org> | 2014-03-05 10:10:33 +0000 |
---|---|---|
committer | José María Alonso <nimiux@gentoo.org> | 2014-03-05 10:10:33 +0000 |
commit | 252343793406e3d652a0def966c34e59cb6ff686 (patch) | |
tree | 4659c67e2824f155ad6ba1d9913a18073dae53e7 /net-irc | |
parent | Removed old version using deprecated distutils eclass. (diff) | |
download | historical-252343793406e3d652a0def966c34e59cb6ff686.tar.gz historical-252343793406e3d652a0def966c34e59cb6ff686.tar.bz2 historical-252343793406e3d652a0def966c34e59cb6ff686.zip |
Drop old
Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xD628E536
Diffstat (limited to 'net-irc')
-rw-r--r-- | net-irc/inspircd/ChangeLog | 8 | ||||
-rw-r--r-- | net-irc/inspircd/Manifest | 30 | ||||
-rw-r--r-- | net-irc/inspircd/files/inspircd-2.0.13-fix-path-builds.patch | 208 | ||||
-rw-r--r-- | net-irc/inspircd/files/inspircd-2.0.13-init | 39 | ||||
-rw-r--r-- | net-irc/inspircd/files/inspircd-2.0.14-fix-path-builds.patch | 208 | ||||
-rw-r--r-- | net-irc/inspircd/files/inspircd-2.0.14-init | 39 | ||||
-rw-r--r-- | net-irc/inspircd/inspircd-2.0.13.ebuild | 109 | ||||
-rw-r--r-- | net-irc/inspircd/inspircd-2.0.14.ebuild | 109 |
8 files changed, 15 insertions, 735 deletions
diff --git a/net-irc/inspircd/ChangeLog b/net-irc/inspircd/ChangeLog index c4e53ae3b314..5a3078bf1eea 100644 --- a/net-irc/inspircd/ChangeLog +++ b/net-irc/inspircd/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-irc/inspircd # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/ChangeLog,v 1.94 2014/03/04 20:19:32 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/ChangeLog,v 1.95 2014/03/05 10:10:26 nimiux Exp $ + + 05 Mar 2014; Chema Alonso <nimiux@gentoo.org> -inspircd-2.0.13.ebuild, + -files/inspircd-2.0.13-fix-path-builds.patch, -files/inspircd-2.0.13-init, + -inspircd-2.0.14.ebuild, -files/inspircd-2.0.14-fix-path-builds.patch, + -files/inspircd-2.0.14-init: + Drop old 04 Mar 2014; Agostino Sarubbo <ago@gentoo.org> inspircd-2.0.15.ebuild: Stable for x86, wrt bug #502390 diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest index 409e34fa2f85..fa4c75a47e05 100644 --- a/net-irc/inspircd/Manifest +++ b/net-irc/inspircd/Manifest @@ -1,34 +1,20 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX inspircd-2.0.13-fix-path-builds.patch 7322 SHA256 7c598e53550f4a82de164dabe0895ed84b2a939faf56874cc1a1bd38c4616233 SHA512 16992f94965c852beaf3d4201f189674706d3ee8641b510c1fce80c8baceedfc608b4a3b139705adc5971023c89b7445907fe22cf45c3106f406ac4fcddb7c59 WHIRLPOOL 1f07313b085f387aea2faaa389910f4d5b7691580c7b4899fa5624e6981f5ae68a11ce106f1217f1bd103f1b2d9b6d06719d044385e759272e8c4d4c81c0c723 -AUX inspircd-2.0.13-init 917 SHA256 1cb1d0496843db94862951dde7e661d2388dde8e061cfb8fd8363df8e106b785 SHA512 f33e02a0611c5088427d10bccf49b239dba59168184c64ca9658201ce370f4356ef8e80bc2d4d45f841627fbc89f8c11863c8a8ba25329e89fda4642ddea6e2e WHIRLPOOL 9dcd0ba963a57a51ea71f150385f7e5aed86b6c09850e35ccce75ea4f51882ed57d074af9d5f9d90797ebd9e7dd84d5a4bc5f4471eb4de1072749975ada1a120 -AUX inspircd-2.0.14-fix-path-builds.patch 7327 SHA256 bd8abdf1e21f9dc42dbfb9e0006d332e77722b4b373d640b22d37c0fae79c9de SHA512 a23303599ade69c10bdfa9fcffa05a49728db8084801e330934d4566e07be399baa0111eeb55315d425ceee498429f653050c30c85802cce027eeb021fd20a14 WHIRLPOOL d54255b36b9df44f0b4336c9189a78da68ef8b848637ea1e4b4bb93d45f43c102512677e7833eb3f6a081b7505fe71c123302b61b32f72debbd5cf1ad929db9c -AUX inspircd-2.0.14-init 917 SHA256 43a9ddf664b87ebe4ad02afe9a56ed5fb10f3367b46c0bb96b49c6ded1d9217e SHA512 32a35102ef973a827599135fbb6bca5b461bfc4566384cde0d30d0b94ce7a1a942e7dccf6fe6a6fd0cd8c31d6eb55fecff52606ebd7ef46ca46f87f1df48da8b WHIRLPOOL b5c3845cc4405a7d9b8ea17c9d1d37bfecf9a0b963e5950c5151a6e21df792ab02871a2c5b17fc5b92853631d444bffa41c8efd84b9dfd503296f9acecbffb53 AUX inspircd-2.0.15-fix-path-builds.patch 7327 SHA256 cd5cc3ce576702e752ecd4bae9aa07e6784ed03428eedf748c63ab119940007f SHA512 6edb2ce79a8bf7fceb697d7f37097f47f35a3c0df0b19e685713f26c73c109fc6a07dc8dda1f072a89d48f01d403b111fd4be18535b6d649ad28585fae05bdc0 WHIRLPOOL 7014dbcda3986fa806124dfc6e3d06823aaab2b821892bfab8874860cb83390b6d00334b0512dd42f44a05d34171ce6dad604d539bfe799dde67cf91afddd958 AUX inspircd-2.0.15-init 917 SHA256 15faeb543973ae5bb2d97677b18d2604330327989e9abe264739665e8a1ba7d9 SHA512 b893c361a7022a9ba0f7ffb9d5e433f77ba1eb528a2a5b8d5eb7bc63b9ee010ef791573c5f3aa8dc938eb0b8b44bcccc73f32450e7cd3ead8c0388105af2c570 WHIRLPOOL c39ece92dba12f57b5ab712dae7cc4795dc5fa98d00857de43704ee41de2bcb8cb7e0cc44da4b71d32f0471ba85e0618a5177f240ed7587fed690001a082d45b -DIST inspircd-2.0.13.tar.gz 741208 SHA256 f0c3753b2c54ec7581dc31b0c99b343bd7431f87c89c1017239e2ce33a5c2fbe SHA512 d6901b706294b7c60e55fedb162f2e27d5200fac974f90fd8ba8175958f0c76e01c78b0ab52c4eb73e567dfbb83dba441e03279ec58c3759af0312729f4b235a WHIRLPOOL 7175993580630d6c42030e1bf9bd623aa10d117a2a3c96297de7370abe07dd382988ce1f9a920c6f50a7a2750a153868e415fdd39ad470c2110a140ea363ca63 -DIST inspircd-2.0.14.tar.gz 742220 SHA256 c74138afd2cb5ea0e099ceeb8470327de2e92e18d51f63f1b3f11e6325e672dd SHA512 71b357d033d5eafa82998c53490abb4ba6c4127e2e3f7cc7c32e50610d665dfaf61e044fac35f42aa1c52527800c80021567ef410db41e067512ecefc104a8ef WHIRLPOOL 22b0a695b5765ff4e10d2fa8dfe8c9e990c91e3d063da69feedb92a9c90be73d5cd6f9936dc021115c21a097c2ca7940c547078e22581e88439f9e7e9b8388bc DIST inspircd-2.0.15.tar.gz 743719 SHA256 bb4fa81fcbec3861c9bf59f88d14348957bae42b240be85a03f4fac0cc2786ea SHA512 95a2dfbc6a98a4ced9068a0f79cf8439cf92867779b75b7aea33ddec45183d669e833e78eb0b826174f6350a65bc2e44f95473ef1b78ea26c8d74c4833610cc1 WHIRLPOOL b8a5baa7cdd837da969de949314fb8bf0461fa89249585d9bced135705479ea7755ed05ba5dbb748808e8b03fc514943ed576dbce5fa2538645948b03a907acd -EBUILD inspircd-2.0.13.ebuild 3076 SHA256 a3f63b9a3e21bae53571e620381b35bbd260f993af019420d14468f2256621d7 SHA512 c3f2b2a588c18861e264579f1599f932c5e83c5da3c65e107d35b3474796abb1f9b1863ed9b848caa04d6c3404f5c23327b529f81567f4373ebbb25a0063576d WHIRLPOOL f8d8ab778e1f76799ffbc5054cf89ec4f697f11c3f88930c240b041e8955ebc724fd54c8c0bfeb4860a78dc769170c55241e886ab7ccf99829facdfd0fcdc630 -EBUILD inspircd-2.0.14.ebuild 3076 SHA256 41ceea015d5af5afd43893f3068ce16426793a4649cc6fa1366778504726c1ac SHA512 0e0f8a3a9840cad22bd4e022b39dd303323ba03769b043cbd40ac9c795baaf961b41619bb6497ce14850b1697a36d62de0f8a3cfb74325d28ac0adf322ef327a WHIRLPOOL 7d62d7185f5b7bddc296de8b583a4f95ccb4c2d94d2d31bd569079765a080650338ba13abd7b7c5151f0c9ecbdc9d43a8da1daf76f8baef079e139f6fb6fbf4b EBUILD inspircd-2.0.15.ebuild 3073 SHA256 b39d5b235b41a9ef60accf8b4b448e3d5fbde33e5af058f719d4296ac6e19cf1 SHA512 5c40de56c1c396f09a5aa58f635d8e2a42cba54efac222b3b10fa20ee5152d9433e132d13a010469a9cec391b58d405a3a32fba19f2dc2ec4b9bd294455b9432 WHIRLPOOL 95b9846d68864ba877c94692035a0660fa8885b314184cde89e857c625d5d214b3f2d5aa3368a986b12ca3f20a9af89b39c8f4ab905c3374b865339e68f21c06 -MISC ChangeLog 16181 SHA256 eb32e220cf125ac861dc3cfd250d563bd8b21f1587aa3fee780bd34c1b7fcf3d SHA512 dd1729de80b51f9ce2e0129a0a02b29d2e59b14a4f30b5b206c025e2d550a09c4d0bf5ad53c7d50e689e1714543c29002a4ecde8fc1a292d1b1180c655c8c9e5 WHIRLPOOL 1767fa614f6a4f87563a159c0256d3dddd3de5a08c9cef586c5af5fd09b5939d33480c6a4f1e810ff9f3012131cd2d12fc96ed959aa3cd9235bbe1f8ad88cc10 +MISC ChangeLog 16450 SHA256 2d758bc9815cc35ddfa3d45d5c7060dbacab3bc91aa0f51c67592f03ce7f7f44 SHA512 5c671f89966c1319611d7b20b93baad9642de11e13c2bb4ed4da9fe1c3cff5e848689825f638f2ca4cd1f9628cc8fe15ace37daff69926e8313b0ebaff5de093 WHIRLPOOL 84131c6d3113542dab57af038f70c06266b31625f9e239c3da99ce000ff513e7eef997a57c9b47a97f1d64fde62afb93280e230e845c6efde3bf96c04e4f7ea2 MISC metadata.xml 1678 SHA256 e6f968762672f557e56e3738a12e9b12a6dc3adb603f5369cb65904601f0ae8a SHA512 b335ee15d2480b45b1d889d2036b045efd168586e4643a223bff5ceedf04b91fffafd6ea8ee7c46649769719529c3e6e972e8a5c761354847b6a161b48fbfa26 WHIRLPOOL ea6af77a612fb122cec0bcf75989d0366a4a054e1fe8826eeb4b9d2eed68b5a77206fef118ee72c9d43e447e0885a79d80f0503b0b2c4b76498feaa33b1ef606 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCAAGBQJTFjVWAAoJELp701BxlEWfvIsQAKTDmfGUGL0pQ6IHcHPwMOUp -tI2R3QzkOp9Ni0Y+Cl+3QwY+gAjzxJdHx0hH9XTfuoxJFQOAXAmJZa9tD6x2RDuX -553NG2YgCJIqzD4Lj2uFyB5kqnQtG/gu3WIahXXcwC0VgXcrvWV5uOEbnDtQVAcc -zouAljnwLS8d/k/3CFFz9qTKcXQ/Qr6veX60OCW7iM2TwPy7skSSiEBI1ryiq5/t -kZigV4ZfRPIugJEiPSUvQLtHQY99IPRJOmTwo9JJ8KWyBFfjJh3KmBENEVeDlgt/ -Jd+pUuOECcEn4T6gLN3WI5vS285NmCsk2Rl1eY/bJWavJHoWDvZeYP2++K7SdqJE -6HwtIleCw3f8aLdSp1hHqv3YLmqhLG+QR1ZNkedmJXBEjGqTB+N5KotfSmsc9ljC -Bo3A2wlOTzkjccieLD55UUjkF1fOBu8/63fAAbSp8hDHT7Ehl4pcoyXh74vhccDr -k8Ik6RE4r51E0iPv5Vz7qEZ7Oh7X1ebXUOm1DoeaK3SqBDKzzfKUf4+MqCULCRlT -oVVJN3QOR3uR0M7ErMtan5DxEl+YI1UskSniMwOgwCp0fVyA94avrsRqdN1A3XHV -hIh1L62Jhk3scsSncoGBQEegHQ+Jp+gEhOJCFRkvO2y/Hjm5TRbfCRx8u2SaZkHC -tzc7LlDPGnWY3phUMrIs -=IWGj +iQEcBAEBCAAGBQJTFvhIAAoJEA2sAkrWKOU287UH+gOCMZvofny5nddbPPP+q7ZU +JJYRADel2ezPzbaUJxAgSs49Y8XDftA/ghNa4pXXCd1sfTPTSmCqvB0n4fJ9ERq6 +NwfgGDcGdoRdpeU3b/Ds/oExzz1WJgxKFvlQQdG+RAgqq2Md0VU8Q4sqXx1WvoWo +ovTEZQ1sSxE/KcO39hNVPHcNC2QRQECzTciVkN3+00ISudPBDKCk81khLJFjZHS5 +a8UB+IUVEblR6xoy8Ez1MR7o6/PLgGnTCX0lM7BmhBMUVOIKg1wFVNNbS5zqHesQ +exQaZoA4Qx5W58pVpfeP0ZZxtNhEOU73dyvfOXuxAEz5uCEZd2czbDYZWpZZPY4= +=HRD5 -----END PGP SIGNATURE----- diff --git a/net-irc/inspircd/files/inspircd-2.0.13-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.13-fix-path-builds.patch deleted file mode 100644 index 1e9b77249723..000000000000 --- a/net-irc/inspircd/files/inspircd-2.0.13-fix-path-builds.patch +++ /dev/null @@ -1,208 +0,0 @@ -diff -Nur a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example ---- a/docs/conf/inspircd.conf.example 2013-06-05 23:28:45.000000000 +0200 -+++ b/docs/conf/inspircd.conf.example 2013-06-06 18:48:33.989921736 +0200 -@@ -416,11 +416,11 @@ - - # This file has all the information about oper classes, types and o:lines. - # You *MUST* edit it. --<include file="conf/examples/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/examples/links.conf.example"> -+<include file="/etc/inspircd/links.conf.example"> - - #-#-#-#-#-#-#-#-#-#- MISCELLANEOUS CONFIGURATION -#-#-#-#-#-#-#-#-#-# - # # -@@ -430,7 +430,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/examples/motd.txt.example" rules="conf/examples/rules.txt.example"> -+<files motd="/etc/inspircd/motd.txt.example" -+ rules="/etc/inspircd/rules.txt.example"> - - # Example of an executable file include. Note this will be read on rehash, - # not when the command is run. -@@ -476,7 +477,7 @@ - # the default of 'inspircd.pid' is used. # - # # - --#<pid file="/path/to/inspircd.pid"> -+<pid file="/var/run/inspircd/inspircd.pid"> - - #-#-#-#-#-#-#-#-#-#-#-#-#- BANLIST LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#-# - # # -@@ -959,7 +960,7 @@ - # provide almost all the features of InspIRCd. :) # - # # - # The default does nothing -- we include it for simplicity for you. # --<include file="conf/examples/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 -@@ -971,10 +972,10 @@ - # recommended that you make your own modules file based on modules.conf.example. - - # Settings similar to UnrealIRCd defaults. --#<include file="conf/examples/modules/unrealircd.conf.example"> -+#<include file="/etc/inspircd/modules/unrealircd.conf.example"> - - # Settings similar to Charybdis IRCd defaults. --#<include file="conf/examples/modules/charybdis.conf.example"> -+#<include file="/etc/inspircd/modules/charybdis.conf.example"> - - - ######################################################################### -diff -Nur a/make/template/main.mk b/make/template/main.mk ---- a/make/template/main.mk 2013-06-05 23:28:45.000000000 +0200 -+++ b/make/template/main.mk 2013-06-06 18:57:20.189918780 +0200 -@@ -34,7 +34,7 @@ - SYSTEM = @SYSTEM@ - BUILDPATH = @BUILD_DIR@ - SOCKETENGINE = @SOCKETENGINE@ --CXXFLAGS = -pipe -fPIC -DPIC -+MYCXXFLAGS = -pipe -fPIC -DPIC - LDLIBS = -pthread -lstdc++ - LDFLAGS = - CORELDFLAGS = -rdynamic -L. $(LDFLAGS) -@@ -51,9 +51,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 -Wall - @ENDIF - - -@@ -75,41 +75,41 @@ - INSTALL = ginstall - @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 -+@IFEQ $(DEBUGLEVEL) 0 -+ MYCXXFLAGS += -O2 - @IFEQ $(CC) gcc -- CXXFLAGS += -g1 -+ MYCXXFLAGS += -g1 - @ENDIF - 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 - -@@ -128,10 +128,11 @@ - @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 -@@ -144,10 +145,10 @@ - @GNU_ONLY TARGET = modules/$(M:.so=).so - @ENDIF - --@IFDEF T -+@IFDEF TGT - HEADER = - FOOTER = target -- TARGET = $(T) -+ TARGET = $(TGT) - @ENDIF - - @IFEQ $(DBGOK) 0 -@@ -222,8 +223,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 -@@ -231,9 +232,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/*.example $(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/*.example $(CONPATH)/modules - @echo "" - @echo "*************************************" - @echo "* INSTALL COMPLETE! *" -@@ -246,7 +247,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 2013-06-05 23:28:45.000000000 +0200 -+++ b/make/unit-cc.pl 2013-06-06 18:53:38.969920023 +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.13-init b/net-irc/inspircd/files/inspircd-2.0.13-init deleted file mode 100644 index 0d8a6436d98e..000000000000 --- a/net-irc/inspircd/files/inspircd-2.0.13-init +++ /dev/null @@ -1,39 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2013 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.13-init,v 1.1 2013/06/06 19:45:20 nimiux Exp $ - -extra_commands="rehash version" - -depend() { - need net - provide ircd -} - -start() { - ebegin "Starting InspIRCd" - checkpath -d -m 0750 -o inspircd:inspircd /var/run/inspircd - start-stop-daemon --start --quiet --user inspircd \ - --exec /usr/bin/inspircd -- \ - --config /etc/inspircd/inspircd.conf \ - --logfile /var/log/inspircd/ircd.log - 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 - eend $? -} - -version() { - ebegin "Retrieve InspIRCd version" - /usr/lib/inspircd/inspircd.launcher/inspircd version - eend $? -} diff --git a/net-irc/inspircd/files/inspircd-2.0.14-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.14-fix-path-builds.patch deleted file mode 100644 index 11b4e7f963c9..000000000000 --- a/net-irc/inspircd/files/inspircd-2.0.14-fix-path-builds.patch +++ /dev/null @@ -1,208 +0,0 @@ -diff -Nuar a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example ---- a/docs/conf/inspircd.conf.example 2013-08-28 19:29:50.000000000 +0200 -+++ b/docs/conf/inspircd.conf.example 2013-08-31 17:37:49.520017189 +0200 -@@ -415,11 +415,11 @@ - - # This file has all the information about oper classes, types and o:lines. - # You *MUST* edit it. --<include file="conf/examples/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/examples/links.conf.example"> -+<include file="/etc/inspircd/links.conf.example"> - - #-#-#-#-#-#-#-#-#-#- MISCELLANEOUS CONFIGURATION -#-#-#-#-#-#-#-#-#-# - # # -@@ -429,7 +429,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/examples/motd.txt.example" rules="conf/examples/rules.txt.example"> -+<files motd="/etc/inspircd/motd.txt.example" -+ rules="/etc/inspircd/rules.txt.example"> - - # Example of an executable file include. Note this will be read on rehash, - # not when the command is run. -@@ -475,7 +476,7 @@ - # the default of 'inspircd.pid' is used. # - # # - --#<pid file="/path/to/inspircd.pid"> -+<pid file="/var/run/inspircd/inspircd.pid"> - - #-#-#-#-#-#-#-#-#-#-#-#-#- BANLIST LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#-# - # # -@@ -955,7 +956,7 @@ - # provide almost all the features of InspIRCd. :) # - # # - # The default does nothing -- we include it for simplicity for you. # --<include file="conf/examples/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 -@@ -967,10 +968,10 @@ - # recommended that you make your own modules file based on modules.conf.example. - - # Settings similar to UnrealIRCd defaults. --#<include file="conf/examples/modules/unrealircd.conf.example"> -+#<include file="/etc/inspircd/modules/unrealircd.conf.example"> - - # Settings similar to Charybdis IRCd defaults. --#<include file="conf/examples/modules/charybdis.conf.example"> -+#<include file="/etc/inspircd/modules/charybdis.conf.example"> - - - ######################################################################### -diff -Nuar a/make/template/main.mk b/make/template/main.mk ---- a/make/template/main.mk 2013-08-28 19:29:50.000000000 +0200 -+++ b/make/template/main.mk 2013-08-31 17:41:41.180017872 +0200 -@@ -34,7 +34,7 @@ - SYSTEM = @SYSTEM@ - BUILDPATH = @BUILD_DIR@ - SOCKETENGINE = @SOCKETENGINE@ --CXXFLAGS = -pipe -fPIC -DPIC -+MYCXXFLAGS = -pipe -fPIC -DPIC - LDLIBS = -pthread -lstdc++ - LDFLAGS = - CORELDFLAGS = -rdynamic -L. $(LDFLAGS) -@@ -51,9 +51,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 -Wall - @ENDIF - - -@@ -75,41 +75,41 @@ - INSTALL = ginstall - @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 -+@IFEQ $(DEBUGLEVEL) 0 -+ MYCXXFLAGS += -O2 - @IFEQ $(CC) gcc -- CXXFLAGS += -g1 -+ MYCXXFLAGS += -g1 - @ENDIF - 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 - -@@ -128,10 +128,11 @@ - @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 -@@ -144,10 +145,10 @@ - @GNU_ONLY TARGET = modules/$(M:.so=).so - @ENDIF - --@IFDEF T -+@IFDEF TGT - HEADER = - FOOTER = target -- TARGET = $(T) -+ TARGET = $(TGT) - @ENDIF - - @IFEQ $(DBGOK) 0 -@@ -222,8 +223,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 -@@ -231,9 +232,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/*.example $(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/*.example $(CONPATH)/modules - @echo "" - @echo "*************************************" - @echo "* INSTALL COMPLETE! *" -@@ -246,7 +247,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 -Nuar a/make/unit-cc.pl b/make/unit-cc.pl ---- a/make/unit-cc.pl 2013-08-28 19:29:50.000000000 +0200 -+++ b/make/unit-cc.pl 2013-08-31 17:41:57.630017920 +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.14-init b/net-irc/inspircd/files/inspircd-2.0.14-init deleted file mode 100644 index 343e3ec7f216..000000000000 --- a/net-irc/inspircd/files/inspircd-2.0.14-init +++ /dev/null @@ -1,39 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2013 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.14-init,v 1.1 2013/08/31 18:50:12 nimiux Exp $ - -extra_commands="rehash version" - -depend() { - need net - provide ircd -} - -start() { - ebegin "Starting InspIRCd" - checkpath -d -m 0750 -o inspircd:inspircd /var/run/inspircd - start-stop-daemon --start --quiet --user inspircd \ - --exec /usr/bin/inspircd -- \ - --config /etc/inspircd/inspircd.conf \ - --logfile /var/log/inspircd/ircd.log - 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 - eend $? -} - -version() { - ebegin "Retrieve InspIRCd version" - /usr/lib/inspircd/inspircd.launcher/inspircd version - eend $? -} diff --git a/net-irc/inspircd/inspircd-2.0.13.ebuild b/net-irc/inspircd/inspircd-2.0.13.ebuild deleted file mode 100644 index f445e0924fa2..000000000000 --- a/net-irc/inspircd/inspircd-2.0.13.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/inspircd-2.0.13.ebuild,v 1.6 2014/03/01 22:35:51 mgorny Exp $ - -EAPI=5 - -inherit eutils multilib toolchain-funcs user - -DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd" -HOMEPAGE="http://inspircd.github.com/" -SRC_URI="http://www.github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="geoip gnutls ipv6 ldap mysql pcre posix postgres sqlite ssl tre" - -RDEPEND=" - dev-lang/perl - ssl? ( dev-libs/openssl ) - geoip? ( dev-libs/geoip ) - gnutls? ( net-libs/gnutls dev-libs/libgcrypt:0 ) - ldap? ( net-nds/openldap ) - mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql-server ) - pcre? ( dev-libs/libpcre ) - sqlite? ( >=dev-db/sqlite-3.0 ) - tre? ( dev-libs/tre )" -DEPEND="${RDEPEND}" - -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}/${P}-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 ipv6 && dipv6="" - use ldap && extras="${extras}m_ldapauth.cpp,m_ldapoper.cpp," - use mysql && extras="${extras}m_mysql.cpp," - use pcre && extras="${extras}m_regex_pcre.cpp," - use posix && extras="${extras}m_regex_posix.cpp," - use postgres && extras="${extras}m_pgsql.cpp," - use sqlite && extras="${extras}m_sqlite3.cpp," - use ssl && extras="${extras}m_ssl_openssl.cpp," - use tre && extras="${extras}m_regex_tre.cpp," - - use !ssl && essl="" - use !gnutls && egnutls="" - - if [ -n "${extras}" ]; then - ./configure --disable-interactive --enable-extras=${extras} - fi - - ./configure \ - --with-cc="$(tc-getCXX)" \ - --disable-interactive \ - --prefix="/usr/$(get_libdir)/${PN}" \ - --config-dir="/etc/${PN}" \ - --data-dir="/var/lib/${PN}/data" \ - --log-dir="/var/log/${PN}" \ - --binary-dir="/usr/bin" \ - --module-dir="/usr/$(get_libdir)/${PN}/modules" \ - ${essl} ${egnutls} ${dipv6} || die -} - -src_compile() { - emake V=1 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}" -m0700 - dodir "/var/lib/${PN}" - dodir "/var/lib/${PN}/data" - - newinitd "${FILESDIR}/${P}-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 " - elog "(re)starting the service." - elog -} diff --git a/net-irc/inspircd/inspircd-2.0.14.ebuild b/net-irc/inspircd/inspircd-2.0.14.ebuild deleted file mode 100644 index ec515f42d39b..000000000000 --- a/net-irc/inspircd/inspircd-2.0.14.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/inspircd-2.0.14.ebuild,v 1.5 2014/03/01 22:35:51 mgorny Exp $ - -EAPI=5 - -inherit eutils multilib toolchain-funcs user - -DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd" -HOMEPAGE="http://inspircd.github.com/" -SRC_URI="http://www.github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="geoip gnutls ipv6 ldap mysql pcre posix postgres sqlite ssl tre" - -RDEPEND=" - dev-lang/perl - ssl? ( dev-libs/openssl ) - geoip? ( dev-libs/geoip ) - gnutls? ( net-libs/gnutls dev-libs/libgcrypt:0 ) - ldap? ( net-nds/openldap ) - mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql-server ) - pcre? ( dev-libs/libpcre ) - sqlite? ( >=dev-db/sqlite-3.0 ) - tre? ( dev-libs/tre )" -DEPEND="${RDEPEND}" - -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}/${P}-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 ipv6 && dipv6="" - use ldap && extras="${extras}m_ldapauth.cpp,m_ldapoper.cpp," - use mysql && extras="${extras}m_mysql.cpp," - use pcre && extras="${extras}m_regex_pcre.cpp," - use posix && extras="${extras}m_regex_posix.cpp," - use postgres && extras="${extras}m_pgsql.cpp," - use sqlite && extras="${extras}m_sqlite3.cpp," - use ssl && extras="${extras}m_ssl_openssl.cpp," - use tre && extras="${extras}m_regex_tre.cpp," - - use !ssl && essl="" - use !gnutls && egnutls="" - - if [ -n "${extras}" ]; then - ./configure --disable-interactive --enable-extras=${extras} - fi - - ./configure \ - --with-cc="$(tc-getCXX)" \ - --disable-interactive \ - --prefix="/usr/$(get_libdir)/${PN}" \ - --config-dir="/etc/${PN}" \ - --data-dir="/var/lib/${PN}/data" \ - --log-dir="/var/log/${PN}" \ - --binary-dir="/usr/bin" \ - --module-dir="/usr/$(get_libdir)/${PN}/modules" \ - ${essl} ${egnutls} ${dipv6} || die -} - -src_compile() { - emake V=1 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}" -m0700 - dodir "/var/lib/${PN}" - dodir "/var/lib/${PN}/data" - - newinitd "${FILESDIR}/${P}-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 " - elog "(re)starting the service." - elog -} |