Merge branch 'master' of git+ssh://openadk.org/git/openadk

10 files changed, 14 insertions, 76 deletions

diff --git a/package/ant/Makefile b/package/ant/Makefile
index 625853bd8..b5b7d86b9 100644
--- a/package/ant/Makefile
+++ b/package/ant/Makefile
@@ -11,6 +11,8 @@ PKG_DESCR:=		ant utility
 PKG_SECTION:=		lang
 PKG_SITES:=		http://archive.apache.org/dist/ant/source/
 
+PKG_CFLINE_ANT:=	depends on ADK_HOST_ONLY
+
 DISTFILES:=             apache-$(PKG_NAME)-$(PKG_VERSION)-src.tar.bz2
 WRKDIST=                $(WRKDIR)/apache-$(PKG_NAME)-$(PKG_VERSION)
 
diff --git a/package/cmake/Makefile b/package/cmake/Makefile
index 6cdf53b0b..c444eba19 100644
--- a/package/cmake/Makefile
+++ b/package/cmake/Makefile
@@ -12,13 +12,12 @@ PKG_SECTION:=		lang
 PKG_URL:=		http://www.cmake.org/
 PKG_SITES:=		http://www.cmake.org/files/v2.8/
 
-PKG_CFLINE_CMAKE:=	depends on ADK_BROKEN
+PKG_CFLINE_CMAKE:=	depends on ADK_HOST_ONLY
 
 include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call HOST_template,CMAKE,cmake,$(PKG_VERSION)-${PKG_RELEASE}))
-$(eval $(call PKG_template,CMAKE,cmake,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 HOST_STYLE:=		manual
 CONFIG_STYLE:=		manual
@@ -35,13 +34,5 @@ cmake-hostinstall:
 	$(INSTALL_BIN) $(WRKBUILD)/bin/cmake \
 		$(STAGING_HOST_DIR)/usr/bin
 
-do-configure:
-	(cd $(WRKBUILD); ./configure --prefix=/usr)
-
-cmake-install:
-	$(INSTALL_DIR) $(IDIR_CMAKE)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/cmake \
-		$(IDIR_CMAKE)/usr/bin
-
 include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/ecj/Makefile b/package/ecj/Makefile
index 8e4dc6f94..8bba31865 100644
--- a/package/ecj/Makefile
+++ b/package/ecj/Makefile
@@ -10,6 +10,8 @@ PKG_MD5SUM:=		c474fa9d0c35a24037c23b6e476862c1
 PKG_DESCR:=		ecj java compiler
 PKG_SECTION:=		lang
 
+PKG_CFLINE_ECJ:=	depends on ADK_HOST_ONLY
+
 NO_DISTFILES:=		1
 
 include $(TOPDIR)/mk/host.mk
diff --git a/package/fastjar/Makefile b/package/fastjar/Makefile
index 0f4c1a50c..fe73820fa 100644
--- a/package/fastjar/Makefile
+++ b/package/fastjar/Makefile
@@ -11,6 +11,8 @@ PKG_DESCR:=		fastjar utility
 PKG_SECTION:=		lang
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=fastjar/}
 
+PKG_CFLINE_FASTJAR:=	depends on ADK_HOST_ONLY
+
 include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
diff --git a/package/gcj/Makefile b/package/gcj/Makefile
index 15c56b204..8273f06b2 100644
--- a/package/gcj/Makefile
+++ b/package/gcj/Makefile
@@ -11,6 +11,8 @@ PKG_DESCR:=		GNU java compiler
 PKG_SECTION:=		lang
 PKG_SITES:=		${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/}
 
+PKG_CFLINE_GCJ:=	depends on ADK_HOST_ONLY
+
 DISTFILES:=		gcc-$(PKG_VERSION).tar.bz2
 
 WRKDIST=		${WRKDIR}/gcc-${PKG_VERSION}
diff --git a/package/gettext-tiny/Makefile b/package/gettext-tiny/Makefile
index b483b838c..a09dc3be5 100644
--- a/package/gettext-tiny/Makefile
+++ b/package/gettext-tiny/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		gettext-tiny
-PKG_VERSION:=		0.0.3
+PKG_VERSION:=		0.0.4
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		3af6fd8a9042603b61f634b1c6f49e7e
+PKG_MD5SUM:=		09f6a74945df5961080234f7851f352c
 PKG_DESCR:=		Gettext stub and replacement
 PKG_SECTION:=		libs
 PKG_BUILDDEP:=		gettext-tiny-host
diff --git a/package/ruby-ldap/Makefile b/package/ruby-ldap/Makefile
index 6289c1cb8..4a332b32e 100644
--- a/package/ruby-ldap/Makefile
+++ b/package/ruby-ldap/Makefile
@@ -14,6 +14,8 @@ PKG_BUILDDEP:=		ruby openldap
 PKG_URL:=		http://ruby-ldap.sourceforge.net/
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=ruby-ldap/0.9.8/}
 
+PKG_CFLINE_RUBY_LDAP:=	depends on ADK_BROKEN
+
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
 include $(TOPDIR)/mk/package.mk
diff --git a/package/scons/Makefile b/package/scons/Makefile
index 3f8958d40..9e92c9917 100644
--- a/package/scons/Makefile
+++ b/package/scons/Makefile
@@ -13,7 +13,7 @@ PKG_BUILDDEP:=		bzip2-host python2-host
 PKG_URL:=		http://www.scons.org
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=scons/}
 
-PKG_ARCH_DEPENDS:=	native
+PKG_CFLINE_SCONS:=	depends on ADK_HOST_ONLY
 
 include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
diff --git a/package/upower/Makefile b/package/upower/Makefile
deleted file mode 100644
index 99c721879..000000000
--- a/package/upower/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=		upower
-PKG_VERSION:=		0.99.0
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		14f43bc13353e23e7280863f33ac50d2
-PKG_DESCR:=		powermanagement
-PKG_SECTION:=		misc
-PKG_BUILDDEP:=		glib dbus-glib polkit eudev
-PKG_DEPENDS:=		glib dbus-glib polkit libgudev
-PKG_URL:=		http://upower.freedesktop.org/
-PKG_SITES:=		http://upower.freedesktop.org/releases/
-
-DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.xz
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,UPOWER,upower,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIGURE_ARGS+=	--without-systemdutildir \
-			--disable-rpath
-
-upower-install:
-	$(INSTALL_DIR) $(IDIR_UPOWER)/etc
-	$(CP) $(WRKINST)/etc/* \
-		$(IDIR_UPOWER)/etc
-	$(INSTALL_DIR) $(IDIR_UPOWER)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libupower*.so* \
-		$(IDIR_UPOWER)/usr/lib
-	$(INSTALL_DIR) $(IDIR_UPOWER)/usr/sbin
-	$(INSTALL_BIN) $(WRKINST)/usr/libexec/upowerd \
-		$(IDIR_UPOWER)/usr/sbin
-	$(INSTALL_DIR) $(IDIR_UPOWER)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/upower \
-		$(IDIR_UPOWER)/usr/bin
-	$(INSTALL_DIR) $(IDIR_UPOWER)/usr/share/dbus-1
-	$(CP) $(WRKINST)/usr/share/dbus-1/* \
-		$(IDIR_UPOWER)/usr/share/dbus-1
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/upower/patches/patch-Makefile_in b/package/upower/patches/patch-Makefile_in
deleted file mode 100644
index 7709ee096..000000000
--- a/package/upower/patches/patch-Makefile_in
+++ /dev/null
@@ -1,20 +0,0 @@
---- upower-0.99.0.orig/Makefile.in	2013-10-29 11:39:06.000000000 +0100
-+++ upower-0.99.0/Makefile.in	2014-01-10 17:09:06.000000000 +0100
-@@ -199,7 +199,7 @@ am__define_uniq_tagged_files = \
- ETAGS = etags
- CTAGS = ctags
- CSCOPE = cscope
--DIST_SUBDIRS = etc libupower-glib src doc tools po rules
-+DIST_SUBDIRS = etc libupower-glib src tools po rules
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- distdir = $(PACKAGE)-$(VERSION)
- top_distdir = $(distdir)
-@@ -439,7 +439,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- udevrulesdir = @udevrulesdir@
- ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
--SUBDIRS = etc libupower-glib src doc tools po $(am__append_1)
-+SUBDIRS = etc libupower-glib src tools po $(am__append_1)
- EXTRA_DIST = \
- 	HACKING 			\
- 	ChangeLog