diff options
author | 2011-01-24 20:51:05 +0100 | |
---|---|---|
committer | 2011-01-24 20:51:05 +0100 | |
commit | f71dbdbd4b276b7dbe8c0109d1b77ef73a3899ce (patch) | |
tree | 05b91fe65e0e1ddbc21d8ab38a01d21bf981a294 | |
parent | nigrcd 17.1 major version bump (diff) | |
download | scarabeus-f71dbdbd4b276b7dbe8c0109d1b77ef73a3899ce.tar.gz scarabeus-f71dbdbd4b276b7dbe8c0109d1b77ef73a3899ce.tar.bz2 scarabeus-f71dbdbd4b276b7dbe8c0109d1b77ef73a3899ce.zip |
[net-irc/ngircd] Cleanup a bit.
-rw-r--r-- | net-irc/ngircd/Manifest | 5 | ||||
-rw-r--r-- | net-irc/ngircd/ngircd-14.1.ebuild | 59 | ||||
-rw-r--r-- | net-irc/ngircd/ngircd-17.1.ebuild | 49 |
3 files changed, 35 insertions, 78 deletions
diff --git a/net-irc/ngircd/Manifest b/net-irc/ngircd/Manifest index 0e8f8ec..9522117 100644 --- a/net-irc/ngircd/Manifest +++ b/net-irc/ngircd/Manifest @@ -1,2 +1,3 @@ -DIST ngircd-14.1.tar.gz 400656 RMD160 895416744487d167472efb6ca805eb7bc54f811d SHA1 d81f384faea61ed5267e37d0ffde325120141d03 SHA256 b37797f599013731efa2a30dd35f83651d0c145373da8f67e9d8029dd9556e9f -EBUILD ngircd-14.1.ebuild 1476 RMD160 f226e19f9450bd8851c8e526844a23b6ba669f28 SHA1 d99ae89ad9ca4795b8e9363e648a23f2f4ae619b SHA256 d5fc0d76189fb9c147573dee0cae09a264f253090b91606b7c35ab2ffa61fb2c +AUX ngircd.init.d 535 RMD160 4b0213c343d27690b589807c74bdafc38cb03dff SHA1 fc6fe2b27f31adea2d20981a8e724cc84b16be76 SHA256 810846221651a673b913f4ed2389a71ba07d7121e395907ce59f65076926ce4e +DIST ngircd-17.1.tar.gz 433078 RMD160 808ba3f62d48972873acff1580ccf058ad100133 SHA1 dc17943de6a4693e2e4e5da1e039f0e09651652c SHA256 e93518efb5ad838cce30ede0456b76b4423dca63a875830988760820c1ef6335 +EBUILD ngircd-17.1.ebuild 1663 RMD160 63c9d90e7e33f563ef85739b030c9776a99317c1 SHA1 dee7b31e1ef19e4576fd13a30bd091449f069f41 SHA256 d10c855f529ae6eebe6bc78564640a87f5f68a551869b01b766d23129ed5a7b1 diff --git a/net-irc/ngircd/ngircd-14.1.ebuild b/net-irc/ngircd/ngircd-14.1.ebuild deleted file mode 100644 index 657bd69..0000000 --- a/net-irc/ngircd/ngircd-14.1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-irc/ngircd/ngircd-13.ebuild,v 1.1 2009/01/25 14:15:16 armin76 Exp $ - -inherit eutils - -DESCRIPTION="A IRC server written from scratch." -HOMEPAGE="http://ngircd.barton.de/" -SRC_URI="ftp://ftp.berlios.de/pub/${PN}/${P}.tar.gz - ftp://ngircd.barton.de/pub/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="zlib tcpd ipv6 debug ident gnutls -ssl" -RESTRICT="test" - -DEPEND="virtual/libc - zlib? ( sys-libs/zlib ) - ident? ( net-libs/libident ) - tcpd? ( sys-apps/tcp-wrappers ) - ssl? ( dev-libs/openssl ) - gnutls? ( net-libs/gnutls ) - >=sys-apps/sed-4" - -src_compile() { - econf \ - --sysconfdir=/etc/ngircd \ - $(use_enable ipv6 ) \ - $(use_with zlib) \ - $(use_with tcpd tcp-wrappers) \ - $(use_with ident ) \ - $(use_with gnutls ) \ - $(use_with ssl ) \ - $(use_enable debug) \ - $(use_enable debug sniffer) \ - || die "econf failed" - emake || die "emake failed" -} - -src_install() { - sed -i \ - -e "s:/usr/local/etc/ngircd.motd:/etc/ngircd/ngircd.motd:" \ - -e "s:;ServerUID = 65534:ServerUID = ngircd:" \ - -e "s:;ServerGID = 65534:ServerGID = nogroup:" \ - doc/sample-ngircd.conf - - make \ - DESTDIR="${D}" \ - docdir=/usr/share/doc/${PF} \ - install || die "make install failed" - - newinitd "${FILESDIR}"/ngircd.init.d ngircd -} - -pkg_postinst() { - enewuser ngircd - chown ngircd "${ROOT}"/etc/ngircd/ngircd.conf -} diff --git a/net-irc/ngircd/ngircd-17.1.ebuild b/net-irc/ngircd/ngircd-17.1.ebuild index 83b4bf4..6368682 100644 --- a/net-irc/ngircd/ngircd-17.1.ebuild +++ b/net-irc/ngircd/ngircd-17.1.ebuild @@ -14,30 +14,45 @@ SRC_URI="ftp://ftp.berlios.de/pub/${PN}/${P}.tar.gz LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="zlib tcpd ipv6 debug ident gnutls -ssl" +IUSE="debug gnutls ident ipv6 ssl tcpd zlib" RESTRICT="test" -DEPEND="virtual/libc - zlib? ( sys-libs/zlib ) +DEPEND=" + >=sys-apps/sed-4 + virtual/libc + ident? ( net-libs/libident ) + ssl? ( + gnutls? ( net-libs/gnutls ) + !gnutls? ( dev-libs/openssl ) + ) tcpd? ( sys-apps/tcp-wrappers ) - ssl? ( dev-libs/openssl ) - gnutls? ( net-libs/gnutls ) - >=sys-apps/sed-4" + zlib? ( sys-libs/zlib ) +" +RDEPEND="${DEPEND}" + +src_configure() { + local myopts="" -src_compile() { + if use ssl; then + if use gnutls; then + myopts+=" --disable-ssl --enable-gnutls" + else + myopts+=" --enable-ssl --disable-gnutls" + fi + else + myopts+=" --disable-gnutls --disable-ssl" + fi econf \ --sysconfdir=/etc/ngircd \ - $(use_enable ipv6 ) \ + $(use_enable ipv6) \ $(use_with zlib) \ $(use_with tcpd tcp-wrappers) \ - $(use_with ident ) \ - $(use_with gnutls ) \ - $(use_with ssl ) \ + $(use_with ident) \ + $(use_with gnutls) \ + $(use_with ssl) \ $(use_enable debug) \ - $(use_enable debug sniffer) \ - || die "econf failed" - emake || die "emake failed" + $(use_enable debug sniffer) } src_install() { @@ -45,12 +60,12 @@ src_install() { -e "s:/usr/local/etc/ngircd.motd:/etc/ngircd/ngircd.motd:" \ -e "s:;ServerUID = 65534:ServerUID = ngircd:" \ -e "s:;ServerGID = 65534:ServerGID = nogroup:" \ - doc/sample-ngircd.conf + doc/sample-ngircd.conf || die - make \ + emake -j1 \ DESTDIR="${D}" \ docdir=/usr/share/doc/${PF} \ - install || die "make install failed" + install newinitd "${FILESDIR}"/ngircd.init.d ngircd } |