From fee9a06a282f549688a102fd2a7aa60503193e35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <karel.koci@nic.cz>
Date: Wed, 7 Mar 2018 14:50:35 +0100
Subject: Merge python-uci packages

---
 python-uci/Makefile  | 29 ++++++++++++++++++++++++-----
 python3-uci/Makefile | 39 ---------------------------------------
 2 files changed, 24 insertions(+), 44 deletions(-)
 delete mode 100644 python3-uci/Makefile

diff --git a/python-uci/Makefile b/python-uci/Makefile
index c09c762..eaf551f 100644
--- a/python-uci/Makefile
+++ b/python-uci/Makefile
@@ -16,24 +16,43 @@ PKG_MAINTAINER:=CZ.NIC <packaging@turris.cz>
 include $(INCLUDE_DIR)/pkgauto.mk
 include $(INCLUDE_DIR)/package.mk
 $(call include_mk, python-package.mk)
+$(call include_mk, python3-package.mk)
 
-define Package/$(PKG_NAME)
-  TITLE:=$(PKG_NAME)
+define Package/Common
   SUBMENU:=Python
   SECTION:=lang
   CATEGORY:=Languages
   URL:=https://gitlab.labs.nic.cz/turris/pyuci/
   MAINTAINER:=CZ.NIC <packaging@turris.cz>
+endef
+
+define Package/python-uci
+  $(call Package/Common)
+  TITLE:=python-uci
   DEPENDS:=+python-light +libuci
 endef
 
+define Package/python3-uci
+  $(call Package/Common)
+  TITLE:=python3-uci
+  DEPENDS:=+python3-light +libuci
+endef
+
 define Package/$(PKG_NAME)/description
   Python bindings for Unified Configuration Interface.
 endef
 
 define Build/Compile
-	$(call Build/Compile/PyMod,,install --prefix="/usr" --root=$(PKG_INSTALL_DIR))
+	$(call Build/Compile/PyMod,,install --prefix="/usr" --root=$(PKG_INSTALL_DIR)/py2)
+	$(call Build/Compile/Py3Mod,,install --prefix="/usr" --root=$(PKG_INSTALL_DIR)/py3)
 endef
 
-$(eval $(call PyPackage,$(PKG_NAME)))
-$(eval $(call BuildPackage,$(PKG_NAME)))
+PKG_INSTALL_DIR_ORIG:="$(PKG_INSTALL_DIR)"
+PKG_INSTALL_DIR:="$(PKG_INSTALL_DIR_ORIG)/py2"
+$(eval $(call PyPackage,python-uci))
+PKG_INSTALL_DIR:="$(PKG_INSTALL_DIR_ORIG)/py3"
+$(eval $(call Py3Package,python3-uci))
+PKG_INSTALL_DIR:="$(PKG_INSTALL_DIR_ORIG)"
+
+$(eval $(call BuildPackage,python-uci))
+$(eval $(call BuildPackage,python3-uci))
diff --git a/python3-uci/Makefile b/python3-uci/Makefile
deleted file mode 100644
index d6ee062..0000000
--- a/python3-uci/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright (C) 2018 CZ.NIC, z. s. p. o. (https://www.nic.cz/)
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=python3-uci
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://gitlab.labs.nic.cz/turris/pyuci.git
-PKG_SOURCE_BRANCH:=master
-PKG_MAINTAINER:=CZ.NIC <packaging@turris.cz>
-
-include $(INCLUDE_DIR)/pkgauto.mk
-include $(INCLUDE_DIR)/package.mk
-$(call include_mk, python3-package.mk)
-
-define Package/$(PKG_NAME)
-  TITLE:=$(PKG_NAME)
-  SUBMENU:=Python
-  SECTION:=lang
-  CATEGORY:=Languages
-  URL:=https://gitlab.labs.nic.cz/turris/pyuci/
-  MAINTAINER:=CZ.NIC <packaging@turris.cz>
-  DEPENDS:=+python3-light +libuci
-endef
-
-define Package/$(PKG_NAME)/description
-  Python bindings for Unified Configuration Interface.
-endef
-
-define Build/Compile
-	$(call Build/Compile/Py3Mod,,install --prefix="/usr" --root=$(PKG_INSTALL_DIR))
-endef
-
-$(eval $(call Py3Package,$(PKG_NAME)))
-$(eval $(call BuildPackage,$(PKG_NAME)))
-- 
cgit v1.2.3