Version bump, remove old

(Portage version: 2.1.3.19)

6 files changed, 34 insertions, 98 deletions

diff --git a/net-im/silc-client/ChangeLog b/net-im/silc-client/ChangeLog
index c8900d74d471..47ddb080ce06 100644
--- a/net-im/silc-client/ChangeLog
+++ b/net-im/silc-client/ChangeLog
@@ -1,6 +1,12 @@
 # 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.43 2007/08/15 21:24:07 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/ChangeLog,v 1.44 2007/12/04 20:31:28 armin76 Exp $
+
+*silc-client-1.1.3 (04 Dec 2007)
+
+  04 Dec 2007; Raúl Porcel <armin76@gentoo.org> -silc-client-1.0.3.ebuild,
+  -silc-client-1.0.4.1.ebuild, +silc-client-1.1.3.ebuild:
+  Version bump, remove old
 
   15 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   silc-client-1.1.2.ebuild:
diff --git a/net-im/silc-client/files/digest-silc-client-1.0.3 b/net-im/silc-client/files/digest-silc-client-1.0.3
deleted file mode 100644
index 7ca0855b6037..000000000000
--- a/net-im/silc-client/files/digest-silc-client-1.0.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6727a65fe71b90b018086afe8fc84cf9 silc-client-1.0.3.tar.bz2 1424405
-RMD160 4b3ecd4ebac13a21d6c71b8bd54327d33327764c silc-client-1.0.3.tar.bz2 1424405
-SHA256 ee4b39b1122ac47f678edb874288412d208f57ccad9e81b1086126276d6a5440 silc-client-1.0.3.tar.bz2 1424405
diff --git a/net-im/silc-client/files/digest-silc-client-1.0.4.1 b/net-im/silc-client/files/digest-silc-client-1.0.4.1
deleted file mode 100644
index ce6d99e358e7..000000000000
--- a/net-im/silc-client/files/digest-silc-client-1.0.4.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 73614c7ca6eb79d4bd3c051b9fcedae5 silc-client-1.0.4.1.tar.bz2 1445091
-RMD160 46abb8312d37842e20e01f79566460ee486c1bbf silc-client-1.0.4.1.tar.bz2 1445091
-SHA256 b1e8d267097fcb87d79989f01c569fa4ae4a3f964cffe5f173090e1339e10a43 silc-client-1.0.4.1.tar.bz2 1445091
diff --git a/net-im/silc-client/files/digest-silc-client-1.1.3 b/net-im/silc-client/files/digest-silc-client-1.1.3
new file mode 100644
index 000000000000..502807bdc513
--- /dev/null
+++ b/net-im/silc-client/files/digest-silc-client-1.1.3
@@ -0,0 +1,3 @@
+MD5 e34d0af3c795ba0167d465904b9ba120 silc-client-1.1.3.tar.bz2 1626208
+RMD160 b404e33e80dfbe0267c6beafbc303a3ac6ba16f0 silc-client-1.1.3.tar.bz2 1626208
+SHA256 efc9ae70250f8e06c88e5b0416a9c38dca9476dc8955ee917c7a9366e2390ea8 silc-client-1.1.3.tar.bz2 1626208
diff --git a/net-im/silc-client/silc-client-1.0.3.ebuild b/net-im/silc-client/silc-client-1.0.3.ebuild
deleted file mode 100644
index 1d0bcf7a183c..000000000000
--- a/net-im/silc-client/silc-client-1.0.3.ebuild
+++ /dev/null
@@ -1,74 +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.0.3.ebuild,v 1.5 2007/02/03 17:32:36 blubb 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="=dev-libs/glib-1.2*
-	perl? (	dev-lang/perl )
-	sys-libs/ncurses
-	!<=net-im/silc-toolkit-0.9.12-r1
-	sys-devel/autoconf-archive"
-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}/${P}-docdir.patch"
-}
-
-src_compile() {
-	econf \
-		--datadir=/usr/share \
-		--with-datadir=/usr/share/${PN} \
-		--with-simdir=/usr/$(get_libdir)/${PN} \
-		--with-ncurses \
-		--without-silcd \
-		$(use_enable ipv6) \
-		$(use_enable debug) \
-		|| die "econf failed"
-	emake -j1 || 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/*
-}
diff --git a/net-im/silc-client/silc-client-1.0.4.1.ebuild b/net-im/silc-client/silc-client-1.1.3.ebuild
index 20b089d86b77..af5175600d23 100644
--- a/net-im/silc-client/silc-client-1.0.4.1.ebuild
+++ b/net-im/silc-client/silc-client-1.1.3.ebuild
@@ -1,6 +1,6 @@
 # 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.0.4.1.ebuild,v 1.1 2007/03/20 18:01:16 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/silc-client-1.1.3.ebuild,v 1.1 2007/12/04 20:31:28 armin76 Exp $
 
 inherit eutils multilib
 
@@ -13,11 +13,10 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="ipv6 perl debug"
 
-DEPEND="=dev-libs/glib-1.2*
-	perl? (	dev-lang/perl )
+DEPEND="perl? (	dev-lang/perl )
 	sys-libs/ncurses
-	!<=net-im/silc-toolkit-0.9.12-r1
-	sys-devel/autoconf-archive"
+	!<=net-im/silc-toolkit-0.9.12-r1"
+
 RDEPEND="${DEPEND}
 	perl? (
 		!net-irc/irssi
@@ -26,23 +25,31 @@ RDEPEND="${DEPEND}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	sed -i -e "s:-g -O2:${CFLAGS}:g" configure
-	epatch "${FILESDIR}/${PN}-1.0.3-docdir.patch"
+	use amd64 && sed -i -e 's:felf\([^6]\):felf64\1:g' configure
+	epatch "${FILESDIR}/${PN}-1.1-docdir.patch"
 }
 
 src_compile() {
+	local myconf=""
+	use ipv6 && myconf="${myconf} --enable-ipv6"
+
 	econf \
-		--datadir=/usr/share \
-		--with-datadir=/usr/share/${PN} \
-		--with-simdir=/usr/$(get_libdir)/${PN} \
-		--with-ncurses \
-		--without-silcd \
-		$(use_enable ipv6) \
+		--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) \
-		|| die "econf failed"
-	emake -j1 || die "emake failed"
+		${myconf}
+
+	emake || die "emake failed"
 }
 
 src_install() {
@@ -59,9 +66,9 @@ src_install() {
 		myflags="${myflags} INSTALLSITEARCH=${perl_sitearch}"
 	fi
 
-	make DESTDIR=${D} ${myflags} install || die "make install failed"
+	make DESTDIR="${D}" ${myflags} install || die "make install failed"
 
-	rm -rf ${D}/etc ${D}/usr/libsilc* ${D}/usr/include
+	rm -rf "${D}"/etc "${D}"/usr/libsilc* "${D}"/usr/include
 
 	dodoc CHANGES CREDITS README TODO
 	cd "${S}/apps/irssi"