diff options
author | José María Alonso <nimiux@gentoo.org> | 2013-08-31 15:27:58 +0000 |
---|---|---|
committer | José María Alonso <nimiux@gentoo.org> | 2013-08-31 15:27:58 +0000 |
commit | 3207b6fb2f70377a7d77128b948f1b3c60417fd7 (patch) | |
tree | ae20b42a8e9a954891c7e46f2567687aab23224b /net-irc | |
parent | Clean mask entries (diff) | |
download | historical-3207b6fb2f70377a7d77128b948f1b3c60417fd7.tar.gz historical-3207b6fb2f70377a7d77128b948f1b3c60417fd7.tar.bz2 historical-3207b6fb2f70377a7d77128b948f1b3c60417fd7.zip |
Drop old versions
Package-Manager: portage-2.1.12.2/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 | 24 | ||||
-rw-r--r-- | net-irc/inspircd/files/inspircd-2.0.11-fix-path-builds.patch | 209 | ||||
-rw-r--r-- | net-irc/inspircd/files/inspircd-2.0.11-init | 39 | ||||
-rw-r--r-- | net-irc/inspircd/files/inspircd-2.0.12-fix-path-builds.patch | 208 | ||||
-rw-r--r-- | net-irc/inspircd/files/inspircd-2.0.12-init | 39 | ||||
-rw-r--r-- | net-irc/inspircd/inspircd-2.0.11.ebuild | 101 | ||||
-rw-r--r-- | net-irc/inspircd/inspircd-2.0.12.ebuild | 101 |
8 files changed, 15 insertions, 714 deletions
diff --git a/net-irc/inspircd/ChangeLog b/net-irc/inspircd/ChangeLog index e630136b6641..2f69cc68b418 100644 --- a/net-irc/inspircd/ChangeLog +++ b/net-irc/inspircd/ChangeLog @@ -1,6 +1,12 @@ # 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.85 2013/08/28 08:54:51 nimiux Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/ChangeLog,v 1.86 2013/08/31 15:27:51 nimiux Exp $ + + 31 Aug 2013; Chema Alonso <nimiux@gentoo.org> -inspircd-2.0.11.ebuild, + -files/inspircd-2.0.11-fix-path-builds.patch, -files/inspircd-2.0.11-init, + -inspircd-2.0.12.ebuild, -files/inspircd-2.0.12-fix-path-builds.patch, + -files/inspircd-2.0.12-init: + Drop old 28 Aug 2013; Chema Alonso <nimiux@gentoo.org> inspircd-2.0.13.ebuild: Fix USE flags wrt bug #481612 by El Goretto diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest index f8e22370e4a8..b290dc4e86c9 100644 --- a/net-irc/inspircd/Manifest +++ b/net-irc/inspircd/Manifest @@ -1,28 +1,20 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX inspircd-2.0.11-fix-path-builds.patch 7320 SHA256 7706d0596a166456318ce3a7d8e213c633b3ff16bb304b24bf91e4b9f2757348 SHA512 fe3b6568290eed3bc960ebcfe85baa1424269a0484c2930b8a839d59e636d9920e907cd588c9eeb4a1636a5b85d696a23b1840d8d77394ad53a1b64653a038eb WHIRLPOOL 508af4e527c933689876b34b482097e26897d057a144c1b45b24a6ed50b3ddd6bc996bb733ed8ebbd2d96a0847fec2cbbcdb5a149da44c8986753039b88d868d -AUX inspircd-2.0.11-init 917 SHA256 93e3c8a96ae88f78ccd1ed42f897b0ee357f2cfdb19112d7c48a83055aacd50c SHA512 618067eb690bdc9459ee7399e96a38351526f0eee3e26b78401e2dc93a8cb9e13fe0134825089581c19698781edbc390120c4d0bb810a9ea128ec340263dc967 WHIRLPOOL 2751cca3d339507c4e0235a1450ed9f44971fae16f581a7f2205480239c16e83d226c7458d17ae690dbff44699827625271f7dd13b082e8fbd19dbb61aa6f7ec -AUX inspircd-2.0.12-fix-path-builds.patch 7322 SHA256 acfc5f50fb638134c4c639a3d8f97810afb9aaa350430f7991a83fd033509cb4 SHA512 c178ab5711ff7e9d5ab32b9fa956d18e4694b4a54cde7beb7f7b47a58ebe0218b9c518568c420ad4ff012fda2f74bff5ca4706d440218e768ad83d9f0afaae46 WHIRLPOOL 195f888c6d6c0f152dc93b19eb4a840fa413ea42768893b744c243a1d5bf2326280de4c4fc2bc1974ed3b4d861a30c00f551d69515e4edffe51e36550f25da64 -AUX inspircd-2.0.12-init 917 SHA256 525668a23ac1a6afdd260fdd9762b6b634bfa09d4dc8e8cec4f5e412c165a3ac SHA512 547b206e1998aaf54a12f9cd69d966f94b7d03f1ff9c9d59dee02f39f8cb1a131722e5efc36eb0e6a8a7bcaff2e70a7aa86e152a51c6382a9e5bf9d369476b75 WHIRLPOOL 9b4d9a1bbfe6e7d50f77eaea24570c05a19fad0a584dbca64e88a60af2eb04747f814392e55e6fc4aa3edb945e6bdf1d39e49b77d2b5dc0b5f1b4d71b2a16174 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 -DIST inspircd-2.0.11.tar.gz 739153 SHA256 6b01e347d2383306291af45dddbe30783fb4d889a523f82f54f4bee36560af7f SHA512 a9978361f8a3a76f4732407020f17207c32527ef70b6c89a8b99d40a0a5068487258f54800155cabc9250d9539f85218b6237a397b259d03b0814f0ff3baf222 WHIRLPOOL 9191019fad3a3d807ae58c7bcb5410d3be1fc07de90e567ec0a177816c1fd63824cca943d4c216895ef131e2113c9683010cd7691c965ece75c48f2477027568 -DIST inspircd-2.0.12.tar.gz 740630 SHA256 82963045f72238ae94277a31d9174104290329cf52261b624dd96511849dfad3 SHA512 c03069f1399e8cc23a35d7e58664882fcd0e832a114ce1f26ddd4b8c600b88171180e2212e5eff4fe5a64dc52602f7d251d787c5a724d2dda8496b450426aaff WHIRLPOOL e6088b1d7852b549e8bb4a4387744c451075394c7126435aeafc3c358384d48450fdb4c1ba45e00e9956d1a8fce7fd20193ecb8cbea9eeb2c6e7af4b5577f33d DIST inspircd-2.0.13.tar.gz 741208 SHA256 f0c3753b2c54ec7581dc31b0c99b343bd7431f87c89c1017239e2ce33a5c2fbe SHA512 d6901b706294b7c60e55fedb162f2e27d5200fac974f90fd8ba8175958f0c76e01c78b0ab52c4eb73e567dfbb83dba441e03279ec58c3759af0312729f4b235a WHIRLPOOL 7175993580630d6c42030e1bf9bd623aa10d117a2a3c96297de7370abe07dd382988ce1f9a920c6f50a7a2750a153868e415fdd39ad470c2110a140ea363ca63 -EBUILD inspircd-2.0.11.ebuild 2836 SHA256 b97d8741ea92df75061cc9f090f0375b93951e0fa3bab84f2db0c5b679aef2ae SHA512 3e915e0bb0289922b5cbc68746a50b47c1c6a9e6440dd7eb2201db2120d6292b9eab0872ab745ed13ad9eb15201538a42b1af725511601b71380edc08162d83a WHIRLPOOL 00bceb747d6fc92bee6ee7d54d19a26e79ccf07236be2e9279881817d4ee828d99740beee4daa56ab2f1e26a8c067e2da47b8eb4779096be742ea0b975aaf2d0 -EBUILD inspircd-2.0.12.ebuild 2836 SHA256 a8be30453efd8789779b65ae131cfb53e2ed38432efe1992f22021cda03ac004 SHA512 b7e00171d86e0676c02edae637b76e756226db647b5372e3c8493ec97acce2a542c2b11d546511fad2e3bdaffb495a7a28899c9637cc9aba21987c2117d7449e WHIRLPOOL 90160eaf2d0c8d456495929c1b51d84827e2b6308f3c462a3308a39d2820733aac74c9becdef91ee6202e415cae7eb11086f57a0154cf56f0c1807aa0243c78f EBUILD inspircd-2.0.13.ebuild 3069 SHA256 ba6d0558539925895846fccde374b6456edf6ff56e90c9c8c988ea91e609e703 SHA512 46aaf10f7108cf1f2fea4185046affe0f2be6319b60b8d655a0f80dc24db33fdb9ebf6db1c566208d508ca0554bd6e19177ff4f45da7f8aff3d1dd3a4fbc10ca WHIRLPOOL 13808938411529d4b2b3f89f832fb4c72636964fa7d61931752a228d1380781bb106fa42d9977abdcbb723e95543474fbee9a143feb5806e1e947b8775ef11f0 -MISC ChangeLog 14727 SHA256 a3629dee3e31df9880cda2b055585b61125623dd48d49206b1179c32be6964c4 SHA512 18a5c33438257a1a70ccac299b8536457880f64a78853f6e879a405a86d00b1cf7816e5c7c65275bdc8c60033faa0c4cb8634410112293022daac80df86a644e WHIRLPOOL fbef99b0ca49b45c7e6ee4810331f0c12b45f4d63e048fcec30f2395e7e1fa80484bb166e5e8e35e23798ba8c9141fb16daffd7c6d4550bcc73e24d21d3e436d +MISC ChangeLog 14993 SHA256 e79e9fe8ab8e3fe2bed34a04e7fb29590082fbe319dca79a26f184f03424c8b7 SHA512 37819674c020140bd0fd6b6d2e7ed4af5174dc4a7137cb7cb198d0b2ef26d102db629b6f2bfcbc6345d2beda206c4cc50edc7cc373fdd48053f42527c456629a WHIRLPOOL 01d0fb7c1f960e16ce53c00d8085a6fa625d0613aef55e8d4e5abeea9d6a42376fe3cdcb2e295f740a5b42c84585d82287759a0afe9db21a12fe41cc89d81f09 MISC metadata.xml 1678 SHA256 e6f968762672f557e56e3738a12e9b12a6dc3adb603f5369cb65904601f0ae8a SHA512 b335ee15d2480b45b1d889d2036b045efd168586e4643a223bff5ceedf04b91fffafd6ea8ee7c46649769719529c3e6e972e8a5c761354847b6a161b48fbfa26 WHIRLPOOL ea6af77a612fb122cec0bcf75989d0366a4a054e1fe8826eeb4b9d2eed68b5a77206fef118ee72c9d43e447e0885a79d80f0503b0b2c4b76498feaa33b1ef606 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) -iQEcBAEBCAAGBQJSHbsOAAoJEA2sAkrWKOU2/G0H/jmSzc0f/2jgPhgD817IiPVU -xMVliSoXfJa966flmNZbbeLehTXO5T6fLxq+RkOX133wDc4gWq9UNNXGiU8OO4HS -VlY0Wu9YFzcVsoYQ3DImeeQN85K7lA3bD/1ep5rNpWe58ZGszZQ8R7HXYtkDTP71 -4ZovkjA0xAa4HKrxeEDUHkDkZdJqYpLTk/hWSQ8omjqSV56OObwFiobAaZSmd3NI -V3jy4n6qVAPjf4gCmRNuLnJWTlP9QZ3adH1vko4MkzA++zx5ZviYwY3XeyP1Fdev -Md9j+ArkipGBf3arvHHSOHIqGWi15IsICUFQmjiXs+hf7QgtpZmzzlBltQm1wFQ= -=WTBN +iQEcBAEBCAAGBQJSIgurAAoJEA2sAkrWKOU24cAH/3V2g3HeBpOlQR8GtzNACxxf +pBVeIZdCR667CQAcoRWjKon3yhfvKA9mVolHlTcn552FmXd+syRciLbkMDyihC1R +yDjpEb9/YqncLVsGRCHcVyLv5JjK6O8h+dmyZe5rK9FLpi6s/zsONuSDVRL78Hwu +9psj4WuN717E8WBOXhyDa22ih4Voi22ln+X4p3eqz/S+5kq3VBiA27KSF2+BQqRN +CDiY49GIsnr40tt/AmGNMtHrNb2fkCMPoqv/LCPSgmjrcZNzl3sjnZ3yHZ1UIe9A +C0gM5Po76H2jqrLLOasxL4NPshrmUHtxXTApG3qlJpu5RrgCPlOSuBv+Qjcf0bk= +=d0HI -----END PGP SIGNATURE----- diff --git a/net-irc/inspircd/files/inspircd-2.0.11-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.11-fix-path-builds.patch deleted file mode 100644 index 4b44f002dd44..000000000000 --- a/net-irc/inspircd/files/inspircd-2.0.11-fix-path-builds.patch +++ /dev/null @@ -1,209 +0,0 @@ -diff -Nur a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example ---- a/docs/conf/inspircd.conf.example 2013-03-29 02:16:32.000000000 +0100 -+++ b/docs/conf/inspircd.conf.example 2013-04-08 11:36:10.439968266 +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 #-#-#-#-#-#-#-#-#-#-#-#-#-#-# - # # -@@ -953,7 +954,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 -@@ -965,10 +966,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-03-29 02:16:32.000000000 +0100 -+++ b/make/template/main.mk 2013-04-08 12:17:41.819954271 +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) -@@ -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,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 -@@ -144,10 +146,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 +224,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 +233,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 +248,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-03-29 02:16:32.000000000 +0100 -+++ b/make/unit-cc.pl 2013-04-08 11:49:50.149963661 +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.11-init b/net-irc/inspircd/files/inspircd-2.0.11-init deleted file mode 100644 index d301e3e0ddc3..000000000000 --- a/net-irc/inspircd/files/inspircd-2.0.11-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.11-init,v 1.1 2013/04/08 10:25:13 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.12-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.12-fix-path-builds.patch deleted file mode 100644 index 48d0c29af67a..000000000000 --- a/net-irc/inspircd/files/inspircd-2.0.12-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-04-24 19:55:01.000000000 +0200 -+++ b/docs/conf/inspircd.conf.example 2013-05-11 20:33:07.789999907 +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-04-24 19:55:01.000000000 +0200 -+++ b/make/template/main.mk 2013-05-11 20:47:28.299999884 +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-04-24 19:55:01.000000000 +0200 -+++ b/make/unit-cc.pl 2013-05-11 20:28:45.869999914 +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.12-init b/net-irc/inspircd/files/inspircd-2.0.12-init deleted file mode 100644 index a4057e302368..000000000000 --- a/net-irc/inspircd/files/inspircd-2.0.12-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.12-init,v 1.1 2013/05/11 19:34:01 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.11.ebuild b/net-irc/inspircd/inspircd-2.0.11.ebuild deleted file mode 100644 index de5d32df565b..000000000000 --- a/net-irc/inspircd/inspircd-2.0.11.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/inspircd-2.0.11.ebuild,v 1.3 2013/05/10 09:42:39 ago Exp $ - -EAPI=5 - -inherit eutils multilib toolchain-funcs - -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 ) - 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="" - - use geoip && extras="${extras}m_geoip.cpp," - 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 tre && extras="${extras}m_regex_tre.cpp," - - 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" \ - $(use_enable ssl openssl) $(use_enable gnutls) \ - $(use_enable ipv6) -} - -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.12.ebuild b/net-irc/inspircd/inspircd-2.0.12.ebuild deleted file mode 100644 index 810d02c9fafe..000000000000 --- a/net-irc/inspircd/inspircd-2.0.12.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/inspircd-2.0.12.ebuild,v 1.3 2013/06/25 13:00:58 ago Exp $ - -EAPI=5 - -inherit eutils multilib toolchain-funcs - -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 ) - 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="" - - use geoip && extras="${extras}m_geoip.cpp," - 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 tre && extras="${extras}m_regex_tre.cpp," - - 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" \ - $(use_enable ssl openssl) $(use_enable gnutls) \ - $(use_enable ipv6) -} - -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 -} |