5 files changed, 35 insertions, 139 deletions
diff --git a/net-im/silc-toolkit/ChangeLog b/net-im/silc-toolkit/ChangeLog
index 9bfb40d2e190..8d6741b9dcc6 100644
--- a/net-im/silc-toolkit/ChangeLog
+++ b/net-im/silc-toolkit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/silc-toolkit
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-toolkit/ChangeLog,v 1.103 2012/05/04 06:22:12 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-toolkit/ChangeLog,v 1.104 2012/05/28 08:53:17 scarabeus Exp $
+
+  28 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> -silc-toolkit-1.1.7.ebuild,
+  -silc-toolkit-1.1.8.ebuild, silc-toolkit-1.1.10.ebuild:
+  Remove older that refused to build. Bump latest to eapi4.
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> silc-toolkit-1.1.7.ebuild,
   silc-toolkit-1.1.8.ebuild, silc-toolkit-1.1.10.ebuild:
diff --git a/net-im/silc-toolkit/Manifest b/net-im/silc-toolkit/Manifest
index 104cbd3e27fc..3ab5c5733b2f 100644
--- a/net-im/silc-toolkit/Manifest
+++ b/net-im/silc-toolkit/Manifest
@@ -1,8 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST silc-toolkit-1.1.10.tar.bz2 1830280 RMD160 9a505420569e8595eaee684c2e4bde7e4570654d SHA1 0bd4b1b410424733687fd2ad33c1b09cbbf8673f SHA256 a76cc364813b2d09dee7a9e99fda77db71b5bf752297176eb8de4fb0466eed76
-DIST silc-toolkit-1.1.7.tar.bz2 1936807 RMD160 0a0d99bf4ba5afcbc039e0a03b0c18ea4ac42da5 SHA1 38d0832bbd5abd14864c43eba73dfe72c63dfce1 SHA256 fcfb34cd0bb858a711ba0af4a2fce60ae64e485b35c67dcdad764cc6a5feac1f
-DIST silc-toolkit-1.1.8.tar.bz2 1849610 RMD160 5b29056e8f017b0dfbc3e59e5868e3ff7541e0ab SHA1 7ee466c2751554fefb798db1b4784c4f6ebfa37d SHA256 6c24d315c8485975108264d098610e05721285ac05adcce8857a8cedcdefffdf
-EBUILD silc-toolkit-1.1.10.ebuild 1161 RMD160 97dd4dd14cb62692af2a290a106e7b24b25ee147 SHA1 3597bacc2f3565228f7cf349dbb9df135d4882a3 SHA256 69bcc21b17508e356b1702081fdeb19b5d3f3dc404b6043f61cf7f18cc16066d
-EBUILD silc-toolkit-1.1.7.ebuild 1590 RMD160 a2405f00950a6773de6b35f0b305fae1990e4265 SHA1 6761bf8266a7c72c12bcb9d2d3830f214267fdc0 SHA256 e51cc057f5d5acbac1569b2532df5ca1cf7774b7bf19d43c13dbdff66b86ee05
-EBUILD silc-toolkit-1.1.8.ebuild 1598 RMD160 5e1f2f1dad405689a3ae0ef60913dc74397a52c1 SHA1 3f81cfe3f54e405e8910dfe731ddd2066fca1483 SHA256 86dc6e549bcf317d5ecc7c85727bb1d5c6df830c3c2e4b7f3dd73d5851eff2e8
-MISC ChangeLog 13812 RMD160 c9fe92f74d1c87d3299f2d7a2093e8ca3a6b46b3 SHA1 95617da5c1be324916d1f8957363a3904dd8f9a5 SHA256 9b15d1535df4133d65eb80d26d213cdebce6119133d84973bec8dfe5d1161a80
+EBUILD silc-toolkit-1.1.10.ebuild 1159 RMD160 5a8439c63926f794b26cab6739cd65c558b4803f SHA1 6a78e37afd2fbb0c0ac11cbdc10b2f65209749e3 SHA256 49beaa6c2d0a76585e7e47fe4bd076e238f18a71d9fbd9c05f5cee3b03d8f55b
+MISC ChangeLog 14017 RMD160 0f72e42ebb75679396539120fbd4e66ef6639b8f SHA1 0c5fe20aca17460a9dfeb8072b9f8f3528af82f1 SHA256 55a8da9508c532a762998c01c8592c60ac04088302caf7cbb46390c9da4cbfb0
 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPwz0MAAoJEOSiRoyO7jvoZCYP/i3XXuwS2CoSqE015HSyv4hw
+0m7PxnzYK4Qp6KLfisy6iCoZiAKIjuclf4Io7aNmpPisJN/z1K2IwEb4TM5dEbRB
+4c+ro2CIkSfAaA2YF4ShywMJ4ExUXZoxrFVZN7OhD5/byBlpbyt10jn2WnK4XBBt
+t+IQMT/i6EwYbmIucy95s3LDmVU8++4WmWyVCTA8Jo8lqB2HYDKSUG9TGqUODxkL
+XBpPcE/NILX9PPh69+oFZH68Acuh3V87luYbSKYrgmcnHQQL+e65nfxBNyQPEswH
+gN1m9S7jCFLNeWZWkZdyaVC4ThNttk9vQxiCWH/L7MzPjeYjRqaq/zdRA1BXRinP
+4yvDyHvCx+1fnLSC+GHXZS8YjE3yfpvBvA7RpnRNLRN0JI2A5M0zROrxB9D0jyss
+5rPHTGWHhgz27DhH6IVKZgQAqwG75ncLHIZxsQv3fGOcogWKPtsMQItG9gLp58fO
+ftX5XSS8QCxJ8+5Mo7KHzRDdb8l85dEK0Q21STSxO7WilZ0fr8J5svrOZZPtnLGn
+iAa6ot8B2IzeRWvrnGnWq2VmZkxfIy11iS7e+9bySXA3z5ktyVBOKlG9SyQdzdOD
+DbgOHCxRZXHoVheyXyXtqEzJgkdcEBfwDn5zotIsFoPFb24wg4eqBluypCNDa8E1
+zodBBmZ//N858YHh/aP0
+=IjDp
+-----END PGP SIGNATURE-----
diff --git a/net-im/silc-toolkit/silc-toolkit-1.1.10.ebuild b/net-im/silc-toolkit/silc-toolkit-1.1.10.ebuild
index 05d319d7b648..c4797cf6f0be 100644
--- a/net-im/silc-toolkit/silc-toolkit-1.1.10.ebuild
+++ b/net-im/silc-toolkit/silc-toolkit-1.1.10.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 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.1.10.ebuild,v 1.9 2012/05/04 06:22:12 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-toolkit/silc-toolkit-1.1.10.ebuild,v 1.10 2012/05/28 08:53:17 scarabeus Exp $
 
-EAPI=2
+EAPI=4
 
 inherit eutils
 
@@ -27,18 +27,14 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--datadir=/usr/share/${PN} \
-		--datarootdir=/usr/share/${PN} \
-		--includedir=/usr/include/${PN} \
-		--sysconfdir=/etc/silc \
-		--libdir=/usr/$(get_libdir)/${PN} \
-		--docdir=/usr/share/doc/${PF} \
+		--datadir="${EPREFIX}/usr/share/${PN}" \
+		--datarootdir="${EPREFIX}/usr/share/${PN}" \
+		--includedir="${EPREFIX}/usr/include/${PN}" \
+		--sysconfdir="${EPREFIX}/etc/silc" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)/${PN}" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--disable-optimizations \
 		--with-simdir=/usr/$(get_libdir)/${PN}/modules \
 		$(use_enable debug) \
 		$(use_enable ipv6)
 }
-
-src_install() {
-	emake install DESTDIR="${D}" || die "make install failed"
-}
diff --git a/net-im/silc-toolkit/silc-toolkit-1.1.7.ebuild b/net-im/silc-toolkit/silc-toolkit-1.1.7.ebuild
deleted file mode 100644
index edcd0b1a06ff..000000000000
--- a/net-im/silc-toolkit/silc-toolkit-1.1.7.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2012 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.1.7.ebuild,v 1.8 2012/05/04 06:22:12 jdhore 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 ~x86-fbsd"
-IUSE="debug ipv6"
-
-RDEPEND=""
-DEPEND="virtual/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 \
-		--with-simdir=/usr/$(get_libdir)/${PN}/modules \
-		$(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-toolkit/silc-toolkit-1.1.8.ebuild b/net-im/silc-toolkit/silc-toolkit-1.1.8.ebuild
deleted file mode 100644
index 8beed7ee5570..000000000000
--- a/net-im/silc-toolkit/silc-toolkit-1.1.8.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2012 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.1.8.ebuild,v 1.3 2012/05/04 06:22:12 jdhore 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 ~x86-fbsd"
-IUSE="debug ipv6"
-
-RDEPEND=""
-DEPEND="virtual/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 \
-		--with-simdir=/usr/$(get_libdir)/${PN}/modules \
-		$(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
-}