[gentoo-commits] repo/gentoo:master commit in: net-irc/anope/files/
commit: a85ea0f42c2f7d7d5f4e80478092b864ce14d64a Author: Michael Mair-Keimberger gmail com> AuthorDate: Mon Dec 21 16:05:36 2020 + Commit: Sam James gentoo org> CommitDate: Mon Dec 21 18:15:03 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a85ea0f4 net-irc/anope: remove unused patch Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Michael Mair-Keimberger gmail.com> Signed-off-by: Sam James gentoo.org> net-irc/anope/files/anope-2.0.7-musl-libintl.patch | 22 -- 1 file changed, 22 deletions(-) diff --git a/net-irc/anope/files/anope-2.0.7-musl-libintl.patch b/net-irc/anope/files/anope-2.0.7-musl-libintl.patch deleted file mode 100644 index f14e494e0c1..000 --- a/net-irc/anope/files/anope-2.0.7-musl-libintl.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/language.cpp b/src/language.cpp -index 1915378..c1eeea5 100644 a/src/language.cpp -+++ b/src/language.cpp -@@ -75,7 +75,7 @@ const char *Language::Translate(const NickCore *nc, const char *string) - - #if GETTEXT_FOUND - --#ifdef __USE_GNU_GETTEXT -+#if defined(__GLIBC__) - extern "C" int _nl_msg_cat_cntr; - #endif - -@@ -87,7 +87,7 @@ const char *Language::Translate(const char *lang, const char *string) - if (!lang || !*lang) - lang = Config->DefLanguage.c_str(); - --#ifdef __USE_GNU_GETTEXT -+#if defined(__GLIBC__) - ++_nl_msg_cat_cntr; - #endif -
[gentoo-commits] repo/gentoo:master commit in: net-irc/anope/files/, net-irc/anope/
commit: fad3398f2af43b94a28e677a7d318526e194bffb Author: Sam James (sam_c) cmpct info> AuthorDate: Tue May 5 13:13:08 2020 + Commit: Thomas Deutschmann gentoo org> CommitDate: Tue May 5 13:30:10 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fad3398f net-irc/anope: Fix patch filenames Adhere to the standards for patch file naming. Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Sam James (sam_c) cmpct.info> Closes: https://github.com/gentoo/gentoo/pull/15654 Signed-off-by: Thomas Deutschmann gentoo.org> net-irc/anope/anope-2.0.6.ebuild| 2 +- net-irc/anope/anope-2.0.7.ebuild| 6 +++--- .../{pid-patch.patch => anope-2.0.6-example.conf-pid-path.patch}| 0 ...{example.conf-user.patch => anope-2.0.7-example.conf-user.patch} | 0 .../files/{musl-libintl.patch => anope-2.0.7-musl-libintl.patch}| 0 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net-irc/anope/anope-2.0.6.ebuild b/net-irc/anope/anope-2.0.6.ebuild index 8bb47e7d54b..1d78f2271b9 100644 --- a/net-irc/anope/anope-2.0.6.ebuild +++ b/net-irc/anope/anope-2.0.6.ebuild @@ -38,7 +38,7 @@ DEPEND="${BDEPEND} tre? ( dev-libs/tre )" RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/pid-patch.patch" ) +PATCHES=( "${FILESDIR}/anope-2.0.6-example.conf-pid-path.patch" ) S="${WORKDIR}/${P}-source" diff --git a/net-irc/anope/anope-2.0.7.ebuild b/net-irc/anope/anope-2.0.7.ebuild index e24c908ab98..1d5f4d67658 100644 --- a/net-irc/anope/anope-2.0.7.ebuild +++ b/net-irc/anope/anope-2.0.7.ebuild @@ -33,9 +33,9 @@ DEPEND=" RDEPEND="${DEPEND}" PATCHES=( - "${FILESDIR}/pid-patch.patch" - "${FILESDIR}/example.conf-user.patch" - "${FILESDIR}/musl-libintl.patch" + "${FILESDIR}/${PN}-2.0.6-example.conf-pid-path.patch" + "${FILESDIR}/${PN}-2.0.7-example.conf-user.patch" + "${FILESDIR}/${PN}-2.0.7-musl-libintl.patch" ) S="${WORKDIR}/${P}-source" diff --git a/net-irc/anope/files/pid-patch.patch b/net-irc/anope/files/anope-2.0.6-example.conf-pid-path.patch similarity index 100% rename from net-irc/anope/files/pid-patch.patch rename to net-irc/anope/files/anope-2.0.6-example.conf-pid-path.patch diff --git a/net-irc/anope/files/example.conf-user.patch b/net-irc/anope/files/anope-2.0.7-example.conf-user.patch similarity index 100% rename from net-irc/anope/files/example.conf-user.patch rename to net-irc/anope/files/anope-2.0.7-example.conf-user.patch diff --git a/net-irc/anope/files/musl-libintl.patch b/net-irc/anope/files/anope-2.0.7-musl-libintl.patch similarity index 100% rename from net-irc/anope/files/musl-libintl.patch rename to net-irc/anope/files/anope-2.0.7-musl-libintl.patch
[gentoo-commits] repo/gentoo:master commit in: net-irc/anope/files/, net-irc/anope/
commit: 16444ce57e9332a7643c68fb9040e512cd1e7330 Author: Brian Evans gentoo org> AuthorDate: Wed Feb 6 21:02:32 2019 + Commit: Brian Evans gentoo org> CommitDate: Wed Feb 6 21:02:32 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16444ce5 net-irc/anope: Add default pid path patch Package-Manager: Portage-2.3.59, Repoman-2.3.12 Signed-off-by: Brian Evans gentoo.org> net-irc/anope/anope-2.0.6.ebuild| 2 ++ net-irc/anope/files/pid-patch.patch | 18 ++ 2 files changed, 20 insertions(+) diff --git a/net-irc/anope/anope-2.0.6.ebuild b/net-irc/anope/anope-2.0.6.ebuild index aad039abb9b..dfdba26b54f 100644 --- a/net-irc/anope/anope-2.0.6.ebuild +++ b/net-irc/anope/anope-2.0.6.ebuild @@ -39,6 +39,8 @@ DEPEND="${BDEPEND} tre? ( dev-libs/tre )" RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/pid-patch.patch" ) + S="${WORKDIR}/${P}-source" pkg_pretend() { diff --git a/net-irc/anope/files/pid-patch.patch b/net-irc/anope/files/pid-patch.patch new file mode 100644 index 000..ddf661ba980 --- /dev/null +++ b/net-irc/anope/files/pid-patch.patch @@ -0,0 +1,18 @@ +--- a/data/example.conf2017-03-30 17:00:24.0 -0400 a/data/example.conf2019-02-06 15:16:20.088469043 -0500 +@@ -231,13 +231,13 @@ +* The filename containing the Services process ID. The path is relative to the +* services root directory. +*/ +- pid = "data/services.pid" ++ pid = "/run/anope/services.pid" + + /* +* The filename containing the Message of the Day. The path is relative to the +* services root directory. +*/ +- motd = "conf/services.motd" ++ motd = "/etc/anope/services.motd" + } + + /*
[gentoo-commits] repo/gentoo:master commit in: net-irc/anope/files/, net-irc/anope/
commit: 4d7ed8caabbaac6f9f05805fe381b31d2cba095b Author: Brian Evans gentoo org> AuthorDate: Wed Feb 6 20:59:24 2019 + Commit: Brian Evans gentoo org> CommitDate: Wed Feb 6 20:59:24 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d7ed8ca net-irc/anope: Drop old Non-maintainer commit Closes: https://bugs.gentoo.org/632430 Closes: https://bugs.gentoo.org/665980 Package-Manager: Portage-2.3.59, Repoman-2.3.12 Signed-off-by: Brian Evans gentoo.org> net-irc/anope/Manifest | 1 - net-irc/anope/anope-1.8.7-r2.ebuild| 119 - net-irc/anope/files/anope-1.8.7-ldflags-fix.patch | 47 .../anope/files/anope-1.8.7-libdir-gentoo.patch| 91 net-irc/anope/files/anope-1.8.7-mariadb.patch | 109 --- net-irc/anope/files/anope-conf.d | 8 -- net-irc/anope/files/pid-patch.diff | 11 -- 7 files changed, 386 deletions(-) diff --git a/net-irc/anope/Manifest b/net-irc/anope/Manifest index 3a36b042078..fb1c759751e 100644 --- a/net-irc/anope/Manifest +++ b/net-irc/anope/Manifest @@ -1,2 +1 @@ -DIST anope-1.8.7.tar.gz 1586164 BLAKE2B 1efc6c9e719bca6698760d4181e2b96fa9aef5999a27af1c9452aea8ae39a5be7009efc14e5e7ad22426b95eb35952724b737d9de911830f3f69f822ebcc914f SHA512 3fb67f73b8f4dbdfbb9b4ac41a20e3b5c46d54cf5abb303f4a25d3a5863ef860ba5bdffc67439e5f1435675f80f86b2c283932c1a05edde2ae49612947fbd074 DIST anope-2.0.6-source.tar.gz 1792912 BLAKE2B 00c70723c887821d2dda065f9fdb4c4fc79a1534217dd567c2247c3ae9d0b3c1c07a9e1e9d87bfdf5f7f9be212af5139e29710224e02e80154290dd6d4b5ee7c SHA512 c100758d6159023832bc7a4dceb7d554a9b3cd9120b033efc9a93c7ff28e76a086d0594b66b9cd2946b231421217674990f2a3ebaa8a6598c2a25e2dafd1b65b diff --git a/net-irc/anope/anope-1.8.7-r2.ebuild b/net-irc/anope/anope-1.8.7-r2.ebuild deleted file mode 100644 index 82224833f9b..000 --- a/net-irc/anope/anope-1.8.7-r2.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit autotools eutils multilib versionator user - -DESCRIPTION="Anope IRC Services" -HOMEPAGE="http://www.anope.org; -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="mysql" - -DEPEND="mysql? ( virtual/mysql )" -RDEPEND="${DEPEND}" - -pkg_pretend() { - local replaced_version - for replaced_version in ${REPLACING_VERSIONS} ; do - if ! version_is_at_least 1.8.7 ${replaced_version} && [[ -f ${ROOT}opt/anope/data/nick.db ]]; then - eerror "It looks like you have an older version of Anope installed." - eerror "To upgrade, shut down Anope and copy your databases to" - eerror "${ROOT}var/lib/anope and your configuration to ${ROOT}etc/anope" - eerror "You can do this by:" - eerror "# mkdir -p ${ROOT}var/lib/anope ${ROOT}etc/anope" - eerror "# chown anope:anope ${ROOT}var/lib/anope" - eerror "# mv ${ROOT}opt/anope/data/*.db ${ROOT}var/lib/anope" - eerror "# mv ${ROOT}opt/anope/data/services.conf ${ROOT}etc/anope" - die "Please move your anope database files from /opt/anope/data" - fi - done -} - -pkg_setup() { - enewgroup anope - enewuser anope -1 -1 -1 anope -} - -src_prepare() { - epatch "${FILESDIR}/pid-patch.diff" - epatch "${FILESDIR}/${P}-ldflags-fix.patch" - epatch "${FILESDIR}/${P}-libdir-gentoo.patch" - epatch "${FILESDIR}"/${P}-mariadb.patch # bug 381119 - eautoconf -} - -src_configure() { - local myconf - if ! use mysql; then - myconf="${myconf} --without-mysql" - fi - - econf \ - ${myconf} \ - --with-bindir=/usr/bin/ \ - --with-datadir=/var/lib/anope \ - --with-libdir=/usr/$(get_libdir)/anope/ \ - --with-rungroup=anope \ - --with-permissions=077 - - sed -i -e "/^build:/s:$: language:g" "${S}"/Makefile || die "sed failed" -} - -src_install() { - keepdir /var/log/anope /var/lib/anope/backups - fowners anope:anope /var/{lib,log}/anope /var/lib/anope/backups - - local baselibdir - baselibdir="${D}/usr/$(get_libdir)/anope" - - dodir /usr/$(get_libdir)/anope/{lang,modules} - emake DATDEST="${baselibdir}" \ - BINDEST="${D}/usr/bin" \ - MODULE_PATH="${baselibdir}/modules" \ - install - - newinitd "${FILESDIR}/anope-init.d" anope - newconfd "${FILESDIR}/anope-conf.d" anope - - dodoc Changes Changes.conf Changes.lang Changes.mysql docs/* data/example.conf - use mysql && dodoc data/tables.sql - - insinto
[gentoo-commits] repo/gentoo:master commit in: net-irc/anope/files/, net-irc/anope/
commit: 1eb2b264d55d3f76f745ff36ef065c08458933fd Author: Brian Evans gentoo org> AuthorDate: Wed Feb 6 20:51:08 2019 + Commit: Brian Evans gentoo org> CommitDate: Wed Feb 6 20:51:08 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eb2b264 net-irc/anope: Version bump Non-maintainer commit Based heavily off of Palme's ebuild in the bug Closes: https://bugs.gentoo.org/420613 Package-Manager: Portage-2.3.59, Repoman-2.3.12 Signed-off-by: Brian Evans gentoo.org> net-irc/anope/Manifest | 1 + net-irc/anope/anope-2.0.6.ebuild| 157 net-irc/anope/files/anope-conf.d-v2 | 9 +++ net-irc/anope/metadata.xml | 15 4 files changed, 182 insertions(+) diff --git a/net-irc/anope/Manifest b/net-irc/anope/Manifest index c166c738a00..3a36b042078 100644 --- a/net-irc/anope/Manifest +++ b/net-irc/anope/Manifest @@ -1 +1,2 @@ DIST anope-1.8.7.tar.gz 1586164 BLAKE2B 1efc6c9e719bca6698760d4181e2b96fa9aef5999a27af1c9452aea8ae39a5be7009efc14e5e7ad22426b95eb35952724b737d9de911830f3f69f822ebcc914f SHA512 3fb67f73b8f4dbdfbb9b4ac41a20e3b5c46d54cf5abb303f4a25d3a5863ef860ba5bdffc67439e5f1435675f80f86b2c283932c1a05edde2ae49612947fbd074 +DIST anope-2.0.6-source.tar.gz 1792912 BLAKE2B 00c70723c887821d2dda065f9fdb4c4fc79a1534217dd567c2247c3ae9d0b3c1c07a9e1e9d87bfdf5f7f9be212af5139e29710224e02e80154290dd6d4b5ee7c SHA512 c100758d6159023832bc7a4dceb7d554a9b3cd9120b033efc9a93c7ff28e76a086d0594b66b9cd2946b231421217674990f2a3ebaa8a6598c2a25e2dafd1b65b diff --git a/net-irc/anope/anope-2.0.6.ebuild b/net-irc/anope/anope-2.0.6.ebuild new file mode 100644 index 000..aad039abb9b --- /dev/null +++ b/net-irc/anope/anope-2.0.6.ebuild @@ -0,0 +1,157 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils user + +DESCRIPTION="Anope IRC Services" +HOMEPAGE="https://anope.org; +SRC_URI="https://github.com/anope/anope/releases/download/${PV}/${P}-source.tar.gz; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="mysql sqlite pcre posix gnutls ssl tre ldap anope_modules_sql_auth + anope_modules_sql_log anope_modules_sql_oper anope_modules_ldap_auth + anope_modules_ldap_oper anope_modules_irc2sql anope_modules_chanstats + anope_modules_cs_fantasy_stats anope_modules_cs_fantasy_top" + +REQUIRED_USE=" + anope_modules_sql_auth? ( || ( mysql sqlite ) ) + anope_modules_sql_oper? ( mysql ) + anope_modules_sql_log? ( mysql ) + anope_modules_cs_fantasy_stats? ( anope_modules_chanstats mysql ) + anope_modules_cs_fantasy_top? ( anope_modules_chanstats mysql ) + anope_modules_chanstats? ( mysql ) + anope_modules_irc2sql? ( mysql ) + anope_modules_ldap_auth? ( ldap ) + anope_modules_ldap_oper? ( ldap )" + +BDEPEND="sys-devel/gettext" +DEPEND="${BDEPEND} + mysql? ( dev-db/mysql-connector-c:0= ) + ssl? ( dev-libs/openssl:0= ) + gnutls? ( net-libs/gnutls:0= dev-libs/libgcrypt:0= ) + ldap? ( net-nds/openldap ) + pcre? ( dev-libs/libpcre ) + sqlite? ( dev-db/sqlite:3 ) + tre? ( dev-libs/tre )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${P}-source" + +pkg_pretend() { + local replaced_version + for replaced_version in ${REPLACING_VERSIONS} ; do + if ver_test ${replaced_version} -lt 1.8.7 && [[ -f ${ROOT}/opt/anope/data/nick.db ]]; then + eerror "It looks like you have an older version of Anope installed." + eerror "To upgrade, shut down Anope and copy your databases to" + eerror "${ROOT}/var/lib/anope and your configuration to ${ROOT}/etc/anope" + eerror "You can do this by:" + eerror "# mkdir -p ${ROOT}/var/lib/anope ${ROOT}/etc/anope" + eerror "# chown anope:anope ${ROOT}/var/lib/anope" + eerror "# mv ${ROOT}/opt/anope/data/*.db ${ROOT}var/lib/anope" + eerror "# mv ${ROOT}/opt/anope/data/services.conf ${ROOT}etc/anope" + die "Please move your anope database files from /opt/anope/data" + fi + done +} + +pkg_setup() { + enewgroup anope + enewuser anope -1 -1 -1 anope +} + +src_prepare() { + anope_use_extra() { + local useflag=$1 + local modulefile=$2 + if use $useflag; then + ln -s "extra/${modulefile}" "modules/" || \ + die "Failed to use ${modulefile}" + fi + } + + anope_use_extra mysql "m_mysql.cpp" + anope_use_extra sqlite "m_sqlite.cpp" + anope_use_extra ssl "m_ssl_openssl.cpp" + anope_use_extra gnutls
[gentoo-commits] repo/gentoo:master commit in: net-irc/anope/files/, net-irc/anope/
commit: 514f72a3500d571c4333ebf7424d6e0c68603b25 Author: Bjarke Istrup Pedersen gentoo org> AuthorDate: Mon Sep 7 20:19:08 2015 + Commit: Bjarke Istrup Pedersen gentoo org> CommitDate: Mon Sep 7 20:19:25 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=514f72a3 net-irc/anope: make init script use ircd Package-Manager: portage-2.2.20.1 net-irc/anope/{anope-1.8.7-r1.ebuild => anope-1.8.7-r2.ebuild} | 2 +- net-irc/anope/files/anope-init.d | 4 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/net-irc/anope/anope-1.8.7-r1.ebuild b/net-irc/anope/anope-1.8.7-r2.ebuild similarity index 98% rename from net-irc/anope/anope-1.8.7-r1.ebuild rename to net-irc/anope/anope-1.8.7-r2.ebuild index 95b969e..9f0afbc 100644 --- a/net-irc/anope/anope-1.8.7-r1.ebuild +++ b/net-irc/anope/anope-1.8.7-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/net-irc/anope/files/anope-init.d b/net-irc/anope/files/anope-init.d index 6523007..f8d73c6 100644 --- a/net-irc/anope/files/anope-init.d +++ b/net-irc/anope/files/anope-init.d @@ -7,6 +7,10 @@ PIDFILE=/run/anope/services.pid extra_started_commands="reload" +depend() { + use ircd +} + start_pre() { checkpath -o ${ANOPE_USER} -d "$(dirname $PIDFILE)" }