From 43578740a50472bdc3756892f353083f708aed70 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyfox@gentoo.org>
Date: Wed, 14 Mar 2012 17:04:48 +0000
Subject: Require dynamically linked skype against qt as we are hijacking it.
 Fixed by hasufell (bug #407819).

(Portage version: 2.2.0_alpha90_p1/cvs/Linux x86_64)
---
 net-im/skypetab-ng/ChangeLog                       | 10 +++++-
 .../skypetab-ng-0.4.9_pre20111124-r1.ebuild        | 39 ++++++++++++++++++++++
 .../skypetab-ng-0.4.9_pre20111124.ebuild           | 39 ----------------------
 3 files changed, 48 insertions(+), 40 deletions(-)
 create mode 100644 net-im/skypetab-ng/skypetab-ng-0.4.9_pre20111124-r1.ebuild
 delete mode 100644 net-im/skypetab-ng/skypetab-ng-0.4.9_pre20111124.ebuild

(limited to 'net-im/skypetab-ng')

diff --git a/net-im/skypetab-ng/ChangeLog b/net-im/skypetab-ng/ChangeLog
index b46d3c2e331d..c873eaec7b90 100644
--- a/net-im/skypetab-ng/ChangeLog
+++ b/net-im/skypetab-ng/ChangeLog
@@ -1,6 +1,14 @@
 # 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.2 2012/03/14 17:03:18 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skypetab-ng/ChangeLog,v 1.3 2012/03/14 17:04:48 slyfox Exp $
+
+*skypetab-ng-0.4.9_pre20111124-r1 (14 Mar 2012)
+
+  14 Mar 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  +skypetab-ng-0.4.9_pre20111124-r1.ebuild,
+  -skypetab-ng-0.4.9_pre20111124.ebuild:
+  Require dynamically linked skype against qt as we are hijacking it. Fixed by
+  hasufell (bug #407819).
 
   14 Mar 2012; Sergei Trofimovich <slyfox@gentoo.org>
   skypetab-ng-0.4.9_pre20111124.ebuild, skypetab-ng-9999.ebuild:
diff --git a/net-im/skypetab-ng/skypetab-ng-0.4.9_pre20111124-r1.ebuild b/net-im/skypetab-ng/skypetab-ng-0.4.9_pre20111124-r1.ebuild
new file mode 100644
index 000000000000..414af8f8328f
--- /dev/null
+++ b/net-im/skypetab-ng/skypetab-ng-0.4.9_pre20111124-r1.ebuild
@@ -0,0 +1,39 @@
+# 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.4.9_pre20111124-r1.ebuild,v 1.1 2012/03/14 17:04:48 slyfox Exp $
+
+EAPI=4
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="git://github.com/kekekeks/skypetab-ng.git"
+	LIVE_ECLASSES="git-2"
+	LIVE_EBUILD=yes
+fi
+MY_P=${P/_pre*//}
+
+inherit qt4-r2 multilib ${LIVE_ECLASSES}
+
+if [[ -z ${LIVE_EBUILD} ]]; then
+	KEYWORDS="-* ~x86 ~amd64"
+	SRC_URI="http://dev.gentoo.org/~slyfox/${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
+	amd64? ( app-emulation/emul-linux-x86-qtlibs )
+"
+RDEPEND="${DEPEND}
+	net-im/skype[-qt-static]
+"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	use amd64 && multilib_toolchain_setup x86
+}
diff --git a/net-im/skypetab-ng/skypetab-ng-0.4.9_pre20111124.ebuild b/net-im/skypetab-ng/skypetab-ng-0.4.9_pre20111124.ebuild
deleted file mode 100644
index 7ba7ca4881fc..000000000000
--- a/net-im/skypetab-ng/skypetab-ng-0.4.9_pre20111124.ebuild
+++ /dev/null
@@ -1,39 +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.4.9_pre20111124.ebuild,v 1.2 2012/03/14 17:03:17 slyfox Exp $
-
-EAPI=4
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="git://github.com/kekekeks/skypetab-ng.git"
-	LIVE_ECLASSES="git-2"
-	LIVE_EBUILD=yes
-fi
-MY_P=${P/_pre*//}
-
-inherit qt4-r2 multilib ${LIVE_ECLASSES}
-
-if [[ -z ${LIVE_EBUILD} ]]; then
-	KEYWORDS="-* ~x86 ~amd64"
-	SRC_URI="http://dev.gentoo.org/~slyfox/${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
-	amd64? ( app-emulation/emul-linux-x86-qtlibs )
-"
-RDEPEND="${DEPEND}
-	net-im/skype[-qt-static]
-"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	use amd64 && multilib_toolchain_setup x86
-}
-- 
cgit v1.2.3-65-gdbad