Version bump (skype-4.1 compatible). Fixes bug #445786 by Rion.

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

5 files changed, 13 insertions, 71 deletions

diff --git a/net-im/skypetab-ng/ChangeLog b/net-im/skypetab-ng/ChangeLog
index af643940e26c..d8a64d7e2c0c 100644
--- a/net-im/skypetab-ng/ChangeLog
+++ b/net-im/skypetab-ng/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/skypetab-ng
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skypetab-ng/ChangeLog,v 1.8 2012/07/26 17:01:38 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skypetab-ng/ChangeLog,v 1.9 2012/12/03 20:18:49 slyfox Exp $
+
+*skypetab-ng-0.5.1 (03 Dec 2012)
+
+  03 Dec 2012; Sergei Trofimovich <slyfox@gentoo.org> +skypetab-ng-0.5.1.ebuild,
+  -files/skypetab-ng-0.5.0-fix-multiwindows.patch, -skypetab-ng-0.5.0-r1.ebuild,
+  -skypetab-ng-0.5.0.ebuild, skypetab-ng-9999.ebuild:
+  Version bump (skype-4.1 compatible). Fixes bug #445786 by Rion.
 
   26 Jul 2012; Johannes Huber <johu@gentoo.org> skypetab-ng-0.5.0-r1.ebuild,
   skypetab-ng-0.5.0.ebuild, skypetab-ng-9999.ebuild:
diff --git a/net-im/skypetab-ng/files/skypetab-ng-0.5.0-fix-multiwindows.patch b/net-im/skypetab-ng/files/skypetab-ng-0.5.0-fix-multiwindows.patch
deleted file mode 100644
index 7edf056ccbe8..000000000000
--- a/net-im/skypetab-ng/files/skypetab-ng-0.5.0-fix-multiwindows.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From ea02a30f76d771a70e5efc9dcb251c93f869784e Mon Sep 17 00:00:00 2001
-From: Nikita Tsukanov <keks9n@gmail.com>
-Date: Fri, 15 Jun 2012 16:38:27 +0400
-Subject: [PATCH] Fix 1 > 0
-
----
- skypetab-ng         |    2 +-
-# skypetab-ng.src.rpm |  Bin 28866 -> 28851 bytes
- 2 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/skypetab-ng b/skypetab-ng
-index 1cc6d6b..c53dbf8 100755
---- a/skypetab-ng
-+++ b/skypetab-ng
-@@ -5,7 +5,7 @@ then
- 	find|grep config.xml|while read line;
- 	do
- 		sed -i "s/.UseUniqueConversationsWindow.*//" $line
--		sed -i "s/<UI>/<UI>\n    <UseUniqueConversationsWindow>1<\/UseUniqueConversationsWindow>/" $line
-+		sed -i "s/<UI>/<UI>\n    <UseUniqueConversationsWindow>0<\/UseUniqueConversationsWindow>/" $line
- 		cat $line
- 	done
- fi
diff --git a/net-im/skypetab-ng/skypetab-ng-0.5.0-r1.ebuild b/net-im/skypetab-ng/skypetab-ng-0.5.0-r1.ebuild
deleted file mode 100644
index dfb3efe7d9bb..000000000000
--- a/net-im/skypetab-ng/skypetab-ng-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,42 +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/skypetab-ng/skypetab-ng-0.5.0-r1.ebuild,v 1.2 2012/07/26 17:01:38 johu Exp $
-
-EAPI=4
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://github.com/kekekeks/skypetab-ng.git"
-	UNPACKER_ECLASS="git-2"
-	LIVE_EBUILD=yes
-else
-	UNPACKER_ECLASS="vcs-snapshot"
-fi
-
-inherit eutils qt4-r2 multilib ${UNPACKER_ECLASS}
-
-if [[ -z ${LIVE_EBUILD} ]]; then
-	KEYWORDS="-* ~x86 ~amd64"
-	SRC_URI="http://github.com/kekekeks/${PN}/tarball/v${PV}-fixed -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="An LD_PRELOAD wrapper that adds tabs to Skype for Linux"
-HOMEPAGE="http://github.com/kekekeks/skypetab-ng"
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	x11-libs/qt-gui:4
-	amd64? ( app-emulation/emul-linux-x86-qtlibs )
-"
-RDEPEND="${DEPEND}
-	net-im/skype[-qt-static]
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fix-multiwindows.patch
-}
-
-pkg_setup() {
-	use amd64 && multilib_toolchain_setup x86
-}
diff --git a/net-im/skypetab-ng/skypetab-ng-0.5.0.ebuild b/net-im/skypetab-ng/skypetab-ng-0.5.1.ebuild
index 0172faf1474c..811225a73907 100644
--- a/net-im/skypetab-ng/skypetab-ng-0.5.0.ebuild
+++ b/net-im/skypetab-ng/skypetab-ng-0.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skypetab-ng/skypetab-ng-0.5.0.ebuild,v 1.2 2012/07/26 17:01:38 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skypetab-ng/skypetab-ng-0.5.1.ebuild,v 1.1 2012/12/03 20:18:49 slyfox Exp $
 
 EAPI=4
 
@@ -16,7 +16,7 @@ inherit qt4-r2 multilib ${UNPACKER_ECLASS}
 
 if [[ -z ${LIVE_EBUILD} ]]; then
 	KEYWORDS="-* ~x86 ~amd64"
-	SRC_URI="http://github.com/kekekeks/${PN}/tarball/v${PV}-fixed -> ${P}.tar.gz"
+	SRC_URI="http://github.com/kekekeks/${PN}/tarball/v${PV} -> ${P}.tar.gz"
 fi
 
 DESCRIPTION="An LD_PRELOAD wrapper that adds tabs to Skype for Linux"
@@ -30,7 +30,7 @@ DEPEND="
 	amd64? ( app-emulation/emul-linux-x86-qtlibs )
 "
 RDEPEND="${DEPEND}
-	net-im/skype[-qt-static]
+	|| ( >=net-im/skype-4.1 <net-im/skype-4.1[-qt-static] )
 "
 
 pkg_setup() {
diff --git a/net-im/skypetab-ng/skypetab-ng-9999.ebuild b/net-im/skypetab-ng/skypetab-ng-9999.ebuild
index 38e31b1f2f38..da764ba48e0b 100644
--- a/net-im/skypetab-ng/skypetab-ng-9999.ebuild
+++ b/net-im/skypetab-ng/skypetab-ng-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skypetab-ng/skypetab-ng-9999.ebuild,v 1.4 2012/07/26 17:01:38 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skypetab-ng/skypetab-ng-9999.ebuild,v 1.5 2012/12/03 20:18:49 slyfox Exp $
 
 EAPI=4
 
@@ -30,7 +30,7 @@ DEPEND="
 	amd64? ( app-emulation/emul-linux-x86-qtlibs )
 "
 RDEPEND="${DEPEND}
-	net-im/skype[-qt-static]
+	|| ( >=net-im/skype-4.1 <net-im/skype-4.1[-qt-static] )
 "
 
 pkg_setup() {