Version bump, remove old

Package-Manager: portage-2.1.3.19

7 files changed, 46 insertions, 118 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/Manifest b/net-im/silc-client/Manifest
index 1be79d6633cf..6a214011b85c 100644
--- a/net-im/silc-client/Manifest
+++ b/net-im/silc-client/Manifest
@@ -7,29 +7,24 @@ MD5 021209a7480231088760933c641a70d2 files/silc-client-1.1-docdir.patch 1913
 RMD160 b3efd82ab5d5cf4ad8d128f99a03ef31837ac72d files/silc-client-1.1-docdir.patch 1913
 SHA256 8d90646881289606e2ef65c28d320226bd170968e081d099d1251ba3bf11e1b2 files/silc-client-1.1-docdir.patch 1913
 DIST silc-client-1.0.1.tar.bz2 1404404 RMD160 85e32ba0d5a16e93238fb92d607cd089b4476993 SHA1 e53a8f9577282734723fe9ad8eaf5d3bce035048 SHA256 2b3a50516b168c45be283ef95c19f2dac182c967e93ccff9123bc7ad1d91ee11
-DIST silc-client-1.0.3.tar.bz2 1424405 RMD160 4b3ecd4ebac13a21d6c71b8bd54327d33327764c SHA1 b6379c4bf3f4f02c7a4a0c3ce41bd4160ee73143 SHA256 ee4b39b1122ac47f678edb874288412d208f57ccad9e81b1086126276d6a5440
-DIST silc-client-1.0.4.1.tar.bz2 1445091 RMD160 46abb8312d37842e20e01f79566460ee486c1bbf SHA1 29d8cd4208db23e997bedf6271fc0dfd0cb84e6c SHA256 b1e8d267097fcb87d79989f01c569fa4ae4a3f964cffe5f173090e1339e10a43
 DIST silc-client-1.1.2.tar.bz2 1622496 RMD160 ac08152f7d49a0e14c2b900c3983d5e97992f29a SHA1 b529a48f8e21752e690c43e869ca7ff8ed3906ce SHA256 6c03bf28c87eef31c2058acfa132542cc088ae819f2233d520b042eb916d89f4
+DIST silc-client-1.1.3.tar.bz2 1626208 RMD160 b404e33e80dfbe0267c6beafbc303a3ac6ba16f0 SHA1 51b85181db643a2e457dddf3d4640e2a9fce09d3 SHA256 efc9ae70250f8e06c88e5b0416a9c38dca9476dc8955ee917c7a9366e2390ea8
 EBUILD silc-client-1.0.1-r1.ebuild 1639 RMD160 9f071374b9a2831053753637316ac7347cacadd9 SHA1 fbb4d9df80139f17f72b71f69b7551f27a8454a1 SHA256 dce47934631b704cef3e5543109f17df9a6652d76a5ec4d5d801085b388b353f
 MD5 14566d3716e1068ec2968f5e818508e0 silc-client-1.0.1-r1.ebuild 1639
 RMD160 9f071374b9a2831053753637316ac7347cacadd9 silc-client-1.0.1-r1.ebuild 1639
 SHA256 dce47934631b704cef3e5543109f17df9a6652d76a5ec4d5d801085b388b353f silc-client-1.0.1-r1.ebuild 1639
-EBUILD silc-client-1.0.3.ebuild 1885 RMD160 bbcd53afaca9088daafde214ce0f4ed073f37eb3 SHA1 124bddd198ab2c6ed66f9c3a79db0bfecda52acd SHA256 a3dc8857d5bb5aca492196dd83dbc2a6251cc709de1171bd43ef2207ff1ff6da
-MD5 fdf32a24636aec6122c2f5654175e3a2 silc-client-1.0.3.ebuild 1885
-RMD160 bbcd53afaca9088daafde214ce0f4ed073f37eb3 silc-client-1.0.3.ebuild 1885
-SHA256 a3dc8857d5bb5aca492196dd83dbc2a6251cc709de1171bd43ef2207ff1ff6da silc-client-1.0.3.ebuild 1885
-EBUILD silc-client-1.0.4.1.ebuild 1899 RMD160 271ea68b0b6afedf7f171e96a931a1bd01428396 SHA1 b4fefb4d2f9db0718dc73686d2b497b9673f680f SHA256 0d540f33963755b8af6aacdb14cd57299a7626f84a06ea3fa108affe55190c21
-MD5 a425e17c45e0abb88cbbf395c8990b74 silc-client-1.0.4.1.ebuild 1899
-RMD160 271ea68b0b6afedf7f171e96a931a1bd01428396 silc-client-1.0.4.1.ebuild 1899
-SHA256 0d540f33963755b8af6aacdb14cd57299a7626f84a06ea3fa108affe55190c21 silc-client-1.0.4.1.ebuild 1899
 EBUILD silc-client-1.1.2.ebuild 2092 RMD160 e39b253ef6177440c90bb6f3f252031ae4b6cde6 SHA1 9dd65b2dee06b4ff7afb253dd45a32b1a222c0f8 SHA256 71f2d22507c603cf0286e4baea2ffc7c162c5c6c5ec1c29947e3ae56442f331a
 MD5 279e63f2169735a5a8cf71808daf70d7 silc-client-1.1.2.ebuild 2092
 RMD160 e39b253ef6177440c90bb6f3f252031ae4b6cde6 silc-client-1.1.2.ebuild 2092
 SHA256 71f2d22507c603cf0286e4baea2ffc7c162c5c6c5ec1c29947e3ae56442f331a silc-client-1.1.2.ebuild 2092
-MISC ChangeLog 6407 RMD160 237050261fa3ed13c15221951be5f72195272aca SHA1 81f220758e03ed2050eace94f1d94a83454ba13c SHA256 6a721ce32b4fa7a65ed469914a25b25d55c8411bbff11a24449676392c6c101a
-MD5 e165aede66afee3293e96a0bd21748d3 ChangeLog 6407
-RMD160 237050261fa3ed13c15221951be5f72195272aca ChangeLog 6407
-SHA256 6a721ce32b4fa7a65ed469914a25b25d55c8411bbff11a24449676392c6c101a ChangeLog 6407
+EBUILD silc-client-1.1.3.ebuild 2100 RMD160 47e4e00da7b7c75b7865ac26322ae55768ef0833 SHA1 9afdb5fb144b68f471c9a006826b0c8a0e181dd3 SHA256 559e02ba185838ed4ddd4b6d48deb7c0e8032cb25a858c550e1a7138635f284a
+MD5 ffb53dd9b1659a8a88da8b4f0aedf59d silc-client-1.1.3.ebuild 2100
+RMD160 47e4e00da7b7c75b7865ac26322ae55768ef0833 silc-client-1.1.3.ebuild 2100
+SHA256 559e02ba185838ed4ddd4b6d48deb7c0e8032cb25a858c550e1a7138635f284a silc-client-1.1.3.ebuild 2100
+MISC ChangeLog 6600 RMD160 a078cda2101b1ad27bbcea351c377ab70ed792ce SHA1 a32c710bd155dbf2ad94d80ea1593c57741f575e SHA256 7ed74d7697f5192ae904e396ba74ceec77b6353cf6c39e7cab660c07d201d345
+MD5 c0a422cc85ae74fe2cdfe52982ea2d8f ChangeLog 6600
+RMD160 a078cda2101b1ad27bbcea351c377ab70ed792ce ChangeLog 6600
+SHA256 7ed74d7697f5192ae904e396ba74ceec77b6353cf6c39e7cab660c07d201d345 ChangeLog 6600
 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 RMD160 279429d1df694561fc2b163cb81c09387b9d940c metadata.xml 160
@@ -37,12 +32,9 @@ SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2 metadata
 MD5 69be1eb5a89f1003ec8e3647ba3fdeba files/digest-silc-client-1.0.1-r1 259
 RMD160 aaa8abf93f382c6157dcd3f0aabc81fed65f80dc files/digest-silc-client-1.0.1-r1 259
 SHA256 a3b22d3f803481dfc13804a9a203b534bdb09fef75f652ac1828bcb2307bba30 files/digest-silc-client-1.0.1-r1 259
-MD5 4d9598591389b2d0b3aed508561c85c1 files/digest-silc-client-1.0.3 259
-RMD160 4cf446663f522210b6d86ae6c221ea950ce11066 files/digest-silc-client-1.0.3 259
-SHA256 1dfa8fa7462ecbc18cbf9502f7bad26445070d9c5721999ea258514d883cc7b1 files/digest-silc-client-1.0.3 259
-MD5 39a39a8405c38de9a8d6ade4740f25a2 files/digest-silc-client-1.0.4.1 265
-RMD160 ab98d2b93114c265a5f8bfce25c2f58f4cb9e377 files/digest-silc-client-1.0.4.1 265
-SHA256 65af57336bad7a61d6e4ca488507fb41fd2b9e1de758ca707a43db3d2917d8a3 files/digest-silc-client-1.0.4.1 265
 MD5 6ff5409c4e16d3ed9e15a2718461263c files/digest-silc-client-1.1.2 259
 RMD160 e62f957dd74816c9c3d9f0209cf16c6c7f96cbd5 files/digest-silc-client-1.1.2 259
 SHA256 0de24f6e72bbe9a23b1ebc79fe09274c9c6262cbf57d3e34cf9779b84ee8f966 files/digest-silc-client-1.1.2 259
+MD5 9eb8820b9b862a70ba49f22e59548bcf files/digest-silc-client-1.1.3 259
+RMD160 de9a90df3cfc20a4e513a830226ed33284ecc5c1 files/digest-silc-client-1.1.3 259
+SHA256 56a4e7d0fe93629d95e58a0022301eb0fcd04f2a11d30b4cfee171d8687a8dc3 files/digest-silc-client-1.1.3 259
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"