Restore original ebuild since -r1 was for silc-toolkit, not for silc-client

(Portage version: 2.1.3_rc9)

4 files changed, 85 insertions, 60 deletions

diff --git a/net-im/silc-client/ChangeLog b/net-im/silc-client/ChangeLog
index 478cef7e3be5..ed902d5441a4 100644
--- a/net-im/silc-client/ChangeLog
+++ b/net-im/silc-client/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/silc-client
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/ChangeLog,v 1.39 2007/07/23 11:46:49 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/ChangeLog,v 1.40 2007/07/27 13:37:44 armin76 Exp $
+
+  27 Jul 2007; Raúl Porcel <armin76@gentoo.org> +silc-client-1.1.2.ebuild,
+  -silc-client-1.1.2-r1.ebuild:
+  Restore original ebuild since -r1 was for silc-toolkit, not for silc-client
 
 *silc-client-1.1.2-r1 (23 Jul 2007)
 
diff --git a/net-im/silc-client/files/digest-silc-client-1.1.2-r1 b/net-im/silc-client/files/digest-silc-client-1.1.2
index 2dc6fff038d5..2dc6fff038d5 100644
--- a/net-im/silc-client/files/digest-silc-client-1.1.2-r1
+++ b/net-im/silc-client/files/digest-silc-client-1.1.2
diff --git a/net-im/silc-client/silc-client-1.1.2-r1.ebuild b/net-im/silc-client/silc-client-1.1.2-r1.ebuild
deleted file mode 100644
index ff9357ff75ad..000000000000
--- a/net-im/silc-client/silc-client-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/silc-client-1.1.2-r1.ebuild,v 1.1 2007/07/23 11:46:49 armin76 Exp $
-
-inherit eutils
-
-DESCRIPTION="SDK for the SILC protocol"
-HOMEPAGE="http://silcnet.org/"
-SRC_URI="http://silcnet.org/download/toolkit/sources/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="debug ipv6"
-
-RDEPEND=""
-DEPEND="dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-
-	# They have incorrect DESTDIR usage
-	sed -i '/\$(srcdir)\/tutorial/s/\$(prefix)/\$(docdir)/' "${S}"/Makefile.{am,in}
-	sed -i \
-		"s/^\(pkgconfigdir =\) \$(libdir)\/pkgconfig/\1	\/usr\/$(get_libdir)\/pkgconfig/"\
-		"${S}"/lib/Makefile.{am,in}
-}
-
-src_compile() {
-	local myconf=""
-	use ipv6 && myconf="${myconf} --enable-ipv6"
-
-	econf \
-		--datadir=/usr/share/${PN} \
-		--datarootdir=/usr/share/${PN} \
-		--mandir=/usr/share/man \
-		--includedir=/usr/include/${PN} \
-		--sysconfdir=/etc/silc \
-		--with-helpdir=/usr/share/${PN}/help \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--docdir=/usr/share/doc/${PF} \
-		--disable-optimizations \
-		$(use_enable debug) \
-		${myconf}
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "make install failed"
-
-	rm -rf \
-		"${D}"/etc/${PN}/silcd.conf \
-		"${D}"/usr/share/man \
-		"${D}"/usr/share/doc/${PF}/examples \
-		"${D}"/usr/share/silc-toolkit \
-		"${D}"/var/log/silc-toolkit \
-		"${D}"/etc/silc
-}
diff --git a/net-im/silc-client/silc-client-1.1.2.ebuild b/net-im/silc-client/silc-client-1.1.2.ebuild
new file mode 100644
index 000000000000..5a224ff750a1
--- /dev/null
+++ b/net-im/silc-client/silc-client-1.1.2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/silc-client-1.1.2.ebuild,v 1.3 2007/07/27 13:37:44 armin76 Exp $
+
+inherit eutils multilib
+
+DESCRIPTION="IRSSI-based text client for Secure Internet Live Conferencing"
+SRC_URI="http://www.silcnet.org/download/client/sources/${P}.tar.bz2"
+HOMEPAGE="http://silcnet.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="ipv6 perl debug"
+
+DEPEND="perl? (	dev-lang/perl )
+	sys-libs/ncurses
+	!<=net-im/silc-toolkit-0.9.12-r1"
+
+RDEPEND="${DEPEND}
+	perl? (
+		!net-irc/irssi
+		!net-irc/irssi-svn
+	)"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	sed -i -e "s:-g -O2:${CFLAGS}:g" configure
+	epatch "${FILESDIR}/${PN}-1.1-docdir.patch"
+}
+
+src_compile() {
+	local myconf=""
+	use ipv6 && myconf="${myconf} --enable-ipv6"
+
+	econf \
+		--datadir=/usr/share/${PN} \
+		--datarootdir=/usr/share/${PN} \
+		--mandir=/usr/share/man \
+		--includedir=/usr/include/${PN} \
+		--sysconfdir=/etc/silc \
+		--with-helpdir=/usr/share/${PN}/help \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--docdir=/usr/share/doc/${PF} \
+		--disable-optimizations \
+		$(use_enable debug) \
+		${myconf}
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	local myflags=""
+
+	if use perl
+	then
+		R1="s/installsitearch='//"
+		R2="s/';//"
+		perl_sitearch="`perl -V:installsitearch | sed -e ${R1} -e ${R2}`"
+		myflags="${myflags} INSTALLPRIVLIB=/usr/$(get_libdir)"
+		myflags="${myflags} INSTALLARCHLIB=${perl_sitearch}"
+		myflags="${myflags} INSTALLSITELIB=${perl_sitearch}"
+		myflags="${myflags} INSTALLSITEARCH=${perl_sitearch}"
+	fi
+
+	make DESTDIR="${D}" ${myflags} install || die "make install failed"
+
+	rm -rf ${D}/etc ${D}/usr/libsilc* ${D}/usr/include
+
+	dodoc CHANGES CREDITS README TODO
+	cd "${S}/apps/irssi"
+	dodoc silc.conf docs/formats.txt docs/manual.txt docs/signals.txt docs/special_vars.txt
+	dohtml docs/startup-HOWTO.html
+
+	insinto /usr/share/silc-client/help
+	rm docs/help/Make*
+	doins docs/help/*
+}