From d86ccde33c1a0aeb1551bd9c4f0ed85c71cc9980 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Wed, 8 Jan 2014 21:46:15 +0100
Subject: [PATCH] swig: convert to new package format, move package

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 .../devel/swig/meta => devel/swig/package.mk} | 34 +++++++++--
 packages/mediacenter/xbmc/package.mk          |  2 +-
 packages/toolchain/devel/swig/build           | 56 -------------------
 3 files changed, 31 insertions(+), 61 deletions(-)
 rename packages/{toolchain/devel/swig/meta => devel/swig/package.mk} (55%)
 delete mode 100755 packages/toolchain/devel/swig/build

diff --git a/packages/toolchain/devel/swig/meta b/packages/devel/swig/package.mk
similarity index 55%
rename from packages/toolchain/devel/swig/meta
rename to packages/devel/swig/package.mk
index 11c87eae36..4fce466f2f 100644
--- a/packages/toolchain/devel/swig/meta
+++ b/packages/devel/swig/package.mk
@@ -23,12 +23,38 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.swig.org"
 PKG_URL="$SOURCEFORGE_SRC/swig/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="ccache:host pcre:host"
+PKG_DEPENDS_HOST=""
+PKG_BUILD_DEPENDS_HOST="ccache:host pcre:host"
 PKG_PRIORITY="optional"
-PKG_SECTION="toolchain/devel"
+PKG_SECTION="devel"
 PKG_SHORTDESC="SWIG: a software development tool that connects programs written in C and C++ with a variety of high-level programming languages."
 PKG_LONGDESC="SWIG is a software development tool that connects programs written in C and C++ with a variety of high-level programming languages."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
+
+PKG_CONFIGURE_OPTS_HOST="--with-pcre-prefix=$ROOT/$TOOLCHAIN \
+                         --with-boost=no \
+                         --without-x \
+                         --without-tcl \
+                         --without-python \
+                         --without-python3 \
+                         --without-perl5 \
+                         --without-octave \
+                         --without-java \
+                         --without-gcj \
+                         --without-android \
+                         --without-guile \
+                         --without-mzscheme \
+                         --without-ruby \
+                         --without-php \
+                         --without-ocaml \
+                         --without-pike \
+                         --without-chicken \
+                         --without-csharp \
+                         --without-lua \
+                         --without-allegrocl \
+                         --without-clisp \
+                         --without-r \
+                         --without-go \
+                         --without-d"
diff --git a/packages/mediacenter/xbmc/package.mk b/packages/mediacenter/xbmc/package.mk
index 2ce04ab3b0..b8d98d36b3 100644
--- a/packages/mediacenter/xbmc/package.mk
+++ b/packages/mediacenter/xbmc/package.mk
@@ -24,7 +24,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://www.xbmc.org"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS="Python zlib bzip2 systemd ffmpeg libass curl rtmpdump fontconfig freetype libmad libogg libmodplug faad2 flac libmpeg2 taglib libxml2 service.openelec.settings"
-PKG_BUILD_DEPENDS_TARGET="toolchain boost Python zlib bzip2 systemd lzo pcre swig ffmpeg libass enca curl libssh rtmpdump fontconfig fribidi tinyxml libjpeg-turbo libpng tiff freetype jasper libmad libsamplerate libogg libcdio libmodplug faad2 flac libmpeg2 taglib libxml2 libxslt yajl sqlite"
+PKG_BUILD_DEPENDS_TARGET="toolchain boost Python zlib bzip2 systemd lzo pcre swig:host ffmpeg libass enca curl libssh rtmpdump fontconfig fribidi tinyxml libjpeg-turbo libpng tiff freetype jasper libmad libsamplerate libogg libcdio libmodplug faad2 flac libmpeg2 taglib libxml2 libxslt yajl sqlite"
 PKG_PRIORITY="optional"
 PKG_SECTION="mediacenter"
 PKG_SHORTDESC="xbmc: XBMC Mediacenter"
diff --git a/packages/toolchain/devel/swig/build b/packages/toolchain/devel/swig/build
deleted file mode 100755
index 623dc7e656..0000000000
--- a/packages/toolchain/devel/swig/build
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-#  OpenELEC is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  OpenELEC is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
-################################################################################
-
-. config/options $1
-
-setup_toolchain host
-
-cd $PKG_BUILD
-./configure --host=$HOST_NAME \
-            --build=$HOST_NAME \
-            --prefix=$ROOT/$TOOLCHAIN \
-            --with-pcre-prefix=$ROOT/$TOOLCHAIN \
-            --with-boost=no \
-            --without-x \
-            --without-tcl \
-            --without-python \
-            --without-python3 \
-            --without-perl5 \
-            --without-octave \
-            --without-java \
-            --without-gcj \
-            --without-android \
-            --without-guile \
-            --without-mzscheme \
-            --without-ruby \
-            --without-php \
-            --without-ocaml \
-            --without-pike \
-            --without-chicken \
-            --without-csharp \
-            --without-lua \
-            --without-allegrocl \
-            --without-clisp \
-            --without-r \
-            --without-go \
-            --without-d \
-
-make
-make install