From c4782e6e8b9f9da5d58b99bcca907b4844c210af Mon Sep 17 00:00:00 2001
From: Josef Schlehofer <pepe.schlehofer@gmail.com>
Date: Wed, 23 Oct 2019 09:15:47 +0200
Subject: [PATCH] django-web-pack-loader: fix changes in merge conflict

---
 lang/python/django-webpack-loader/Makefile | 29 +++++++++-------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/lang/python/django-webpack-loader/Makefile b/lang/python/django-webpack-loader/Makefile
index e8ded57dd5..72ed867999 100644
--- a/lang/python/django-webpack-loader/Makefile
+++ b/lang/python/django-webpack-loader/Makefile
@@ -7,28 +7,30 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=django-webpack-loader
 PKG_VERSION:=0.6.0
-PKG_RELEASE:=4
-
-PKG_MAINTAINER:=Eneas U de Queiroz <cote2004-github@yahoo.com>
-PKG_LICENSE:=MIT
-PKG_LICENSE_FILES:=LICENSE
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/d/${PKG_NAME}
 PKG_HASH:=60bab6b9a037a5346fad12d2a70a6bc046afb33154cf75ed640b93d3ebd5f520
 
+PKG_MAINTAINER:=Eneas U de Queiroz <cotequeiroz@gmail.com>
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-$(PKG_NAME)-$(PKG_VERSION)
+
 include $(INCLUDE_DIR)/package.mk
 include ../python-package.mk
+include ../python3-package.mk
 
-define Package/django-webpack-loader
+PKG_UNPACK:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE)
+
+define Package/$(PKG_NAME)/Default
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
   TITLE:=Transparently use webpack in django
   URL:=https://github.com/owais/django-webpack-loader
-<<<<<<< HEAD
-  DEPENDS:=+python +python-django
-=======
 endef
 
 define Package/python-$(PKG_NAME)
@@ -36,20 +38,14 @@ $(call Package/$(PKG_NAME)/Default)
   DEPENDS:= \
 	+PACKAGE_python-$(PKG_NAME):python \
 	python-django
->>>>>>> 90527d75a... django: move django* packages under django submenu
   VARIANT:=python
   MDEPENDS:=python-django
 endef
 
-define Package/django-webpack-loader/description
+define Package/python-$(PKG_NAME)/description
   Use webpack to generate your static bundles without django’s staticfiles or opaque wrappers.
 endef
 
-<<<<<<< HEAD
-$(eval $(call PyPackage,django-webpack-loader))
-$(eval $(call BuildPackage,django-webpack-loader))
-$(eval $(call BuildPackage,django-webpack-loader-src))
-=======
 define Package/python3-$(PKG_NAME)
 $(call Package/$(PKG_NAME)/Default)
   DEPENDS:= \
@@ -72,4 +68,3 @@ $(eval $(call BuildPackage,python-$(PKG_NAME)-src))
 $(eval $(call Py3Package,python3-$(PKG_NAME)))
 $(eval $(call BuildPackage,python3-$(PKG_NAME)))
 $(eval $(call BuildPackage,python3-$(PKG_NAME)-src))
->>>>>>> 90527d75a... django: move django* packages under django submenu