Ebuild fixes. Cleanup old.

(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key )

3 files changed, 14 insertions, 55 deletions

diff --git a/net-im/tkabber/ChangeLog b/net-im/tkabber/ChangeLog
index a4d0aaa4156e..6505f4076ab3 100644
--- a/net-im/tkabber/ChangeLog
+++ b/net-im/tkabber/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/tkabber
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/tkabber/ChangeLog,v 1.45 2012/03/18 15:32:53 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/tkabber/ChangeLog,v 1.46 2013/08/18 14:23:08 mrueg Exp $
+
+*tkabber-0.11.1-r1 (18 Aug 2013)
+
+  18 Aug 2013; Manuel Rüger <mrueg@gentoo.org> +tkabber-0.11.1-r1.ebuild,
+  -tkabber-0.11.0.ebuild, -tkabber-0.11.1.ebuild:
+  Ebuild fixes. Cleanup old.
 
   18 Mar 2012; Raúl Porcel <armin76@gentoo.org> tkabber-0.9.9.ebuild,
   tkabber-0.11.0.ebuild, tkabber-0.11.1.ebuild:
diff --git a/net-im/tkabber/tkabber-0.11.0.ebuild b/net-im/tkabber/tkabber-0.11.0.ebuild
deleted file mode 100644
index 9433daf30297..000000000000
--- a/net-im/tkabber/tkabber-0.11.0.ebuild
+++ /dev/null
@@ -1,47 +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/tkabber/tkabber-0.11.0.ebuild,v 1.5 2012/03/18 15:32:53 armin76 Exp $
-
-inherit eutils
-
-DESCRIPTION="Tkabber is a Free and Open Source client for the Jabber instant messaging system, written in Tcl/Tk."
-HOMEPAGE="http://tkabber.jabber.ru/"
-SRC_URI="http://files.jabber.ru/tkabber/${P}.tar.gz
-	plugins? ( http://files.jabber.ru/tkabber/tkabber-plugins-${PV}.tar.gz )"
-IUSE="plugins ssl"
-
-DEPEND=">=dev-lang/tcl-8.3.3
-	>=dev-lang/tk-8.3.3
-	>=dev-tcltk/tcllib-1.3
-	>=dev-tcltk/bwidget-1.3
-	ssl? ( >=dev-tcltk/tls-1.4.1 )
-	>=dev-tcltk/tkXwin-1.0
-	>=dev-tcltk/tkimg-1.2
-	>=dev-tcltk/tktray-1.1"
-RDEPEND="${DEPEND}"
-
-# Disabled because it depends on gpgme 0.3.x
-#	crypt? ( >=dev-tcltk/tclgpgme-1.0 )
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-src_compile() {
-	# dont run make, because the Makefile is broken with all=install
-	:
-}
-
-src_install() {
-	make install DESTDIR="${D}" PREFIX=/usr \
-		DOCDIR="/usr/share/doc/${P}"
-
-	dodoc AUTHORS ChangeLog INSTALL README
-	dohtml README.html
-
-	if use plugins; then
-		cd "${WORKDIR}/tkabber-plugins-${PV}"
-		make install DESTDIR="${D}" PREFIX=/usr \
-			DOCDIR="/usr/share/doc/${P}"
-	fi
-}
diff --git a/net-im/tkabber/tkabber-0.11.1.ebuild b/net-im/tkabber/tkabber-0.11.1-r1.ebuild
index e85ac2837324..9f8a80de4974 100644
--- a/net-im/tkabber/tkabber-0.11.1.ebuild
+++ b/net-im/tkabber/tkabber-0.11.1-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/tkabber/tkabber-0.11.1.ebuild,v 1.4 2012/03/18 15:32:53 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/tkabber/tkabber-0.11.1-r1.ebuild,v 1.1 2013/08/18 14:23:08 mrueg Exp $
 
-inherit eutils
+EAPI=5
 
-DESCRIPTION="Tkabber is a Free and Open Source client for the Jabber instant messaging system, written in Tcl/Tk."
+DESCRIPTION="A jabber client written in Tcl/Tk"
 HOMEPAGE="http://tkabber.jabber.ru/"
 SRC_URI="http://files.jabber.ru/tkabber/${P}.tar.gz
 	plugins? ( http://files.jabber.ru/tkabber/tkabber-plugins-${PV}.tar.gz )"
@@ -33,7 +33,7 @@ src_compile() {
 }
 
 src_install() {
-	make install DESTDIR="${D}" PREFIX=/usr \
+	emake install DESTDIR="${D}" PREFIX=/usr \
 		DOCDIR="/usr/share/doc/${P}"
 
 	dodoc AUTHORS ChangeLog INSTALL README
@@ -41,7 +41,7 @@ src_install() {
 
 	if use plugins; then
 		cd "${WORKDIR}/tkabber-plugins-${PV}"
-		make install DESTDIR="${D}" PREFIX=/usr \
+		emake install DESTDIR="${D}" PREFIX=/usr \
 			DOCDIR="/usr/share/doc/${P}"
 	fi
 }