(non-maintainer commit) Fix compilation issues, version bump, and remove old. Thanks to Thomas Beierlein for fixing in bug #234090

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo x86_64

6 files changed, 58 insertions, 38 deletions

diff --git a/media-radio/svxlink/ChangeLog b/media-radio/svxlink/ChangeLog
index 7313b00d3386..c0ed3c1c18bd 100644
--- a/media-radio/svxlink/ChangeLog
+++ b/media-radio/svxlink/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-radio/svxlink
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/svxlink/ChangeLog,v 1.4 2008/06/11 22:02:15 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/svxlink/ChangeLog,v 1.5 2008/09/23 03:48:53 darkside Exp $
+
+*svxlink-080730 (23 Sep 2008)
+*svxlink-080102-r1 (23 Sep 2008)
+
+  23 Sep 2008; Jeremy Olexa <darkside@gentoo.org> -files/kde.patch,
+  +files/svxlink-fix-Makefile.diff, -svxlink-070415.ebuild,
+  -svxlink-080102.ebuild, +svxlink-080102-r1.ebuild, +svxlink-080730.ebuild:
+  (non-maintainer commit) Fix compilation issues, version bump, and remove
+  old. Thanks to Thomas Beierlein for fixing in bug #234090
 
   11 Jun 2008; Jeremy Olexa <darkside@gentoo.org> svxlink-080102.ebuild:
   Fix SRC_URI, thanks to Tobias Blomberg for reporting, bug #216451
diff --git a/media-radio/svxlink/Manifest b/media-radio/svxlink/Manifest
index a88faf984371..752370d9eeda 100644
--- a/media-radio/svxlink/Manifest
+++ b/media-radio/svxlink/Manifest
@@ -1,7 +1,7 @@
-AUX kde.patch 749 RMD160 ba253c4672d67c6549b45c991d0d30efae95cee4 SHA1 ed364556d294d4a064ebeb16e39f23ecdeeb5186 SHA256 d4c81ba82eb641b117d492f98c7f2357ddf2f2ff6d4923a468d7087a30efe3c0
-DIST svxlink-070415.tar.gz 409397 RMD160 15ab91ce5f754d97db73821b28e0d8ea73271e9b SHA1 ca6381660f68b518b340d0765e64b5302b9aea9b SHA256 c8e3845c925b06a27f1b19e6a8cd6979e0a13d874d65cfa90e6fe707be21f296
+AUX svxlink-fix-Makefile.diff 511 RMD160 e09f6f72bccff74c3b7fcd9c28a94c574f71612a SHA1 d9d0918e66ecfababd15ea468824553738eb6595 SHA256 3fad27f574fc9bff0b04dd5da7471fce43596b682a7aaa5ce7f76b5590f1c657
 DIST svxlink-080102.tar.gz 416383 RMD160 869fe904eb00514a02c54af6f060a4404630cc1f SHA1 f87b8557f3adf819dcfcaddd408c3e3ee192be6e SHA256 2701a486c2ec670c3e2bbdd5e4b0842b1b3ead3bbb8790688265ca2e51e04b07
-EBUILD svxlink-070415.ebuild 805 RMD160 bd8de9cbb8beb12132f268bd101707635c1e1762 SHA1 699a7628043c8b9a2ad17598f191ebffa3b02543 SHA256 d23ea3acca2da222ad3bacf83f08ea635b7efbb5d6ba12fe73703399a52fb60b
-EBUILD svxlink-080102.ebuild 798 RMD160 dfc1c425a9301a62ed0083f04cc846dd5123a6e1 SHA1 5b7d1a4459ef5312379e260ae696c348e9e3a3c8 SHA256 f8c25594caf9ef2c884d2238c9ea001d6f46ac76b2eba6c10cc232d53b290f39
-MISC ChangeLog 762 RMD160 8c87d37739e5418c47be568ef1eaff727901ba50 SHA1 65e9c34ba0b3de648968ccede3bbb45a9716cdcc SHA256 f71594fef8c9e1c96a12bd96c2a204e892761019995387b79a031cd8a61e8cd5
+DIST svxlink-080730.tar.gz 484464 RMD160 1a65d361e200fda309a1ce11f88c39a8e37d535d SHA1 edd7318211d35894124aaa1e071a703041e3a4fd SHA256 68039508fa77ac3daf648bc26b99029c867068a03b43aab6650101c2fc2ef107
+EBUILD svxlink-080102-r1.ebuild 891 RMD160 b3882e75f7780260e69d32d8ec08e27e5ada055e SHA1 5d6b79136d4cad0842dba11ea93839665bc452ab SHA256 90a07bf2a95d83729c20a78948836a917563019a0689e413b1c16d028c94d001
+EBUILD svxlink-080730.ebuild 888 RMD160 cb84585972a345f6d4d71114e4f1b69bfa4bd90e SHA1 933d3cafe0862ba9cb2a6ef3ef74f776dbac7504 SHA256 7dd7d76e8fb34ab7ecbd2ee7032350773574791fd9681ac65094dc9b0fcd0fc9
+MISC ChangeLog 1167 RMD160 bcc1068d15b8312cfc1f221ad270773e73079681 SHA1 a1832b0c989a4bdd4edc0e6e5d0465a3a7686a38 SHA256 989d619d24ecfef5d8efe65588b5213c0540d48ec0075470fd5c99956841599e
 MISC metadata.xml 569 RMD160 754ed1324af1015713873dfe99b869472551f9af SHA1 cc1ad26d8b879ffd422e1d365cc9f02e653a311c SHA256 b8ddf42532511911fb36967cb6ccd670345bf004255259cb7e7ecfb35989011b
diff --git a/media-radio/svxlink/files/kde.patch b/media-radio/svxlink/files/kde.patch
deleted file mode 100644
index de998e4b378f..000000000000
--- a/media-radio/svxlink/files/kde.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- svxlink/create_config.sh	2006-12-04 21:42:58.000000000 +0100
-+++ svxlink.patched/create_config.sh	2007-12-16 19:08:15.000000000 +0100
-@@ -47,13 +47,13 @@
- # Check for KDE
- info "--- Checking for KDE..."
- if [ "${KDEDIR}" != "" ]; then
--  if [ -r "${KDEDIR}/include/kde/kdeversion.h" ]; then
--    KDEINC=${KDEDIR}/include/kde
-+  if [ -r "${KDEDIR}/include/kdeversion.h" ]; then
-+    KDEINC=${KDEDIR}/include
-     KDE_VERSION_INC=${KDEINC}/kdeversion.h
-   elif [ -r "${KDEDIR}/include/kapp.h" ]; then
-     KDEINC=${KDEDIR}/include
-     KDE_VERSION_INC=${KDEINC}/kapp.h
--  elif [ -r "${KDEDIR}/include/kde/kapp.h" ]; then
-+  elif [ -r "${KDEDIR}/include/kapp.h" ]; then
-     KDEINC=${KDEDIR}/include/kde
-     KDE_VERSION_INC=${KDEINC}/kapp.h
-   fi
diff --git a/media-radio/svxlink/files/svxlink-fix-Makefile.diff b/media-radio/svxlink/files/svxlink-fix-Makefile.diff
new file mode 100644
index 000000000000..faccb22c6578
--- /dev/null
+++ b/media-radio/svxlink/files/svxlink-fix-Makefile.diff
@@ -0,0 +1,18 @@
+# fixes the problem with not building '.config' fiel if you have an '.config'
+# in the filesystem root '/' (see bug 234090)
+
+--- Makefile.orig	2007-08-23 23:43:28.000000000 +0200
++++ Makefile	2008-08-12 21:53:59.000000000 +0200
+@@ -255,6 +255,12 @@
+ 	fi
+ endif
+ 
++#
++# Create the .config file if it does not exist
++#
++$(ROOT)/.config:	$(ROOT)/create_config.sh
++	echo -e --- Creating $(BOLD)$@$(NBOLD)...
++	$(ROOT)/create_config.sh $@
+ 
+ #
+ # Create a cache file containing the relative path to the project root
diff --git a/media-radio/svxlink/svxlink-070415.ebuild b/media-radio/svxlink/svxlink-080102-r1.ebuild
index a2945c0e1672..34ea72bd1573 100644
--- a/media-radio/svxlink/svxlink-070415.ebuild
+++ b/media-radio/svxlink/svxlink-080102-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/svxlink/svxlink-070415.ebuild,v 1.2 2007/12/16 23:42:19 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/svxlink/svxlink-080102-r1.ebuild,v 1.1 2008/09/23 03:48:53 darkside Exp $
 
 EAPI=1
 
@@ -8,7 +8,7 @@ inherit kde-functions
 
 DESCRIPTION="Multi Purpose Voice Services System, including Qtel for EchoLink"
 HOMEPAGE="http://svxlink.sourceforge.net/"
-SRC_URI="mirror://sourceforge/svxlink/svxlink-070415.tar.gz"
+SRC_URI="mirror://sourceforge/svxlink/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
@@ -17,16 +17,22 @@ IUSE=""
 
 RDEPEND="dev-lang/tcl
 	media-sound/gsm
-	x11-libs/qt:3"
+	x11-libs/qt:3
+	dev-libs/libsigc++:1.2
+	media-libs/spandsp
+	dev-libs/popt"
 DEPEND="${RDEPEND}
-	 dev-libs/libsigc++:1.2"
+	dev-util/pkgconfig"
 
-S=${WORKDIR}/${PN}
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-fix-Makefile.diff"
+}
 
 src_compile() {
-	epatch "${FILESDIR}"/kde.patch
 	set-kdedir
-	emake || die "emake failed"
+	emake -j1 || die "emake failed"
 }
 
 src_install() {
diff --git a/media-radio/svxlink/svxlink-080102.ebuild b/media-radio/svxlink/svxlink-080730.ebuild
index 98de6c817968..4494ff213b77 100644
--- a/media-radio/svxlink/svxlink-080102.ebuild
+++ b/media-radio/svxlink/svxlink-080730.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/svxlink/svxlink-080102.ebuild,v 1.2 2008/06/11 22:02:15 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/svxlink/svxlink-080730.ebuild,v 1.1 2008/09/23 03:48:53 darkside Exp $
 
 EAPI=1
 
@@ -17,14 +17,20 @@ IUSE=""
 
 RDEPEND="dev-lang/tcl
 	media-sound/gsm
-	x11-libs/qt:3"
+	x11-libs/qt:3
+	dev-libs/libsigc++:1.2
+	media-libs/spandsp
+	dev-libs/popt"
 DEPEND="${RDEPEND}
-	 dev-libs/libsigc++:1.2"
+	dev-util/pkgconfig"
 
-S=${WORKDIR}/${PN}
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-fix-Makefile.diff"
+}
 
 src_compile() {
-	epatch "${FILESDIR}"/kde.patch
 	set-kdedir
 	emake -j1 || die "emake failed"
 }