Clean old

(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key D628E536)

5 files changed, 6 insertions, 456 deletions

diff --git a/net-irc/inspircd/ChangeLog b/net-irc/inspircd/ChangeLog
index a4c50450e1e4..3a9406a31311 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.78 2013/05/11 19:34:01 nimiux Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/ChangeLog,v 1.79 2013/05/11 19:37:07 nimiux Exp $
+
+  11 May 2013; Chema Alonso <nimiux@gentoo.org> -inspircd-2.0.10.ebuild,
+  -inspircd-2.0.10-r1.ebuild, -files/inspircd-2.0.10-fix-path-builds.patch,
+  -files/inspircd-2.0.10-init:
+  Clean old
 
 *inspircd-2.0.12 (11 May 2013)
 
diff --git a/net-irc/inspircd/files/inspircd-2.0.10-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.10-fix-path-builds.patch
deleted file mode 100644
index e692c6fd9ebb..000000000000
--- a/net-irc/inspircd/files/inspircd-2.0.10-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	2012-12-16 16:30:58.000000000 +0100
-+++ b/docs/conf/inspircd.conf.example	2012-12-16 23:57:54.389816346 +0100
-@@ -416,11 +416,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  -#-#-#-#-#-#-#-#-#-#
- #                                                                     #
-@@ -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/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.
-@@ -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 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#
- #                                                                     #
-@@ -954,7 +955,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
-@@ -966,10 +967,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-12-16 16:30:58.000000000 +0100
-+++ b/make/template/main.mk	2012-12-17 10:00:42.080001996 +0100
-@@ -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,41 +72,41 @@
-   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
-+@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
- 
-@@ -125,10 +125,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
-@@ -141,10 +143,10 @@
-     @GNU_ONLY TARGET = modules/$(M:.so=).so
- @ENDIF
- 
--@IFDEF T
-+@IFDEF TGT
-     HEADER =
-     FOOTER = target
--    TARGET = $(T)
-+    TARGET = $(TGT)
- @ENDIF
- 
- @IFEQ $(DBGOK) 0
-@@ -219,8 +221,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
-@@ -228,9 +230,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!          *"
-@@ -243,7 +245,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-12-16 16:30:58.000000000 +0100
-+++ b/make/unit-cc.pl	2012-12-17 00:04:46.269814020 +0100
-@@ -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.10-init b/net-irc/inspircd/files/inspircd-2.0.10-init
deleted file mode 100644
index e2e9682e7d90..000000000000
--- a/net-irc/inspircd/files/inspircd-2.0.10-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.10-init,v 1.2 2013/01/08 19:41:58 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.10-r1.ebuild b/net-irc/inspircd/inspircd-2.0.10-r1.ebuild
deleted file mode 100644
index 26d70785dc19..000000000000
--- a/net-irc/inspircd/inspircd-2.0.10-r1.ebuild
+++ /dev/null
@@ -1,102 +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.10-r1.ebuild,v 1.3 2013/03/27 15:30:08 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.10.ebuild b/net-irc/inspircd/inspircd-2.0.10.ebuild
deleted file mode 100644
index 541d7a408d8a..000000000000
--- a/net-irc/inspircd/inspircd-2.0.10.ebuild
+++ /dev/null
@@ -1,105 +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.10.ebuild,v 1.5 2013/02/10 19:02:39 nimiux Exp $
-
-EAPI=4
-
-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 postgres sqlite ssl"
-
-RDEPEND="
-	dev-lang/perl
-	ssl? ( dev-libs/openssl )
-	geoip? ( dev-libs/geoip )
-	gnutls? ( net-libs/gnutls dev-libs/libgcrypt )
-	ldap? ( net-nds/openldap )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-server )
-	sqlite? ( >=dev-db/sqlite-3.0 )"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	# Patch the inspircd launcher with the inspircd user
-	sed -i -e "s/@UID@/${PN}/" "${S}/make/template/${PN}" || die
-
-	epatch "${FILESDIR}/${PF}-fix-path-builds.patch"
-}
-
-src_configure() {
-	local extras=""
-	local essl="--enable-openssl"
-	local egnutls="--enable-gnutls"
-	local dipv6="--disable-ipv6"
-
-	use geoip && extras="${extras}m_geoip.cpp,"
-	use gnutls && extras="${extras}m_ssl_gnutls.cpp,"
-	use ldap && extras="${extras}m_ldapauth.cpp,"
-	use mysql && extras="${extras}m_mysql.cpp,"
-	use postgres && extras="${extras}m_pgsql.cpp,"
-	use sqlite && extras="${extras}m_sqlite3.cpp,"
-	use ssl && extras="${extras}m_ssl_openssl.cpp,"
-
-	if [ -n "${extras}" ]; then
-		econf --disable-interactive --enable-extras=${extras}
-	fi
-
-	use !ssl && essl=""
-	use !gnutls && egnutls=""
-	use ipv6 && dipv6=""
-
-	econf \
-		--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}
-}
-
-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}/${PF}-init" "${PN}"
-	keepdir "/var/log/${PN}"/
-}
-
-pkg_postinst() {
-	elog "Before starting ${PN} the first time, you should create"
-	elog "the /etc/${PN}/${PN}.conf file."
-	elog "You can find example configuration files under /etc/${PN}"
-	elog "Read the ${PN}.conf.example file carefully before "
-	elog "(re)starting the service."
-	elog
-}