From af4da9e36957c328b873918b5d407daada4728af Mon Sep 17 00:00:00 2001 From: Jeremy Olexa Date: Tue, 23 Sep 2008 03:48:54 +0000 Subject: (non-maintainer commit) Fix compilation issues, version bump, and remove old. Thanks to Thomas Beierlein for fixing in bug #234090 (Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo x86_64) --- media-radio/svxlink/ChangeLog | 11 +++++- media-radio/svxlink/files/kde.patch | 19 ---------- .../svxlink/files/svxlink-fix-Makefile.diff | 18 ++++++++++ media-radio/svxlink/svxlink-070415.ebuild | 36 ------------------- media-radio/svxlink/svxlink-080102-r1.ebuild | 42 ++++++++++++++++++++++ media-radio/svxlink/svxlink-080102.ebuild | 36 ------------------- media-radio/svxlink/svxlink-080730.ebuild | 42 ++++++++++++++++++++++ 7 files changed, 112 insertions(+), 92 deletions(-) delete mode 100644 media-radio/svxlink/files/kde.patch create mode 100644 media-radio/svxlink/files/svxlink-fix-Makefile.diff delete mode 100644 media-radio/svxlink/svxlink-070415.ebuild create mode 100644 media-radio/svxlink/svxlink-080102-r1.ebuild delete mode 100644 media-radio/svxlink/svxlink-080102.ebuild create mode 100644 media-radio/svxlink/svxlink-080730.ebuild (limited to 'media-radio') 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 -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 svxlink-080102.ebuild: Fix SRC_URI, thanks to Tobias Blomberg for reporting, bug #216451 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-070415.ebuild deleted file mode 100644 index a2945c0e1672..000000000000 --- a/media-radio/svxlink/svxlink-070415.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2007 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 $ - -EAPI=1 - -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" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -RDEPEND="dev-lang/tcl - media-sound/gsm - x11-libs/qt:3" -DEPEND="${RDEPEND} - dev-libs/libsigc++:1.2" - -S=${WORKDIR}/${PN} - -src_compile() { - epatch "${FILESDIR}"/kde.patch - set-kdedir - emake || die "emake failed" -} - -src_install() { - emake \ - INSTALL_ROOT="${D}" \ - install || die "emake install failed" -} diff --git a/media-radio/svxlink/svxlink-080102-r1.ebuild b/media-radio/svxlink/svxlink-080102-r1.ebuild new file mode 100644 index 000000000000..34ea72bd1573 --- /dev/null +++ b/media-radio/svxlink/svxlink-080102-r1.ebuild @@ -0,0 +1,42 @@ +# 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-r1.ebuild,v 1.1 2008/09/23 03:48:53 darkside Exp $ + +EAPI=1 + +inherit kde-functions + +DESCRIPTION="Multi Purpose Voice Services System, including Qtel for EchoLink" +HOMEPAGE="http://svxlink.sourceforge.net/" +SRC_URI="mirror://sourceforge/svxlink/${P}.tar.gz" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~x86" +IUSE="" + +RDEPEND="dev-lang/tcl + media-sound/gsm + x11-libs/qt:3 + dev-libs/libsigc++:1.2 + media-libs/spandsp + dev-libs/popt" +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${PN}-fix-Makefile.diff" +} + +src_compile() { + set-kdedir + emake -j1 || die "emake failed" +} + +src_install() { + emake \ + INSTALL_ROOT="${D}" \ + install || die "emake install failed" +} diff --git a/media-radio/svxlink/svxlink-080102.ebuild b/media-radio/svxlink/svxlink-080102.ebuild deleted file mode 100644 index 98de6c817968..000000000000 --- a/media-radio/svxlink/svxlink-080102.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# 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 $ - -EAPI=1 - -inherit kde-functions - -DESCRIPTION="Multi Purpose Voice Services System, including Qtel for EchoLink" -HOMEPAGE="http://svxlink.sourceforge.net/" -SRC_URI="mirror://sourceforge/svxlink/${P}.tar.gz" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -RDEPEND="dev-lang/tcl - media-sound/gsm - x11-libs/qt:3" -DEPEND="${RDEPEND} - dev-libs/libsigc++:1.2" - -S=${WORKDIR}/${PN} - -src_compile() { - epatch "${FILESDIR}"/kde.patch - set-kdedir - emake -j1 || die "emake failed" -} - -src_install() { - emake \ - INSTALL_ROOT="${D}" \ - install || die "emake install failed" -} diff --git a/media-radio/svxlink/svxlink-080730.ebuild b/media-radio/svxlink/svxlink-080730.ebuild new file mode 100644 index 000000000000..4494ff213b77 --- /dev/null +++ b/media-radio/svxlink/svxlink-080730.ebuild @@ -0,0 +1,42 @@ +# 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-080730.ebuild,v 1.1 2008/09/23 03:48:53 darkside Exp $ + +EAPI=1 + +inherit kde-functions + +DESCRIPTION="Multi Purpose Voice Services System, including Qtel for EchoLink" +HOMEPAGE="http://svxlink.sourceforge.net/" +SRC_URI="mirror://sourceforge/svxlink/${P}.tar.gz" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~x86" +IUSE="" + +RDEPEND="dev-lang/tcl + media-sound/gsm + x11-libs/qt:3 + dev-libs/libsigc++:1.2 + media-libs/spandsp + dev-libs/popt" +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${PN}-fix-Makefile.diff" +} + +src_compile() { + set-kdedir + emake -j1 || die "emake failed" +} + +src_install() { + emake \ + INSTALL_ROOT="${D}" \ + install || die "emake install failed" +} -- cgit v1.2.3-65-gdbad