From b1511fa8aa7b1be371a1daa6ec5ca35824d6be19 Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Mon, 17 Oct 2011 11:15:24 +0000
Subject: [PATCH] [backfire/packages] deluge: merge [28470]

SVN-Revision: 28471
---
 net/deluge/Makefile | 101 +++++++++++++++++++++++++++-----------------
 1 file changed, 63 insertions(+), 38 deletions(-)

diff --git a/net/deluge/Makefile b/net/deluge/Makefile
index 8f8ac5d1d8..bf3bba4877 100644
--- a/net/deluge/Makefile
+++ b/net/deluge/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008 OpenWrt.org
+# Copyright (C) 2008-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,37 +9,41 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=deluge
 PKG_VERSION:=1.2.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://download.deluge-torrent.org/source/
 PKG_MD5SUM:=cec6b48f0abd79ea2cff3815a1124192
 
+PKG_BUILD_DEPENDS:=distribute/host
+
 include $(INCLUDE_DIR)/package.mk
 $(call include_mk, python-package.mk)
 
-define Package/deluge
+define Package/deluge/Default
   SUBMENU:=BitTorrent
   SECTION:=net
   CATEGORY:=Network
-  TITLE:=deluge-daemon
+  TITLE:=A lightweight BitTorrent client
   URL:=http://deluge-torrent.org/
-  DEPENDS:=+python +rblibtorrent +python2-chardet +pyxdg +twisted +twisted-web +pyopenssl +distribute
 endef
 
-define Package/deluge/config
-	config DELUGE_WITH_WEBUI
-		bool "Include the web interface"
-		select PACKAGE_mako
-		default n
-
-	config DELUGE_WITH_GTKUI
-		bool "Include the GTK interface"
-		depends PACKAGE_pygame
-		depends PACKAGE_pygobject
-		depends PACKAGE_pygtk
-		depends PACKAGE_librsvg
-		default n
+define Package/deluge
+$(call Package/deluge/Default)
+  TITLE+= (console UI & daemon)
+  DEPENDS+=+python +rblibtorrent +python2-chardet +pyxdg +twisted +twisted-web +pyopenssl
+endef
+
+define Package/deluge-ui-gtk
+$(call Package/deluge/Default)
+  TITLE+= (GTK+ UI)
+  DEPENDS+=deluge +python-gtk
+endef
+
+define Package/deluge-ui-web
+$(call Package/deluge/Default)
+  TITLE+= (Web UI)
+  DEPENDS+=deluge +mako
 endef
 
 define Package/deluge/description
@@ -50,37 +54,58 @@ define Package/deluge/conffiles
 /etc/config/deluge
 endef
 
-define Build/Prepare
-	$(call Build/Prepare/Default)
-	$(CP) -a files $(PKG_BUILD_DIR)
-	find $(PKG_BUILD_DIR)/files -name 'CVS' -o -name '.svn' -o -name '*~' | $(XARGS) rm -rf
-endef
-
 define Build/Compile
 	$(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR))
 
-	$(if $(CONFIG_DELUGE_WITH_WEBUI),,$(RM) "$(PKG_INSTALL_DIR)/usr/bin/deluge-web" ; \
-		$(RM) "$(PKG_INSTALL_DIR)/usr/share/man/man1/deluge-web.1" ; \
-		$(RM) -r "$(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/deluge/ui/web")
-
-	$(if $(CONFIG_DELUGE_WITH_GTKUI),,$(RM) "$(PKG_INSTALL_DIR)/usr/bin/deluge-gtk" ; \
-		$(RM) "$(PKG_INSTALL_DIR)/usr/share/man/man1/deluge-gtk.1" ; \
-		$(RM) -r "$(PKG_INSTALL_DIR)/usr/share/applications" ; \
-		$(RM) -r "$(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/deluge/ui/gtkui")
+	$(SED) 's,#!$(STAGING_DIR)/host/bin/$(PYTHON),#!/usr/bin/$(PYTHON),' $(PKG_INSTALL_DIR)/usr/bin/*
 endef
 
 define Package/deluge/install
-	$(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) $(1)/usr/bin $(1)/etc/config $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)
 	$(CP) \
 	    $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \
-	    $(1)$(PYTHON_PKG_DIR)
+	    $(1)$(PYTHON_PKG_DIR)/
+	rm -rf $(1)$(PYTHON_PKG_DIR)/deluge/ui/gtkui
+	rm -rf $(1)$(PYTHON_PKG_DIR)/deluge/ui/web
 
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(CP) \
+	    $(PKG_INSTALL_DIR)/usr/bin/* \
+	    $(1)/usr/bin/
+	rm -rf $(1)/usr/bin/deluge-gtk
+	rm -rf $(1)/usr/bin/deluge-web
 
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/deluge.init $(1)/etc/init.d/deluge
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/files/deluge.config $(1)/etc/config/deluge
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) ./files/deluge.config $(1)/etc/config/deluge
 
-	$(SED) 's,#!$(STAGING_DIR)/host/bin/$(PYTHON),#!/usr/bin/$(PYTHON),' $(1)/usr/bin/*
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/deluge.init $(1)/etc/init.d/deluge
+endef
+
+define Package/deluge-ui-gtk/install
+	$(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/deluge/ui
+	$(CP) \
+	    $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/deluge/ui/gtkui \
+	    $(1)$(PYTHON_PKG_DIR)/deluge/ui/
+
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(CP) \
+	    $(PKG_INSTALL_DIR)/usr/bin/deluge-gtk \
+	    $(1)/usr/bin/
+endef
+
+define Package/deluge-ui-web/install
+	$(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/deluge/ui
+	$(CP) \
+	    $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/deluge/ui/web \
+	    $(1)$(PYTHON_PKG_DIR)/deluge/ui/
+
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(CP) \
+	    $(PKG_INSTALL_DIR)/usr/bin/deluge-web \
+	    $(1)/usr/bin/
 endef
 
 $(eval $(call BuildPackage,deluge))
+$(eval $(call BuildPackage,deluge-ui-gtk))
+$(eval $(call BuildPackage,deluge-ui-web))
-- 
2.30.2