Remove automagic x11-libs/qt:3 detection wrt #301744, thanks to Ben de Groot and Thomas Beierlein.

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

4 files changed, 68 insertions, 10 deletions

diff --git a/media-radio/svxlink/ChangeLog b/media-radio/svxlink/ChangeLog
index 80725593e102..1c4010444c28 100644
--- a/media-radio/svxlink/ChangeLog
+++ b/media-radio/svxlink/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-radio/svxlink
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/svxlink/ChangeLog,v 1.14 2009/12/28 16:21:24 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-radio/svxlink/ChangeLog,v 1.15 2010/02/19 16:14:59 ssuominen Exp $
+
+  19 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> svxlink-090426.ebuild,
+  +files/svxlink-090426-noqt.patch:
+  Remove automagic x11-libs/qt:3 detection wrt #301744, thanks to Ben de
+  Groot and Thomas Beierlein.
 
   28 Dec 2009; Samuli Suominen <ssuominen@gentoo.org> svxlink-090426.ebuild:
   Stop using deprecated kde-functions.eclass.
diff --git a/media-radio/svxlink/Manifest b/media-radio/svxlink/Manifest
index 6a2d07f6f998..7afa15777993 100644
--- a/media-radio/svxlink/Manifest
+++ b/media-radio/svxlink/Manifest
@@ -1,6 +1,7 @@
 AUX svxlink-080730--as-needed.patch 381 RMD160 ec62feb75329b2dd881f022556995c23f038ccf3 SHA1 bc6a015d28cc29af87fd2d738a159323360ccba7 SHA256 0a84adf6f6d65e5b8bd07a0a7a70153dd8194edf6007a0e83700fc1152e527a4
 AUX svxlink-090426-gcc44.patch 4660 RMD160 c1f6da4351e371a7675220464aceed336b8b3a7e SHA1 b4984ebfece9999f868e50218e39ca1189d606d2 SHA256 ab1802af784b65cfdc5ba391326d2073610140f860628709375f34d987366c80
+AUX svxlink-090426-noqt.patch 1532 RMD160 3c778f65b9b3f96856ff2d6b386b36f7a4f5b0bf SHA1 08a756fdcb4088263db3ec691e28e7890b679778 SHA256 42f3a0768fb7550e083a85b8625ed392155ff1bee261b704785b84a02cba44e1
 DIST svxlink-090426.tar.gz 543094 RMD160 0cba553bb333bc9266a031dbe2d4308a3c53a271 SHA1 e6603e483181924f5e1c3ef01ac77caac25db174 SHA256 79cfbefb1b39f7c4a4c3db32fea365d795da1616452e5841614e43601fe12a2c
-EBUILD svxlink-090426.ebuild 924 RMD160 8bfaf04f6774cd59d6b13682ec490f966935fa6b SHA1 d760968437b152142f8f086759591717d6bfa998 SHA256 8b1bcc43a21315aec2fdf0688f6ad97ba0f35d37cf345cd9fb095d0a85ef36b8
-MISC ChangeLog 2804 RMD160 b7d41634803ad7fdc4a3799ab0a55fd8c3007337 SHA1 3351c89bdb90c9169b1616be93e72da5cf00fb3b SHA256 df18bb9b17d55498760075ddbac9ed0b31d965b8072aeee1554085110018c728
+EBUILD svxlink-090426.ebuild 942 RMD160 189255cbf74ddd95a74b1696ba28dcb12a4d8c3c SHA1 9c7abe75f52e7a5c34640ebfe0dd4a825ed693b6 SHA256 69a59a846b329390841f33c8e2783f3c7b0e7151132944ca3999bc587160077d
+MISC ChangeLog 3021 RMD160 a63700ff14fd8f4f583f7a352dd7f345742e085d SHA1 b67c943c38b5afe372d669bac067e02dfe7af080 SHA256 a3ae27f340998e3db80e3c6aef98d03db65acb3306e683a4e3e1658083fa120f
 MISC metadata.xml 576 RMD160 9737d8ebadc8d1bf8ad6537954c904dabd8504ce SHA1 c76fd8462d760bea39d25ce5fba9c6b93a404152 SHA256 eac243310b8e20a8c588e42b8c682c10998e6599f1b702103b906e5e0ffc4bf9
diff --git a/media-radio/svxlink/files/svxlink-090426-noqt.patch b/media-radio/svxlink/files/svxlink-090426-noqt.patch
new file mode 100644
index 000000000000..01ee4e1eb0e2
--- /dev/null
+++ b/media-radio/svxlink/files/svxlink-090426-noqt.patch
@@ -0,0 +1,52 @@
+Remove automagic Qt3 detection
+
+https://bugs.gentoo.org/301744
+
+--- create_config.sh
++++ create_config.sh
+@@ -60,45 +60,6 @@
+   output "ECHO=/bin/echo -e"
+ fi
+ 
+-# Checking for QT
+-info "--- Checking for QT..."
+-if which pkg-config > /dev/null 2>&1; then
+-  if pkg-config qt; then
+-    info "yes (pkg-config qt)\n"
+-    output "QT_LIBPATH=$(pkg-config qt --libs-only-L)"
+-    output "QT_LIBS=$(pkg-config qt --libs-only-l)"
+-    output "QT_INCPATH=$(pkg-config qt --cflags-only-I)"
+-    output "QT_CFLAGS=$(pkg-config qt --cflags-only-other)"
+-    QT_PREFIX=$(pkg-config qt --variable=prefix)
+-  elif pkg-config qt-mt; then
+-    info "yes (pkg-config qt-mt)\n"
+-    output "QT_LIBPATH=$(pkg-config qt-mt --libs-only-L)"
+-    output "QT_LIBS=$(pkg-config qt-mt --libs-only-l)"
+-    output "QT_INCPATH=$(pkg-config qt-mt --cflags-only-I)"
+-    output "QT_CFLAGS=$(pkg-config qt-mt --cflags-only-other)"
+-    QT_PREFIX=$(pkg-config qt-mt --variable=prefix)
+-  fi
+-fi
+-if [ -z "$QT_PREFIX" -a -n "$QTDIR" ]; then
+-  info "yes (QTDIR)\n"
+-  output "QT_LIBPATH=-L${QTDIR}/lib"
+-  if [ -n "$(ls ${QTDIR}/lib/libqt-mt* 2> /dev/null)" ]; then
+-    output "QT_LIBS=-lqt-mt"
+-  else
+-    output "QT_LIBS=-lqt"
+-  fi
+-  output "QT_INCPATH=-I${QTDIR}/include"
+-  output "QT_CFLAGS="
+-  QT_PREFIX=${QTDIR}
+-fi
+-if [ -n "$QT_PREFIX" ]; then
+-  QT_BIN="${QT_PREFIX}/bin"
+-  output "QT_BIN=${QT_BIN}"
+-  output "QT_MOC=${QT_BIN}/moc"
+-  output "QT_UIC=${QT_BIN}/uic"
+-else
+-  info "no (optional)\n"
+-fi
+ 
+ # Checking for libsigc++
+ sigc_version=1.2
diff --git a/media-radio/svxlink/svxlink-090426.ebuild b/media-radio/svxlink/svxlink-090426.ebuild
index e7d56e7029f7..5b7b22ff2b0e 100644
--- a/media-radio/svxlink/svxlink-090426.ebuild
+++ b/media-radio/svxlink/svxlink-090426.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/svxlink/svxlink-090426.ebuild,v 1.4 2009/12/28 16:21:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/svxlink/svxlink-090426.ebuild,v 1.5 2010/02/19 16:14:59 ssuominen Exp $
 
 EAPI=2
-inherit multilib qt3
+inherit eutils multilib
 
 DESCRIPTION="Multi Purpose Voice Services System, including Qtel for EchoLink"
 HOMEPAGE="http://svxlink.sourceforge.net/"
@@ -16,7 +16,6 @@ IUSE=""
 
 RDEPEND="dev-lang/tcl
 	media-sound/gsm
-	x11-libs/qt:3
 	dev-libs/libgcrypt
 	media-libs/speex
 	dev-libs/libsigc++:1.2
@@ -27,8 +26,9 @@ DEPEND="${RDEPEND}
 MAKEOPTS="${MAKEOPTS} -j1"
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-080730--as-needed.patch"
-	epatch "${FILESDIR}/${P}-gcc44.patch"
+	epatch "${FILESDIR}"/${PN}-080730--as-needed.patch \
+		"${FILESDIR}"/${P}-gcc44.patch \
+		"${FILESDIR}"/${P}-noqt.patch
 
 	sed -i -e "s:/lib:/$(get_libdir):g" makefile.cfg || die
 }