media-radio/tucnak2: Improved documentation structure, USE flags and dependencies, add USE flag description to metadata wrt GLEP 56

svn path=/sunrise/; revision=6745

7 files changed, 117 insertions, 21 deletions

diff --git a/media-radio/tucnak2/ChangeLog b/media-radio/tucnak2/ChangeLog
index 2dea00c81..da5b9c04b 100644
--- a/media-radio/tucnak2/ChangeLog
+++ b/media-radio/tucnak2/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Aug 2008; Thomas Beierlein (TomJBE) <tb@forth-ev.de>
+  tucnak2-2.13.ebuild, +files/tucnak2-2.13-appname.diff,
+  files/tucnak2-2.13-config.diff, files/tucnak2-2.13-doc.diff, metadata.xml:
+  Improved documentation structure, USE flags and dependencies, add USE flag
+  description to metadata wrt GLEP 56
+
   09 Aug 2008; Thomas Beierlein (TomJBE <tb@forth-ev.de>
   -tucnak2-2.12.ebuild, -files/tucnak2-2.12-config.diff,
   -files/tucnak2-2.12-doc.diff, +tucnak2-2.13.ebuild,
diff --git a/media-radio/tucnak2/Manifest b/media-radio/tucnak2/Manifest
index ff82f7159..eda0bd6d4 100644
--- a/media-radio/tucnak2/Manifest
+++ b/media-radio/tucnak2/Manifest
@@ -1,6 +1,7 @@
-AUX tucnak2-2.13-config.diff 1144 RMD160 d852cc49fc042ace7c012e76c30ba62653156f27 SHA1 03da1a76ea73695b358c4b55918b408cc3550ede SHA256 770600dd469552b9c9dc801466723ff3dd948ad459451033bc95702294764b0f
-AUX tucnak2-2.13-doc.diff 322 RMD160 097d7b661b3a5428283c9511f8a09c7aac1f5809 SHA1 9edbab6e9850ff3fd41dab0e684631fe5900490c SHA256 0f0a161e2df07965efbe91aedc274e79ae052f8abf79567e813f392161714109
+AUX tucnak2-2.13-appname.diff 806 RMD160 aac0757f3f43e8a1d15d181fb85324d522a2e532 SHA1 7c5de44a16155dbad40bfee1624664fdb6f43469 SHA256 473fb39322558de6d6f5fadba2d297d2d33c504932420538c49b86064d9afe68
+AUX tucnak2-2.13-config.diff 2477 RMD160 dfbecdc8f90f48c851ee1d5635edfe436676e62c SHA1 11a444de0842cf37c4545eb37fa0e5ffa12043b6 SHA256 e8a656f41baee785b1b8b22856de1192fa694f3a3eeed19d0369a2330897b486
+AUX tucnak2-2.13-doc.diff 476 RMD160 13dd70e5df9cf94456594e6676c5d7268991ad66 SHA1 c416627e64f72187df7dcbb6749d5ae7dde69f16 SHA256 9e463ad9677f88584772991a40d7c856f4c70f7d6f7366f54fee485aa2417e28
 DIST tucnak2-2.13.tar.gz 2639024 RMD160 dcb29386d1229dc3ccef67246f0a79f3911e988a SHA1 2ea836a2e51114493696d39abe2561d17a8825f0 SHA256 7b7614352d03c12b33b9feca3bcc7be3c81892c675e9d85f302eee7d68f20e9e
-EBUILD tucnak2-2.13.ebuild 1091 RMD160 e146014eec5c8c25c240cdc2a2756b7867b4b736 SHA1 cffe7efd3b24b67831166e366e750118841ecb0b SHA256 ec27b714df64dcada6ce8304b0d1724f9e889d35bc73d1a59027077c044d2cef
-MISC ChangeLog 890 RMD160 26126208ea8d68894b1fc5a50597ba672ccdee3d SHA1 694b3a4db60ebddadf11c462607eb12690ab1f0d SHA256 8e8dbaee9fa705b00b734abde9c17ad2a29ac00fc74cb38f6e00bc55ad14c520
-MISC metadata.xml 290 RMD160 b9b86283c09349c8827faef7d3ef5f724a248e77 SHA1 ae1c8e62d75c94ff50b8a5391afb6008460963aa SHA256 380e26e9262298b9cb31e863a9ab641f6fbdc8c50bda2cf2e47fd399f9cb5e85
+EBUILD tucnak2-2.13.ebuild 1354 RMD160 ffbd65ccd976bde7ecf7374e946d8ad858bd9d2b SHA1 aeccad6f124f6a12fd72c475397e34ac7cda5949 SHA256 ab83c5c4dce699c733cac843a87bfabab2c7f3e60b401facfb7075db7dd00d72
+MISC ChangeLog 1198 RMD160 6905b1e7958e0d0a57984a8ca025802f7a873520 SHA1 ecd9acedd7eb769486c311b06642a5b7e63005b8 SHA256 b66e12ed32ee67fd77c670c5877a2da816e04ab0c9b52f96a6f6964cb4b6bbf2
+MISC metadata.xml 527 RMD160 5a67524b4ea226e9970807c6668428cd357b75a5 SHA1 ea0988467d43687c5a294aa9fab29b9144a8977f SHA256 adf7aaea2546b172cddff6f5f70f57e0d7003583249652bb3a75e237a68da131
diff --git a/media-radio/tucnak2/files/tucnak2-2.13-appname.diff b/media-radio/tucnak2/files/tucnak2-2.13-appname.diff
new file mode 100644
index 000000000..cbed66173
--- /dev/null
+++ b/media-radio/tucnak2/files/tucnak2-2.13-appname.diff
@@ -0,0 +1,21 @@
+--- src/Makefile.am.orig	2008-08-12 20:39:03.000000000 +0200
++++ src/Makefile.am	2008-08-12 20:39:23.000000000 +0200
+@@ -1,7 +1,7 @@
+ #bin_PROGRAMS = tucnak soundwrapper stucnak
+-bin_PROGRAMS = tucnak soundwrapper 
++bin_PROGRAMS = tucnak2 soundwrapper 
+ 
+-tucnak_SOURCES = adif.c alsa.c bfu.c charsets.c codepage.h codepage.inc \
++tucnak2_SOURCES = adif.c alsa.c bfu.c charsets.c codepage.h codepage.inc \
+ 	control.c cor.c cor.h cor.inc \
+ 	cwdaemon.c cwdb.c cwwindow.c davac4.c dsp.c dwdb.c dxc.c ebw.c edi.c \
+ 	error.c fifo.c font.c font.inc gfx_png.c ghash.c \
+@@ -14,7 +14,7 @@
+ 	ssbd.c stats.c subwin.c terminal.c threadpipe.c titlpage.c \
+ 	ttys.c txts.c txts.h txts.inc uni_7b.inc wizz.c
+ 
+-tucnak_LDADD = @TUCNAK_LDADD@
++tucnak2_LDADD = @TUCNAK_LDADD@
+ 
+ soundwrapper_SOURCES = soundwrapper.c	
+ 
diff --git a/media-radio/tucnak2/files/tucnak2-2.13-config.diff b/media-radio/tucnak2/files/tucnak2-2.13-config.diff
index 871819928..4d9f3fdd4 100644
--- a/media-radio/tucnak2/files/tucnak2-2.13-config.diff
+++ b/media-radio/tucnak2/files/tucnak2-2.13-config.diff
@@ -1,5 +1,5 @@
---- configure.in.orig	2008-07-22 12:28:01.000000000 +0200
-+++ configure.in	2008-08-09 11:30:59.000000000 +0200
+--- configure.in.orig	2008-08-13 08:23:37.000000000 +0200
++++ configure.in	2008-08-13 08:29:23.000000000 +0200
 @@ -117,7 +117,10 @@
                        AC_MSG_ERROR([glib is installed but gthread not ?]))
  fi    
@@ -11,7 +11,7 @@
  # check for SDL
  SDL_VERSION=1.2.0
  tucnak_sdl_ver="";
-@@ -129,6 +132,7 @@
+@@ -129,10 +132,14 @@
                tucnak_odebs="$tucnak_odebs libsdl-dev"
                tucnak_sdl="no"]
              )
@@ -19,18 +19,68 @@
  
  export PKG_CONFIG=/usr/bin/pkg-config
  
-@@ -256,6 +260,10 @@
+ 
++AC_ARG_WITH([png], AS_HELP_STRING([--without-png], [Build without PNG support (default: test)]))
++
++if test "x$with_png" != "xno"; then
+ # check for libpng
+ tucnak_libpng_ver=""
+ PKG_CHECK_MODULES(LIBPNG, libpng12 > 1.2.0,
+@@ -140,7 +147,7 @@
+               tucnak_libpng_ver=`$PKG_CONFIG --modversion 'libpng12 > 1.2.0'` ], 
+             [ tucnak_olibs="$tucnak_olibs libpng"
+               tucnak_odebs="$tucnak_odebs libpng-dev"])
+-
++fi
+ 
+ # check for iconv
+ if test x"$tucnak_sdl" = x"yes"; then
+@@ -178,6 +185,11 @@
+     tucnak_iconv="not needed"
+ fi    
+     
++
++AC_ARG_WITH([gpm], AS_HELP_STRING([--without-gpm], [Build without GPM support (default: test)]))
++tucnak_libgpm="no"
++
++if test "x$with_gpm" != "xno"; then
+ # check for libgpm
+ tucnak_libgpm="no"
+ tucnak_old_LIBS=$LIBS
+@@ -203,7 +215,7 @@
+       tucnak_odebs="$tucnak_odebs libgpmg1-dev"]) 
+     rm -f conftest.libgpm.out
+ fi    
+-
++fi
+ 
+ # check for libsndfile
+ libsndfile_LIBS=$LIBS
+@@ -218,6 +230,10 @@
+               tucnak_mdebs="$tucnak_mdebs libsndfile-dev"])
+ 
+ 
++AC_ARG_WITH([alsa], AS_HELP_STRING([--without-alsa], [Build without alsa library for audio i/o (default: test)]))
++tucnak_alsa="no"
++
++if test "x$with_alsa" != "xno"; then
+ # check for alsa
+ tucnak_alsa_ver=""
+ AC_MSG_CHECKING(for alsa)
+@@ -255,7 +271,12 @@
+     tucnak_olibs="$tucnak_olibs libasound"
      tucnak_odebs="$tucnak_odebs libasound-dev"]
  )              
- 
-+AC_ARG_ENABLE([ftdi], AS_HELP_STRING([--disable-ftdi], [Disable FTDI support for usb to serial converter (default: test)]))
-+tucnak_ftdi="no"
++fi
 +
-+if test "x$enable_ftdi" != "xno"; then
++AC_ARG_WITH([ftdi], AS_HELP_STRING([--without-ftdi], [Build without FTDI support for usb to serial converter (default: test)]))
++tucnak_ftdi="no"
+ 
++if test "x$with_ftdi" != "xno"; then
  # check for libftdi
  tucnak_ftdi_ver=""
  tucnak_ftdi_new=""
-@@ -275,6 +283,7 @@
+@@ -275,6 +296,7 @@
                    tucnak_ftdi_new="new"],
                  [ tucnak_ftdi_new="old"])
  fi
diff --git a/media-radio/tucnak2/files/tucnak2-2.13-doc.diff b/media-radio/tucnak2/files/tucnak2-2.13-doc.diff
index b3db98e5f..5702be03a 100644
--- a/media-radio/tucnak2/files/tucnak2-2.13-doc.diff
+++ b/media-radio/tucnak2/files/tucnak2-2.13-doc.diff
@@ -1,5 +1,11 @@
 --- Makefile.am.orig	2008-06-29 13:55:18.000000000 +0200
 +++ Makefile.am	2008-06-29 13:56:03.000000000 +0200
+@@ -1,4 +1,4 @@
+-SUBDIRS=data doc share src 
++SUBDIRS=data share src 
+ 
+ MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in stamp-h.in
+ 
 @@ -4,10 +4,6 @@
  
  EXTRA_DIST = COPYING INSTALL rebuild debian/* intl/* win32/* pkg/*
diff --git a/media-radio/tucnak2/metadata.xml b/media-radio/tucnak2/metadata.xml
index fae7d74a9..8676b0135 100644
--- a/media-radio/tucnak2/metadata.xml
+++ b/media-radio/tucnak2/metadata.xml
@@ -6,4 +6,10 @@
 		<email>maintainer-needed@gentoo.org</email>
 		<name>Default assignee for orphaned packages</name>
 	</maintainer>
+	<use>
+		<flag name='alsa'>Enable alsa audio i/o (otherwise use only OSS)</flag>
+		<flag name='ftdi'>Enable support for USB FTDI chips</flag>
+		<flag name='gpm'>Adds support for sys-libs/gpm (Console-based mouse
+		driver)</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-radio/tucnak2/tucnak2-2.13.ebuild b/media-radio/tucnak2/tucnak2-2.13.ebuild
index f9efacbae..7b4351d0c 100644
--- a/media-radio/tucnak2/tucnak2-2.13.ebuild
+++ b/media-radio/tucnak2/tucnak2-2.13.ebuild
@@ -11,14 +11,15 @@ SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="ftdi sdl"
+IUSE="alsa ftdi gpm"
 
 RDEPEND=">=dev-libs/glib-2
-	sys-libs/gpm
 	media-libs/libsndfile
-	>=media-libs/libpng-1.2
-	sdl? ( >=media-libs/libsdl-1.2 )
-	ftdi? ( dev-embedded/libftdi )"
+	>=media-libs/libsdl-1.2
+	alsa? ( media-libs/alsa-lib )
+	ftdi? ( dev-embedded/libftdi )
+	gpm? ( sys-libs/gpm )
+	>=media-libs/libpng-1.2"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
@@ -26,22 +27,27 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-doc.diff" \
+	    "${FILESDIR}/${P}-appname.diff" \
 	    "${FILESDIR}/${P}-config.diff"
 	eautoreconf
 }
 
 
 src_compile() {
-	econf $(use_with sdl) $(use_enable ftdi)
+	econf $(use_with alsa) $(use_with ftdi) \
+		$(use_with gpm) --with-sdl
 	emake || die "emake failed"
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS ChangeLog TODO || die "dodoc failed"
+	doman debian/tucnak2.1 || die "doman failed"
+	dodoc AUTHORS ChangeLog TODO doc/NAVOD.sxw doc/NAVOD.pdf || die "dodoc failed"
 }
 
 pkg_postinst() {
+	elog "In order to use sound with tucnak2 add yourself to the audio group"
+	elog ""
 	elog "tucnak2 can be used with the following additional packages:"
 	elog "	   media-radio/cwdaemon  : Morse output via code cwdaemon"
 	elog "                             (No need to recompile)"