From 26f3809443644c91009406b22bcca5f5ce7724a4 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Tue, 12 May 2020 20:23:52 +0200
Subject: [PATCH] [wip/py-scs] fix PLIST
---
py-scs/PLIST | 26 +++++++++++---------------
py-scs/depend.mk | 2 +-
2 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/py-scs/PLIST b/py-scs/PLIST
index 47ebb5b7..1f4e3496 100644
--- a/py-scs/PLIST
+++ b/py-scs/PLIST
@@ -1,15 +1,11 @@
-@comment Tue May 12 12:27:18 CEST 2020
-${PYTHON_SITELIB}/scs-${PKGVERSION}-py${PYTHON_VERSION}-linux-x86_64.egg/EGG-INFO/PKG-INFO
-${PYTHON_SITELIB}/scs-${PKGVERSION}-py${PYTHON_VERSION}-linux-x86_64.egg/EGG-INFO/SOURCES.txt
-${PYTHON_SITELIB}/scs-${PKGVERSION}-py${PYTHON_VERSION}-linux-x86_64.egg/EGG-INFO/dependency_links.txt
-${PYTHON_SITELIB}/scs-${PKGVERSION}-py${PYTHON_VERSION}-linux-x86_64.egg/EGG-INFO/native_libs.txt
-${PYTHON_SITELIB}/scs-${PKGVERSION}-py${PYTHON_VERSION}-linux-x86_64.egg/EGG-INFO/not-zip-safe
-${PYTHON_SITELIB}/scs-${PKGVERSION}-py${PYTHON_VERSION}-linux-x86_64.egg/EGG-INFO/requires.txt
-${PYTHON_SITELIB}/scs-${PKGVERSION}-py${PYTHON_VERSION}-linux-x86_64.egg/EGG-INFO/top_level.txt
-${PYTHON_SITELIB}/scs-${PKGVERSION}-py${PYTHON_VERSION}-linux-x86_64.egg/_scs_direct${PYTHON_EXT_SUFFIX}
-${PYTHON_SITELIB}/scs-${PKGVERSION}-py${PYTHON_VERSION}-linux-x86_64.egg/_scs_direct.py
-${PYTHON_SITELIB}/scs-${PKGVERSION}-py${PYTHON_VERSION}-linux-x86_64.egg/_scs_indirect${PYTHON_EXT_SUFFIX}
-${PYTHON_SITELIB}/scs-${PKGVERSION}-py${PYTHON_VERSION}-linux-x86_64.egg/_scs_indirect.py
-${PYTHON_SITELIB}/scs-${PKGVERSION}-py${PYTHON_VERSION}-linux-x86_64.egg/_scs_python${PYTHON_EXT_SUFFIX}
-${PYTHON_SITELIB}/scs-${PKGVERSION}-py${PYTHON_VERSION}-linux-x86_64.egg/_scs_python.py
-${PYTHON_SITELIB}/scs-${PKGVERSION}-py${PYTHON_VERSION}-linux-x86_64.egg/scs/__init__.py
+@comment Tue May 12 20:23:27 CEST 2020
+${PYTHON_SITELIB}/_scs_direct${PYTHON_EXT_SUFFIX}
+${PYTHON_SITELIB}/_scs_indirect${PYTHON_EXT_SUFFIX}
+${PYTHON_SITELIB}/_scs_python${PYTHON_EXT_SUFFIX}
+${PYTHON_SITELIB}/scs-${PKGVERSION}-py${PYTHON_VERSION}.egg-info/PKG-INFO
+${PYTHON_SITELIB}/scs-${PKGVERSION}-py${PYTHON_VERSION}.egg-info/SOURCES.txt
+${PYTHON_SITELIB}/scs-${PKGVERSION}-py${PYTHON_VERSION}.egg-info/dependency_links.txt
+${PYTHON_SITELIB}/scs-${PKGVERSION}-py${PYTHON_VERSION}.egg-info/not-zip-safe
+${PYTHON_SITELIB}/scs-${PKGVERSION}-py${PYTHON_VERSION}.egg-info/requires.txt
+${PYTHON_SITELIB}/scs-${PKGVERSION}-py${PYTHON_VERSION}.egg-info/top_level.txt
+${PYTHON_SITELIB}/scs/__init__.py
diff --git a/py-scs/depend.mk b/py-scs/depend.mk
index c5a00cfd..7d26fa57 100644
--- a/py-scs/depend.mk
+++ b/py-scs/depend.mk
@@ -21,7 +21,7 @@ DEPEND_ABI.py-scs?= ${PKGTAG.python-}scs>=2.1.2
DEPEND_DIR.py-scs?= ../../wip/py-scs
SYSTEM_SEARCH.py-scs= \
- '${PYTHON_SYSLIBSEARCH}/scs*.egg'
+ '${PYTHON_SYSLIBSEARCH}/scs/__init__.py'
endif # PY_SCS_DEPEND_MK ----------------------------------------------
--
GitLab