From 8c03f336d7cb9d913e5d4ed27e98e279fc97edfc Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 29 Jul 2013 09:04:56 +0200
Subject: [PATCH] xkeyboard-config: convert to new package format

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/x11/data/xkeyboard-config/build      | 45 -------------------
 packages/x11/data/xkeyboard-config/install    | 26 -----------
 .../xkeyboard-config/{meta => package.mk}     | 21 ++++++++-
 3 files changed, 19 insertions(+), 73 deletions(-)
 delete mode 100755 packages/x11/data/xkeyboard-config/build
 delete mode 100755 packages/x11/data/xkeyboard-config/install
 rename packages/x11/data/xkeyboard-config/{meta => package.mk} (71%)

diff --git a/packages/x11/data/xkeyboard-config/build b/packages/x11/data/xkeyboard-config/build
deleted file mode 100755
index de68801b9d..0000000000
--- a/packages/x11/data/xkeyboard-config/build
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program 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, or (at your option)
-#  any later version.
-#
-#  This Program 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.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-cd $PKG_BUILD
-
-# broken autoreconf
-  intltoolize --force
-
-XKBCOMP="/usr/bin/xkbcomp" \
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --without-xsltproc \
-            --enable-compat-rules \
-            --enable-runtime-deps \
-            --enable-nls \
-            --disable-rpath \
-            --with-xkb-base=$XORG_PATH_XKB \
-            --with-xkb-rules-symlink=xorg \
-            --with-gnu-ld \
-
-make
-make DESTDIR=`pwd`/.install install
diff --git a/packages/x11/data/xkeyboard-config/install b/packages/x11/data/xkeyboard-config/install
deleted file mode 100755
index 70fe5acbdd..0000000000
--- a/packages/x11/data/xkeyboard-config/install
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program 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, or (at your option)
-#  any later version.
-#
-#  This Program 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.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-mkdir -p $INSTALL/$XORG_PATH_XKB
-  cp -R $PKG_BUILD/.install/$XORG_PATH_XKB/* $INSTALL/$XORG_PATH_XKB
diff --git a/packages/x11/data/xkeyboard-config/meta b/packages/x11/data/xkeyboard-config/package.mk
similarity index 71%
rename from packages/x11/data/xkeyboard-config/meta
rename to packages/x11/data/xkeyboard-config/package.mk
index d115af77d1..022369d002 100644
--- a/packages/x11/data/xkeyboard-config/meta
+++ b/packages/x11/data/xkeyboard-config/package.mk
@@ -26,11 +26,28 @@ PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
 PKG_URL="http://www.x.org/releases/individual/data/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain util-macros xkbcomp"
+PKG_BUILD_DEPENDS_TARGET="toolchain util-macros xkbcomp"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/data"
 PKG_SHORTDESC="xkeyboard-config: X keyboard extension data files"
 PKG_LONGDESC="X keyboard extension data files."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_TARGET="XKBCOMP=/usr/bin/xkbcomp \
+                           --without-xsltproc \
+                           --enable-compat-rules \
+                           --enable-runtime-deps \
+                           --enable-nls \
+                           --disable-rpath \
+                           --with-xkb-base=$XORG_PATH_XKB \
+                           --with-xkb-rules-symlink=xorg \
+                           --with-gnu-ld"
+
+pre_build_target() {
+# broken autoreconf
+  ( cd $PKG_BUILD
+    intltoolize --force
+  )
+}