media-radio/unixcw: ported 'xcwcp' to qt4

svn path=/sunrise/; revision=9921

4 files changed, 105 insertions, 30 deletions

diff --git a/media-radio/unixcw/ChangeLog b/media-radio/unixcw/ChangeLog
index a8581e57c..9971d3bfb 100644
--- a/media-radio/unixcw/ChangeLog
+++ b/media-radio/unixcw/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 Jan 2010; Thomas Beierlein (TomJBE) <tb@forth-ev.de>
+  -unixcw-2.3-r3.ebuild, +unixcw-2.3-r4.ebuild,
+  files/unixcw-2.3-config.patch:
+  ported 'xcwcp' to qt4
+
   11 Jan 2010; Thomas Beierlein (TomJBE) <tb@forth-ev.de>
   -unixcw-2.3-r2.ebuild, +unixcw-2.3-r3.ebuild, metadata.xml:
   drop qt3 support
diff --git a/media-radio/unixcw/Manifest b/media-radio/unixcw/Manifest
index 7bb144edd..d249d0a8f 100644
--- a/media-radio/unixcw/Manifest
+++ b/media-radio/unixcw/Manifest
@@ -1,10 +1,11 @@
 AUX unixcw-2.3--as-needed.patch 527 RMD160 47d2b22e6c8b211abae913e32576408a6a2c8a69 SHA1 ffae50431bc25e4b4b9f9264c0aef44300a82316 SHA256 b72add7559a0a9df10adc0efa885377ac02ccc2fa840366c1185cbb2485c35e8
-AUX unixcw-2.3-config.patch 1651 RMD160 fc7d2be6f85f60bb841a2c703d303c293af3e6a0 SHA1 69bdd9a053828c8f9548ab73279fd0919445cb7d SHA256 99b79225693636327841948408cc5b7289a39c5ca89bc26c55a08743eb42c8cb
+AUX unixcw-2.3-config.patch 3761 RMD160 5231647c71fd6a40ba22d989483345bc329115b7 SHA1 8750ef68b3b70c43c1c0a80419324be39d2f4dff SHA256 114c57049f6834fa5c31b2bb2e2242fde9e9b23f3b90fceca6a976191246a976
 AUX unixcw-2.3-destdir.patch 480 RMD160 40579e2f3ff874cfd98ca18f2956451e4a197e5a SHA1 926ff70e9067f74c14919b7519b7b99579d51534 SHA256 ba6c84abcaebe9c16cdac636626bbd3c74a7afc6d115985767377878c13ca64c
 AUX unixcw-2.3-fPIC.patch 1866 RMD160 fd3dcaa906a308d15baa738dca5f01e3767cd6dd SHA1 c5ad38457125086d56526de28022ca68c9350dbd SHA256 2cd8aa8759df1c40742c57f5e65c2a9093c587e83345e01a26ac8f46c5953053
 AUX unixcw-2.3-ldflags.patch 1440 RMD160 d198c5325152b93822a0a3d59516b48c7b6d53f2 SHA1 741a61a083d350d84743f6cde9c18923c7d2acb5 SHA256 41d40ceb0accb8c971bbc69eb00d7c17aa2d62ed8d907d46a310f3ec3b6ff662
 AUX unixcw-2.3-parallel-make.patch 1200 RMD160 302a1947d21a3b1013d124edc380fcaddbbb7272 SHA1 a15e1bc58c64421b93a73c9ff46dfdbeb2d3a6f6 SHA256 53b8c6e12de88ed2c915617206220350c3e08eebd83d748469bc23c801ed108c
+DIST unixcw-2.3-qt3to4.patch 22763 RMD160 b5fd5e856cc80a82d62a39be7da44f3858c7174b SHA1 14e99dc334121287bb994fe19cdc30325d09a191 SHA256 e5cafb629c563d2eae23ceba2119e78138c5e3a619ac981ded9fc0286200ac26
 DIST unixcw-2.3.tgz 202048 RMD160 1ba7944d7a7fc92adf7ed1a83d706546e9eaa8be SHA1 2aece1e4b0660618537a94561344dd97026b7924 SHA256 124c60c6c7ef596a7c96c94a0e76204c7d986373564121155f0f206ad71f30a0
-EBUILD unixcw-2.3-r3.ebuild 1736 RMD160 95dde956e134caa67ef5d3c11e5933fa7340d37a SHA1 2a038bacab4ad74bf6367b23b42b4a3b5c69dcad SHA256 9a94560dfd97ef7c6580590f20551de82cfec77af867cefab058b3831485041a
-MISC ChangeLog 1659 RMD160 e3255b8d55444f1308ee6964f5671eb6550f4958 SHA1 79338c6c506ce7d3f94354ca1c4c318a885cc64c SHA256 965a13dfeac4a36ef08a6addd30e17ba7b101c5c92783bab24913327ff88bffe
+EBUILD unixcw-2.3-r4.ebuild 2032 RMD160 17d1a50e7b69bd1055bcc411e4298d21c6f83891 SHA1 52c3ccc3a952101d881dd22dbd519574fe5582b7 SHA256 8f1d18621c2df6c6c8b107a2983b98a9826a649a9628111f1361bbfd23c11667
+MISC ChangeLog 1823 RMD160 456c0db699880f2dd94dccfec05dd925e75229b3 SHA1 b85b3ad462d6264701ccca1cc903918c90ab96ba SHA256 ae50f8ea1f9b01c1bea64a13fde11bb5a581c1b9c497c132e592c09e9cd32423
 MISC metadata.xml 721 RMD160 358f506631160eb1ce60de0dcd5f664d7228a3d3 SHA1 4c1b6c2008868b71faa1a033e1d72b2598854cdf SHA256 d847debc753001714fab7b3df756ada41b7fed920b9afd10851d646c0fb00770
diff --git a/media-radio/unixcw/files/unixcw-2.3-config.patch b/media-radio/unixcw/files/unixcw-2.3-config.patch
index acd447bfe..23f6a1464 100644
--- a/media-radio/unixcw/files/unixcw-2.3-config.patch
+++ b/media-radio/unixcw/files/unixcw-2.3-config.patch
@@ -1,5 +1,5 @@
---- configure.ac.orig	2006-07-13 07:31:21.000000000 +0200
-+++ configure.ac	2008-06-08 14:30:41.000000000 +0200
+--- configure.ac.orig	2010-01-27 20:00:28.000000000 +0100
++++ configure.ac	2010-01-27 20:05:41.000000000 +0100
 @@ -46,8 +46,24 @@
  AC_SUBST(GZIP)
  AC_SUBST(LDCONFIG)
@@ -11,9 +11,9 @@
 +    [enable_ncurses="no"])
 +AC_MSG_RESULT($enable_ncurses)
 +
-+AC_MSG_CHECKING(--enable-qt3 argument)
-+AC_ARG_ENABLE(qt3,
-+    [  --enable-qt3       Include QT based Morse code Tutor],
++AC_MSG_CHECKING(--enable-qt4 argument)
++AC_ARG_ENABLE(qt4,
++    [  --enable-qt4       Include QT based Morse code Tutor],
 +    [enable_qt=$enableval],
 +    [enable_qt="no"])
 +AC_MSG_RESULT($enable_qt)
@@ -25,7 +25,7 @@
  
  # Checks for header files, and refuse to go on if no KIOCSOUND is available.
  AC_HEADER_STDC
-@@ -92,13 +108,17 @@
+@@ -92,49 +108,40 @@
  # Decide on which subdirectories to build; substitute into SUBDIRS.  Build
  # cwcp if curses is available, and xcwcp if Qt is available.
  SUBDIRS="cwlib cwutils cw cwgen"
@@ -39,16 +39,76 @@
  fi
 +fi
  
-+if test "$enable_qt3" = 'yes'; then
- # Look for $QTDIR.  If found, then look for moc, either on $PATH, or
- # in $QTDIR/bin.
- MOC_EARLIEST=3
-@@ -135,6 +155,8 @@
-   AC_MSG_WARN([Cannot find libqt - unable to build xcwcp])
-   AC_MSG_WARN([Hint: try setting a value for the QTDIR variable])
+-# Look for $QTDIR.  If found, then look for moc, either on $PATH, or
+-# in $QTDIR/bin.
+-MOC_EARLIEST=3
+-if test -n "$QTDIR" ; then
+-  AC_PATH_PROG(QTMOC, moc, , $QTDIR/bin:$PATH)
+-  if test -n "$QTMOC" ; then
+-    MOC_VERSION="`$QTMOC -v 2>&1 | sed -e 's;.*(Qt ;;' -e 's;).*;;'`"
+-    if test -n "$MOC_VERSION" ; then
+-      MOC_MAJOR="`echo $MOC_VERSION | sed -e 's;\..*;;'`"
+-      expr "$MOC_MAJOR" + 0 >/dev/null 2>/dev/null
+-      status=$?
+-      if test -n "$MOC_MAJOR" -a $status -eq 0 ; then
+-        if test "$MOC_MAJOR" -ge $MOC_EARLIEST ; then
+-          SUBDIRS="$SUBDIRS xcwcp"
+-          AC_SUBST(QTDIR)
+-          AC_SUBST(QTMOC)
+-        else
+-          AC_MSG_WARN([Found 'moc' $MOC_VERSION - unable to build xcwcp])
+-          AC_MSG_WARN([Hint: xcwcp requires 'moc' version >= $MOC_EARLIEST])
+-        fi
+-      else
+-        AC_MSG_WARN([Cannot find 'moc' version - unable to build xcwcp])
+-        AC_MSG_WARN([Hint: ensure 'moc' is in QTDIR/bin on your PATH])
+-      fi
+-    else
+-      AC_MSG_WARN([Cannot find 'moc' version - unable to build xcwcp])
+-      AC_MSG_WARN([Hint: ensure 'moc' is in QTDIR/bin on your PATH])
+-    fi
+-  else
+-    AC_MSG_WARN([Cannot find 'moc' - unable to build xcwcp])
+-    AC_MSG_WARN([Hint: ensure 'moc' is in QTDIR/bin on your PATH])
+-  fi
++if test "$enable_qt4" = 'yes'; then
++	dnl Look for Qt4 libs
++	PKG_CHECK_MODULES([QT4], ["QtCore QtGui Qt3Support"], [
++		AC_SUBST(QT4_CFLAGS)
++		AC_SUBST(QT4_LIBS)
++		], [
++			AC_MSG_ERROR([Qt4 libs not found])
++		])
++	dnl Look for moc, either on $PATH or in $QTDIR/bin
++	AC_PATH_PROG(QTMOC, moc, , $QTDIR/bin:$PATH)
++	if test -n "$QTMOC" ; then
++		dnl if libs and moc found
++		SUBDIRS="$SUBDIRS xcwcp"
++		AC_DEFINE([WANT_QT4], 1, [Want Qt4])
++		echo "enabling Qt4 support"
++	else
++		AC_MSG_ERROR([Cannot find 'moc'])
++		AC_DEFINE([WANT_QT4], 0, [No Qt4])
++	fi
+ else
+-  AC_MSG_WARN([Cannot find libqt - unable to build xcwcp])
+-  AC_MSG_WARN([Hint: try setting a value for the QTDIR variable])
++	AC_DEFINE([WANT_QT4], 0, [No Qt4])
++	echo "disabling Qt4 support"
  fi
-+fi
 +
  AC_SUBST(SUBDIRS)
  
  # Add -Wall, -W, -pedantic, and other paranoia to gcc command flags, and -Wall
+--- Makefile.inc.in.orig	2010-01-27 20:11:31.000000000 +0100
++++ Makefile.inc.in	2010-01-27 20:10:28.000000000 +0100
+@@ -37,7 +37,8 @@
+ AC_LD_LINKS_SO	= @LD_LINKS_SO@
+ AC_LD		= @LD@
+ AC_LN_S		= @LN_S@
+-
++AC_QT4_LIBS	= @QT4_LIBS@
++AC_QT4_CFLAGS	= @QT4_CFLAGS@
+ # Portability values.
+ INSTALL		= @INSTALL@
+ INSTALL_PROGRAM	= @INSTALL_PROGRAM@
diff --git a/media-radio/unixcw/unixcw-2.3-r3.ebuild b/media-radio/unixcw/unixcw-2.3-r4.ebuild
index 33c02df66..53f0d7576 100644
--- a/media-radio/unixcw/unixcw-2.3-r3.ebuild
+++ b/media-radio/unixcw/unixcw-2.3-r4.ebuild
@@ -2,36 +2,42 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI=2
+
 inherit autotools eutils multilib
 
 DESCRIPTION="A package of programs that fit together to form a morse code tutor program."
 HOMEPAGE="http://radio.linux.org.au/?sectpat=morse"
-SRC_URI="ftp://metalab.unc.edu/pub/Linux/apps/ham/morse/${P}.tgz"
+SRC_URI="ftp://metalab.unc.edu/pub/Linux/apps/ham/morse/${P}.tgz
+	qt4? (	http://gentooexperimental.org/~patrick/unixcw-2.3-qt3to4.patch )"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="ncurses suid"
-
-RDEPEND="ncurses? ( sys-libs/ncurses )"
+IUSE="ncurses suid qt4"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+RDEPEND="ncurses? ( sys-libs/ncurses )
+	qt4? ( x11-libs/qt-gui:4[qt3support] )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-destdir.patch \
 		"${FILESDIR}"/${P}-config.patch \
 		"${FILESDIR}"/${P}-parallel-make.patch \
 		"${FILESDIR}"/${P}--as-needed.patch \
 		"${FILESDIR}"/${P}-ldflags.patch \
 		"${FILESDIR}"/${P}-fPIC.patch
+	if use qt4 ; then
+		epatch "${DISTDIR}"/${P}-qt3to4.patch
+	fi
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	econf --libdir=/usr/$(get_libdir) \
-		$(use_enable ncurses)
-	emake || die "emake failed"
+		$(use_enable ncurses) \
+		$(use_enable qt4)
 }
 
 src_install() {
@@ -42,12 +48,15 @@ src_install() {
 		if use ncurses ; then
 			fperms 711 /usr/bin/cwcp || die "fperms failed"
 		fi
+		if use qt4 ; then
+			fperms 711 /usr/bin/xcwcp || die "fperms failed"
+		fi
 	fi
 }
 
 pkg_postinst() {
 	if use suid ; then
-		ewarn "You have choosen to install 'cw' and 'cwcp' setuid"
+		ewarn "You have choosen to install 'cw', 'cwcp' and 'xcwcp' setuid"
 		ewarn "by setting USE=suid."
 		ewarn "Be aware that this is a security risk and not recommended."
 		ewarn ""
@@ -55,8 +64,8 @@ pkg_postinst() {
 		ewarn "PC speaker for morse sidetone output. You can alternativly"
 		ewarn "drop USE=suid and use sudo."
 	else
-		elog "Be aware that 'cw' and 'cwcp' needs root access if you want"
-		elog "to use the PC speaker for morse sidetone output."
+		elog "Be aware that 'cw', 'cwcp'i and 'xcwcp' needs root access ifi"
+		elog "you want to use the PC speaker for morse sidetone output."
 		elog "You can call the programs via sudo for that (see 'man sudo')."
 	fi
 }