From 35599f54e2933f16e5c7c87e7ff1cd337929515a Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Wed, 3 Aug 2016 15:48:48 -0400 Subject: net-irc/irc-server: new revision to fix minor QA issues. This new revision fixes a few small issues: * The GPL-2 (for the init script) was missing from LICENSE. * Some die() statements were missing from system commands. * The src_prepare() was redundant. * The slot was missing from the ncurses dependency. Gentoo-Bug: 338571 Gentoo-Bug: 426038 Package-Manager: portage-2.2.28 --- net-irc/irc-server/irc-server-2.11.1_p1-r3.ebuild | 103 -------------------- net-irc/irc-server/irc-server-2.11.1_p1-r4.ebuild | 111 ++++++++++++++++++++++ 2 files changed, 111 insertions(+), 103 deletions(-) delete mode 100644 net-irc/irc-server/irc-server-2.11.1_p1-r3.ebuild create mode 100644 net-irc/irc-server/irc-server-2.11.1_p1-r4.ebuild diff --git a/net-irc/irc-server/irc-server-2.11.1_p1-r3.ebuild b/net-irc/irc-server/irc-server-2.11.1_p1-r3.ebuild deleted file mode 100644 index cf0b97149b40..000000000000 --- a/net-irc/irc-server/irc-server-2.11.1_p1-r3.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -inherit eutils versionator flag-o-matic user - -MY_P=irc${PV/_/} - -DESCRIPTION="RFC compliant IRC server" -HOMEPAGE="http://www.irc.org/" -SRC_URI="ftp://ftp.irc.org/irc/server/${MY_P}.tgz - ftp://ftp.irc.org/irc/server/Old/irc$(get_version_component_range 1-2)/${MY_P}.tgz" - -LICENSE="GPL-1" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="zlib ipv6" - -RDEPEND="sys-libs/ncurses - zlib? ( sys-libs/zlib )" -DEPEND="${RDEPEND} - sys-apps/sed - sys-apps/grep" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - enewgroup ircd - enewuser ircd -1 -1 -1 ircd -} - -src_prepare() { - eapply "${FILESDIR}"/2.10.3_p3-gentoo.patch - default -} - -src_configure () { - sed -i \ - -e "s/^#undef\tOPER_KILL$/#define\tOPER_KILL/" \ - -e "s/^#undef\tOPER_RESTART$/#define\tOPER_RESTART/" \ - -e "s/^#undef TIMEDKLINES$/#define\tTIMEDKLINES\t60/" \ - -e "s/^#undef\tR_LINES$/#define\tR_LINES/" \ - -e "s/^#undef\tCRYPT_OPER_PASSWORD$/#define\tCRYPT_OPER_PASSWORD/" \ - -e "s/^#undef\tCRYPT_LINK_PASSWORD$/#define\tCRYPT_LINK_PASSWORD/" \ - -e "s/^#undef\tIRC_UID$/#define\tIRC_UID\t$IRCUID/" \ - -e "s/^#undef\tIRC_GID$/#define\tIRC_GID\t$IRCGID/" \ - -e "s/^#undef USE_SERVICES$/#define\tUSE_SERVICES/" \ - "${S}"/support/config.h.dist - - use zlib && sed -i -e "s/^#undef\tZIP_LINKS$/#define\tZIP_LINKS/" "${S}"/support/config.h.dist - - econf \ - --sysconfdir=/etc/ircd \ - --localstatedir=/var/run/ircd \ - --with-logdir=/var/log/ircd \ - --with-rundir=/var/run/ircd \ - --mandir='${prefix}/share/man' \ - $(use_with zlib) \ - $(use_enable ipv6 ip6) -} - -src_compile() { - cd $(support/config.guess) - emake ircd iauth chkconf ircd-mkpasswd ircdwatch tkserv -} - -src_install() { - cd $(support/config.guess) - - emake \ - prefix="${D}"/usr \ - ircd_conf_dir="${D}"/etc/ircd \ - ircd_var_dir="${D}"/var/run/ircd \ - ircd_log_dir="${D}"/var/log/ircd \ - install-server \ - install-tkserv - - fowners ircd:ircd /var/run/ircd - fowners ircd:ircd /var/log/ircd - - cd ../doc - dodoc \ - *-New alt-irc-faq Authors BUGS ChangeLog Etiquette \ - iauth-internals.txt INSTALL.appendix INSTALL.* \ - m4macros README RELEASE* rfc* SERVICE* - - docinto Juped - dodoc Juped/Advertisement Juped/ChangeLog.* Juped/INSTALL - - docinto Juped/US-Admin - dodoc Juped/US-Admin/Networking - - docinto Nets - dodoc Nets/IRCNet - - docinto Nets/Europe - dodoc Nets/Europe/* - - newinitd "${FILESDIR}"/ircd.rc ircd - newconfd "${FILESDIR}"/ircd.confd ircd -} diff --git a/net-irc/irc-server/irc-server-2.11.1_p1-r4.ebuild b/net-irc/irc-server/irc-server-2.11.1_p1-r4.ebuild new file mode 100644 index 000000000000..49aa92572e14 --- /dev/null +++ b/net-irc/irc-server/irc-server-2.11.1_p1-r4.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit versionator user + +MY_P="irc${PV/_/}" + +DESCRIPTION="RFC compliant IRC server" +HOMEPAGE="http://www.irc.org/" +SRC_URI="ftp://ftp.irc.org/irc/server/${MY_P}.tgz + ftp://ftp.irc.org/irc/server/Old/irc$(get_version_component_range 1-2)/${MY_P}.tgz" + +# GPL-2 is for the init script, bug 426038. +LICENSE="GPL-1 GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="zlib ipv6" + +RDEPEND="sys-libs/ncurses:0 + zlib? ( sys-libs/zlib )" +DEPEND="${RDEPEND} + sys-apps/sed + sys-apps/grep" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( "${FILESDIR}"/2.10.3_p3-gentoo.patch ) + +pkg_setup() { + enewgroup ircd + enewuser ircd -1 -1 -1 ircd +} + +src_configure () { + sed -i \ + -e "s/^#undef\tOPER_KILL$/#define\tOPER_KILL/" \ + -e "s/^#undef\tOPER_RESTART$/#define\tOPER_RESTART/" \ + -e "s/^#undef TIMEDKLINES$/#define\tTIMEDKLINES\t60/" \ + -e "s/^#undef\tR_LINES$/#define\tR_LINES/" \ + -e "s/^#undef\tCRYPT_OPER_PASSWORD$/#define\tCRYPT_OPER_PASSWORD/" \ + -e "s/^#undef\tCRYPT_LINK_PASSWORD$/#define\tCRYPT_LINK_PASSWORD/" \ + -e "s/^#undef\tIRC_UID$/#define\tIRC_UID\t$IRCUID/" \ + -e "s/^#undef\tIRC_GID$/#define\tIRC_GID\t$IRCGID/" \ + -e "s/^#undef USE_SERVICES$/#define\tUSE_SERVICES/" \ + "${S}"/support/config.h.dist \ + || die "failed to sed definitions in config.h.dist" + + if use zlib ; then + sed -i -e "s/^#undef\tZIP_LINKS$/#define\tZIP_LINKS/" \ + "${S}"/support/config.h.dist \ + || die "failed to sed ZIP_LINKS definition in config.h.dist" + fi + + # The --mandir has single quotes around it, the $prefix is NOT + # interpolated into the string. + econf \ + --sysconfdir=/etc/ircd \ + --localstatedir=/var/run/ircd \ + --with-logdir=/var/log/ircd \ + --with-rundir=/var/run/ircd \ + --mandir='${prefix}/share/man' \ + $(use_with zlib) \ + $(use_enable ipv6 ip6) +} + +src_compile() { + cd $(support/config.guess) \ + || die "failed to change into the source directory in src_compile" + emake ircd iauth chkconf ircd-mkpasswd ircdwatch tkserv +} + +src_install() { + cd $(support/config.guess) \ + || die "failed to change into the source directory in src_install" + + emake \ + prefix="${D}"/usr \ + ircd_conf_dir="${D}"/etc/ircd \ + ircd_var_dir="${D}"/var/run/ircd \ + ircd_log_dir="${D}"/var/log/ircd \ + install-server \ + install-tkserv + + fowners ircd:ircd /var/run/ircd + fowners ircd:ircd /var/log/ircd + + cd ../doc || die "failed to change into the doc directory in src_install" + + dodoc \ + *-New alt-irc-faq Authors BUGS ChangeLog Etiquette \ + iauth-internals.txt INSTALL.appendix INSTALL.* \ + m4macros README RELEASE* rfc* SERVICE* + + docinto Juped + dodoc Juped/Advertisement Juped/ChangeLog.* Juped/INSTALL + + docinto Juped/US-Admin + dodoc Juped/US-Admin/Networking + + docinto Nets + dodoc Nets/IRCNet + + docinto Nets/Europe + dodoc Nets/Europe/* + + newinitd "${FILESDIR}"/ircd.rc ircd + newconfd "${FILESDIR}"/ircd.confd ircd +} -- cgit v1.2.3-18-g5258