Remove old versions, bump to 1.0.2, thanks to <chevredansante AT nayh DOT ca> for reporting, bug # 117485

Package-Manager: portage-2.1_pre5

8 files changed, 82 insertions, 170 deletions

diff --git a/net-im/silc-toolkit/ChangeLog b/net-im/silc-toolkit/ChangeLog
index a311a83c9315..4123072115c5 100644
--- a/net-im/silc-toolkit/ChangeLog
+++ b/net-im/silc-toolkit/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/silc-toolkit
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-toolkit/ChangeLog,v 1.50 2006/02/07 21:35:53 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-toolkit/ChangeLog,v 1.51 2006/03/07 04:05:26 antarus Exp $
+
+*silc-toolkit-1.0.2 (07 Mar 2006)
+
+  07 Mar 2006; Alec Warner <antarus@gentoo.org>
+  -silc-toolkit-0.9.12-r2.ebuild, -silc-toolkit-0.9.12-r3.ebuild,
+  +silc-toolkit-1.0.2.ebuild:
+  Remove old versions, bump to 1.0.2, thanks to <chevredansante AT nayh 
+  DOT ca> for reporting, bug # 117485
 
   07 Feb 2006; Simon Stelling <blubb@gentoo.org> silc-toolkit-1.0.ebuild:
   stable on amd64
diff --git a/net-im/silc-toolkit/Manifest b/net-im/silc-toolkit/Manifest
index 19482f2d1737..1fe7d340aa9e 100644
--- a/net-im/silc-toolkit/Manifest
+++ b/net-im/silc-toolkit/Manifest
@@ -1,33 +1,27 @@
-MD5 843179f579faf40aa228ff8bc493b34a ChangeLog 6953
-RMD160 4447291ac86895c733940a1db3800bfb6eac27d3 ChangeLog 6953
-SHA256 a9f61a297c806d97c36f6526b1d4d3bf98258ede5a69ebab7ddbd16c602b7a62 ChangeLog 6953
-MD5 f5feddf04be28d35adc7b14360eac931 files/digest-silc-toolkit-0.9.12-r2 73
-RMD160 9a182e32dc21888074d6449def2696d206464830 files/digest-silc-toolkit-0.9.12-r2 73
-SHA256 a6c0f41121eab1b70be0e900fdcf0724d0d18d39803eef6fb5d45571372af494 files/digest-silc-toolkit-0.9.12-r2 73
-MD5 f5feddf04be28d35adc7b14360eac931 files/digest-silc-toolkit-0.9.12-r3 73
-RMD160 9a182e32dc21888074d6449def2696d206464830 files/digest-silc-toolkit-0.9.12-r3 73
-SHA256 a6c0f41121eab1b70be0e900fdcf0724d0d18d39803eef6fb5d45571372af494 files/digest-silc-toolkit-0.9.12-r3 73
+MD5 3be304c3d3b82ee3ed2a253058f6301c ChangeLog 7246
+RMD160 37ce3e85caf4465a7498a8662bd26f9e1883445e ChangeLog 7246
+SHA256 b97cbb083afa2b95304b263fd4c0d90ccd698ff9b182add7b1ff9dc26794a879 ChangeLog 7246
 MD5 18e62467bfd5c7bf0d4de43e5b7c72a5 files/digest-silc-toolkit-0.9.13 73
 RMD160 4062cc71bb1bf5630288193e753a20ad12ff3b54 files/digest-silc-toolkit-0.9.13 73
 SHA256 24c7326f5d5abb98fb393610fa23f2059e14586910a31975802f949ca35a6abd files/digest-silc-toolkit-0.9.13 73
 MD5 1f39114276cc8e15b38e0c9d013057f1 files/digest-silc-toolkit-1.0 70
 RMD160 d5a06a31acd59b8b81ca73873afac8ed27f18259 files/digest-silc-toolkit-1.0 70
 SHA256 497f8801fea02ef8d364d695b1b15f2db8eed6490fb4714111ce74308d69bc66 files/digest-silc-toolkit-1.0 70
+MD5 bc733b92b384a85ce2270ef86460e814 files/digest-silc-toolkit-1.0.2 262
+RMD160 e196e194ece1f0124036e962092735bf2845e33d files/digest-silc-toolkit-1.0.2 262
+SHA256 b397dc4ea513012367414b29facea45727158c23f334324b7aee1f8678fea88b files/digest-silc-toolkit-1.0.2 262
 MD5 6c8639c61522d4e5e7ee452088000fc3 files/silc-toolkit-0.9.12-64bit_goodness.patch 4563
 RMD160 ec98f4cfeb84ed25307c9b5fdb84e866a3850528 files/silc-toolkit-0.9.12-64bit_goodness.patch 4563
 SHA256 202ff9f1fd6c727840121145502ebe6c720404cbb407333146e952bb7dad9c64 files/silc-toolkit-0.9.12-64bit_goodness.patch 4563
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 RMD160 279429d1df694561fc2b163cb81c09387b9d940c metadata.xml 160
 SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2 metadata.xml 160
-MD5 713de6b02db7b5d09da44fb708c5041e silc-toolkit-0.9.12-r2.ebuild 1597
-RMD160 b37fca2dc6ba02e64a035543c769e4c5e4d401f4 silc-toolkit-0.9.12-r2.ebuild 1597
-SHA256 14ed17c4f36af2e461067903426a8cf7d9c6f45cdff472dc3b2e9c31c844709b silc-toolkit-0.9.12-r2.ebuild 1597
-MD5 9e5cbd4d2a7f087e91e6ecc8e95b5965 silc-toolkit-0.9.12-r3.ebuild 2158
-RMD160 fec8e0daa76bc54f366debe3caf5a7055b28f349 silc-toolkit-0.9.12-r3.ebuild 2158
-SHA256 d63dc5b9a5808133575e0343b2451e69c0ef6d802c9d8210a43e0c6330a5a918 silc-toolkit-0.9.12-r3.ebuild 2158
 MD5 3c975927b34a886038be8810e319c1a9 silc-toolkit-0.9.13.ebuild 1661
 RMD160 30e3389711dc2965c5323b8a2d3caa2362a2990d silc-toolkit-0.9.13.ebuild 1661
 SHA256 586384a3fdb1f84f989b4fec562dd94094d29616978b4bffd8eeb98b1bd4be7c silc-toolkit-0.9.13.ebuild 1661
+MD5 3f999d59176102a050294050baacccd0 silc-toolkit-1.0.2.ebuild 1604
+RMD160 a84bb824431726ac36b26e018b2370a69e44f45b silc-toolkit-1.0.2.ebuild 1604
+SHA256 2e9f771a5a175d898d344b6982455eee242b248a0c5b492fd19dbcd72e02cdde silc-toolkit-1.0.2.ebuild 1604
 MD5 50972e7ea9647473d0c4814aed2eb56f silc-toolkit-1.0.ebuild 1604
 RMD160 03b493bb7b7c3b51dc754ce681bcef1fc7d3f39a silc-toolkit-1.0.ebuild 1604
 SHA256 7e788cd9a639409bca96d947201a00b2d6942e8b4bbb26b767b6e2b7a4be9ae2 silc-toolkit-1.0.ebuild 1604
diff --git a/net-im/silc-toolkit/files/digest-silc-toolkit-0.9.12-r2 b/net-im/silc-toolkit/files/digest-silc-toolkit-0.9.12-r2
deleted file mode 100644
index e96a95d05314..000000000000
--- a/net-im/silc-toolkit/files/digest-silc-toolkit-0.9.12-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f859d51fcd5284cc1bdaad0cf33a8e6a silc-toolkit-0.9.12.tar.bz2 2547108
diff --git a/net-im/silc-toolkit/files/digest-silc-toolkit-0.9.12-r3 b/net-im/silc-toolkit/files/digest-silc-toolkit-0.9.12-r3
deleted file mode 100644
index e96a95d05314..000000000000
--- a/net-im/silc-toolkit/files/digest-silc-toolkit-0.9.12-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f859d51fcd5284cc1bdaad0cf33a8e6a silc-toolkit-0.9.12.tar.bz2 2547108
diff --git a/net-im/silc-toolkit/files/digest-silc-toolkit-1.0.2 b/net-im/silc-toolkit/files/digest-silc-toolkit-1.0.2
new file mode 100644
index 000000000000..a779a85d7983
--- /dev/null
+++ b/net-im/silc-toolkit/files/digest-silc-toolkit-1.0.2
@@ -0,0 +1,3 @@
+MD5 869ce01349444a28fbace3c1bfe745ff silc-toolkit-1.0.2.tar.bz2 2545183
+RMD160 b4e0f614058902e200f7bd9bae4a125bc99d4fd6 silc-toolkit-1.0.2.tar.bz2 2545183
+SHA256 45b289f2c328378e5fbdfc394ff71cbb66ef7c4fdc882185dbeeb08b28d25c7a silc-toolkit-1.0.2.tar.bz2 2545183
diff --git a/net-im/silc-toolkit/silc-toolkit-0.9.12-r2.ebuild b/net-im/silc-toolkit/silc-toolkit-0.9.12-r2.ebuild
deleted file mode 100644
index d0d279bd7bd9..000000000000
--- a/net-im/silc-toolkit/silc-toolkit-0.9.12-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-toolkit/silc-toolkit-0.9.12-r2.ebuild,v 1.11 2005/02/18 17:34:23 slarti Exp $
-
-inherit eutils flag-o-matic
-
-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="alpha amd64 hppa ia64 mips ppc sparc x86"
-IUSE="debug ipv6"
-
-DEPEND="!<=net-im/silc-client-1.0.1"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	sed -i \
-		-e 's:-cp -R $(srcdir)/tutorial $(prefix):-cp -R $(srcdir)/tutorial $(docdir):' \
-		Makefile.in
-	sed -i \
-		-e "s:-g -O2:${CFLAGS}:g" \
-		configure
-
-	# Fix for amd64
-	[ "${ARCH}" = "amd64" ] && epatch ${FILESDIR}/${P}-64bit_goodness.patch
-}
-
-src_compile() {
-	# Fix for amd64
-	[ "${ARCH}" = "amd64" ] && append-flags -fPIC
-
-	econf \
-		--datadir=/usr/share/${PN} \
-		--mandir=/usr/share/man \
-		--includedir=/usr/include/${PN} \
-		--with-etcdir=/etc/${PN} \
-		--with-helpdir=/usr/share/${PN}/help \
-		--with-simdir=/usr/lib/${PN} \
-		--with-docdir=/usr/share/doc/${PF} \
-		--with-logsdir=/var/log/${PN} \
-		--enable-shared \
-		--enable-static \
-		--without-irssi \
-		--without-silcd \
-		`use_enable debug` \
-		`use_enable ipv6` \
-		|| die "econf failed"
-	emake || die "emake failed"
-	emake -C lib || die "emake -C lib failed"
-}
-
-src_install() {
-	make install DESTDIR=${D} || die "make install failed"
-
-	rm -rf \
-		${D}/usr/share/man \
-		${D}/etc/${PN}/silcd.conf \
-		${D}/usr/share/doc/${PF}/{tutorial,examples}
-}
diff --git a/net-im/silc-toolkit/silc-toolkit-0.9.12-r3.ebuild b/net-im/silc-toolkit/silc-toolkit-0.9.12-r3.ebuild
deleted file mode 100644
index 7d5437efa468..000000000000
--- a/net-im/silc-toolkit/silc-toolkit-0.9.12-r3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-toolkit/silc-toolkit-0.9.12-r3.ebuild,v 1.17 2005/02/18 17:34:23 slarti Exp $
-
-inherit eutils flag-o-matic
-
-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="alpha amd64 arm hppa ia64 mips ppc sparc x86 ppc64"
-IUSE="debug ipv6"
-
-DEPEND="!<=net-im/silc-client-1.0.1
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# also modify Makefile.am, since the build process seems to recreate
-	# Makefile.in and start over (see bug 63089)
-	sed -i \
-		-e "s:\$(srcdir)/tutorial \$(prefix):\$(srcdir)/tutorial \$(docdir):" \
-		Makefile.am
-
-	sed -i \
-		-e "s:\$(srcdir)/tutorial \$(prefix):\$(srcdir)/tutorial \$(docdir):" \
-		Makefile.in
-
-	sed -i \
-		-e "s:-g -O2:${CFLAGS}:g" \
-		configure
-
-	# Fix for amd64
-	use amd64 && epatch ${FILESDIR}/${P}-64bit_goodness.patch
-
-	libtoolize --copy --force
-}
-
-src_compile() {
-	# Fix for amd64
-	use amd64 && append-flags -fPIC
-
-	econf \
-		--datadir=/usr/share/${PN} \
-		--mandir=/usr/share/man \
-		--includedir=/usr/include/${PN} \
-		--with-etcdir=/etc/${PN} \
-		--with-helpdir=/usr/share/${PN}/help \
-		--with-simdir=/usr/$(get_libdir)/${PN} \
-		--with-docdir=/usr/share/doc/${PF} \
-		--with-logsdir=/var/log/${PN} \
-		--enable-shared \
-		--enable-static \
-		--without-irssi \
-		--without-silcd \
-		`use_enable debug` \
-		`use_enable ipv6` \
-		|| die "econf failed"
-	emake || die "emake failed"
-	emake -C lib || die "emake -C lib failed"
-}
-
-src_install() {
-	make install DESTDIR=${D} || die "make install failed"
-
-	rm -rf \
-		${D}/usr/share/man \
-		${D}/etc/${PN}/silcd.conf \
-		${D}/usr/share/doc/${PF}/{tutorial,examples}
-
-	dodir /usr/$(get_libdir)/pkgconfig
-	cat >${D}/usr/$(get_libdir)/pkgconfig/silc.pc <<EOF
-prefix=/usr
-exec_prefix=\${prefix}
-libdir=\${prefix}/$(get_libdir)
-includedir=\${prefix}/include
-
-Name: silc
-Version: ${PV}
-Description: SILC Library.
-Libs: -L\${libdir} -lsilcclient -lsilc
-Cflags: -I\${includedir}/${PN}
-EOF
-}
diff --git a/net-im/silc-toolkit/silc-toolkit-1.0.2.ebuild b/net-im/silc-toolkit/silc-toolkit-1.0.2.ebuild
new file mode 100644
index 000000000000..fe4b732d1a77
--- /dev/null
+++ b/net-im/silc-toolkit/silc-toolkit-1.0.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-toolkit/silc-toolkit-1.0.2.ebuild,v 1.1 2006/03/07 04:05:28 antarus 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug ipv6"
+
+RDEPEND="!<=net-im/silc-client-1.0.1"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+
+	# They have incorrect DESTDIR usage
+	sed -i '/\$(srcdir)\/tutorial/s/\$(prefix)/\$(docdir)/' ${S}/Makefile.am
+	sed -i '/\$(srcdir)\/tutorial/s/\$(prefix)/\$(docdir)/' ${S}/Makefile.in
+
+	# Stop them from unsetting our CFLAGS
+	sed -i '/^CFLAGS=$/d' ${S}/configure || die
+}
+
+src_compile() {
+	econf \
+		--datadir=/usr/share/${PN} \
+		--mandir=/usr/share/man \
+		--includedir=/usr/include/${PN} \
+		--with-etcdir=/etc/silc \
+		--with-helpdir=/usr/share/${PN}/help \
+		--with-simdir=/usr/$(get_libdir)/${PN} \
+		--with-docdir=/usr/share/doc/${PF} \
+		--with-logsdir=/var/log/${PN} \
+		--enable-shared \
+		--enable-static \
+		$(use_enable debug) \
+		$(use_enable ipv6)
+
+	emake || die "emake failed"
+	emake -C lib || die "emake -C lib failed"
+}
+
+src_install() {
+	make 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
+}