Re-add ~amd64 dropped keyword, bad cla, remove old

(Portage version: 2.1.4.4)

3 files changed, 9 insertions, 163 deletions

diff --git a/net-irc/ircd-hybrid/ChangeLog b/net-irc/ircd-hybrid/ChangeLog
index 42a4d1341b9a..650fe2212d42 100644
--- a/net-irc/ircd-hybrid/ChangeLog
+++ b/net-irc/ircd-hybrid/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/ircd-hybrid
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/ChangeLog,v 1.27 2007/12/25 12:30:31 cla Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/ChangeLog,v 1.28 2008/02/25 15:30:06 armin76 Exp $
+
+  25 Feb 2008; Raúl Porcel <armin76@gentoo.org> -ircd-hybrid-7.2.2.ebuild,
+  ircd-hybrid-7.2.3.ebuild:
+  Re-add ~amd64 dropped keyword, bad cla, remove old
 
 *ircd-hybrid-7.2.3 (25 Dec 2007)
 
diff --git a/net-irc/ircd-hybrid/ircd-hybrid-7.2.2.ebuild b/net-irc/ircd-hybrid/ircd-hybrid-7.2.2.ebuild
deleted file mode 100644
index ced56a4a1a8c..000000000000
--- a/net-irc/ircd-hybrid/ircd-hybrid-7.2.2.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/ircd-hybrid-7.2.2.ebuild,v 1.4 2007/05/21 10:29:30 welp Exp $
-
-inherit eutils multilib toolchain-funcs
-
-# Additional configuration options
-MAX_NICK_LENGTH=30
-MAX_CLIENTS=512
-MAX_TOPIC_LENGTH=390
-ENABLE_SMALL_NETWORK=0
-ENABLE_EFNET=0
-
-IUSE="debug ssl static zlib contrib"
-
-DESCRIPTION="IRCD-Hybrid - High Performance Internet Relay Chat"
-HOMEPAGE="http://ircd-hybrid.com/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-
-RDEPEND="
-	zlib? ( >=sys-libs/zlib-1.1.4-r2 )
-	ssl? ( >=dev-libs/openssl-0.9.7d )"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/flex-2.5.4a-r5
-	>=sys-devel/bison-1.875
-	>=sys-devel/gettext-0.12.1"
-
-pkg_setup() {
-	enewgroup hybrid
-	enewuser hybrid -1 -1 -1 hybrid
-}
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/7.2.2-default-config.patch
-}
-
-src_compile() {
-	local myconf=""
-
-	ewarn
-	ewarn "Server administrators are encouraged to customize some variables in"
-	ewarn "the ebuild if actually deploying hybrid in an IRC network."
-	ewarn "The values below reflect a usable configuration but may not be"
-	ewarn "suitable for large networks in production environments."
-	ewarn
-	ewarn "To change the default settings below you must edit the ebuild."
-	ewarn
-	ewarn "Maximum nick length       = ${MAX_NICK_LENGTH}"
-	ewarn "        topic length      = ${MAX_TOPIC_LENGTH}"
-	ewarn "        number of clients = ${MAX_CLIENTS}"
-	ewarn
-
-	if [ ${ENABLE_SMALL_NETWORK} -eq 1 ]
-	then
-		einfo "Configuring for small networks."
-		myconf="${myconf} --enable-small-net"
-	else
-		myconf="${myconf} --disable-small-net"
-	fi
-	if [ ${ENABLE_EFNET} -eq 1 ]
-	then
-		einfo "Configuring for Efnet."
-		myconf="${myconf} --enable-efnet"
-	else
-		myconf="${myconf} --disable-efnet"
-	fi
-
-	epause 5
-
-	econf \
-		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sysconfdir=/etc/ircd \
-		--includedir=/usr/include \
-		--with-nicklen=${MAX_NICK_LENGTH} \
-		--with-topiclen=${MAX_TOPIC_LENGTH} \
-		--with-maxconn=${MAX_CLIENTS} \
-		$(use_enable zlib) \
-		$(use_enable ssl openssl) \
-		$(use_enable !static shared-modules) \
-		$(use_enable debug assert) \
-		${myconf} \
-		|| die "econf failed"
-	emake || die "emake failed"
-
-	# Build respond binary for using rsa keys instead of plain text oper passwords.
-	use ssl && $(tc-getCC) ${CFLAGS} -o respond tools/rsa_respond/respond.c -lcrypto
-
-	# Build contrib Modules if requested by useflag contrib
-	if use contrib; then
-		cd ${S}/contrib
-		make || dir "make in contrib failed"
-	fi
-}
-
-src_install() {
-	dodir /usr/$(get_libdir)/ircd-hybrid-7
-	keepdir /var/run/ircd /var/log/ircd
-
-	make DESTDIR="${D}" install || die "make install failed"
-
-	insinto /usr/share/ircd-hybrid-7/messages
-	doins messages/*.lang || die "doins failed"
-
-	mv "${D}"/usr/{modules,$(get_libdir)/ircd-hybrid-7}
-	mv "${D}"/usr/bin/{,ircd-}mkpasswd
-	mv "${D}"/etc/ircd/{example,ircd}.conf
-
-	sed -i \
-		-e s:/usr/local/ircd/modules:/usr/$(get_libdir)/ircd-hybrid-7/modules: \
-		"${D}"/etc/ircd/ircd.conf
-
-	use ssl && dosbin "${S}"/respond
-
-	dodoc BUGS ChangeLog Hybrid-team RELNOTES TODO
-	docinto doc
-	dodoc doc/*.txt doc/server-version-info
-	docinto doc/technical
-	dodoc doc/technical/*
-
-	newinitd "${FILESDIR}"/init.d_ircd-7.2.1 ircd
-
-	# Install contrib Modules if requested by useflag contrib
-	if use contrib; then
-		cd ${S}/contrib
-		make DESTDIR="${D}" install || die "make install contrib failed"
-	fi
-}
-
-pkg_postinst() {
-	chown -R hybrid:hybrid "${ROOT}"/etc/ircd "${ROOT}"/var/{log,run}/ircd
-	chmod 700 "${ROOT}"/etc/ircd "${ROOT}"/var/log/ircd
-
-	if use ssl
-	then
-		elog "To create an RSA keypair for crypted links execute:"
-		elog "emerge --config =${CATEGORY}/${PF}"
-	fi
-}
-
-pkg_config() {
-	einfo "Generating 2048 bit RSA keypair /etc/ircd/ircd.rsa."
-	einfo "The public key is stored in /etc/ircd/ircd.pub."
-
-	openssl genrsa -rand "${ROOT}"/var/run/random-seed -out "${ROOT}"/etc/ircd/ircd.rsa 2048
-	openssl rsa -in "${ROOT}"/etc/ircd/ircd.rsa -pubout -out "${ROOT}"/etc/ircd/ircd.pub
-
-	chown hybrid:hybrid "${ROOT}"/etc/ircd/ircd.rsa "${ROOT}"/etc/ircd/ircd.pub
-	chmod 600 "${ROOT}"/etc/ircd/ircd.rsa
-	chmod 644 "${ROOT}"/etc/ircd/ircd.pub
-
-	einfo "Update the RSA keypair in /etc/ircd/ircd.conf and /REHASH."
-}
diff --git a/net-irc/ircd-hybrid/ircd-hybrid-7.2.3.ebuild b/net-irc/ircd-hybrid/ircd-hybrid-7.2.3.ebuild
index 6c6f5d7fbb0d..05064024dcd5 100644
--- a/net-irc/ircd-hybrid/ircd-hybrid-7.2.3.ebuild
+++ b/net-irc/ircd-hybrid/ircd-hybrid-7.2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/ircd-hybrid-7.2.3.ebuild,v 1.1 2007/12/25 12:30:31 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ircd-hybrid/ircd-hybrid-7.2.3.ebuild,v 1.2 2008/02/25 15:30:06 armin76 Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -18,7 +18,7 @@ HOMEPAGE="http://ircd-hybrid.com/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
 
 RDEPEND="
 	zlib? ( >=sys-libs/zlib-1.1.4-r2 )