Remove older that refused to build. Bump latest to eapi4.

(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)

4 files changed, 13 insertions, 133 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/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
-}