ypkg: Depend on eopkg instead of python-eopkg

**Summary** Part of the move towards fully py3-based nuitka-compiled tooling. Signed-off-by: Rune Morling <[email protected]>
getsolus · Apr 11, 2024 · feafbec · feafbec
1 parent f1626b2
commit feafbec
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/packages/y/ypkg/package.yml b/packages/y/ypkg/package.yml
@@ -1,6 +1,6 @@
 name       : ypkg
 version    : '31'
-release    : 182
+release    : 183
 source     :
     - git|https://github.com/getsolus/ypkg.git : 0c6647252a51721659da0b749e2d113662fbb727
 homepage   : https://github.com/getsolus/ypkg
@@ -16,9 +16,9 @@ strip      : no
 debug      : no
 builddeps  :
     - pkgconfig(python3)
+    - eopkg
     - nuitka
     - patchelf
-    - python-eopkg
     - python-zstandard
     - tree
 rundeps    :
@@ -41,10 +41,10 @@ install    : |
     # now override bins with our nuitka'd variants
     for b in ypkg ypkg-build ypkg-install-deps ypkg-gen-history ybump yupdate
     do
-        install -Dm0755 $installdir/usr/bin/$b $installdir/usr/bin/$b.py
+        install -Dm0755 $installdir/usr/bin/$b $installdir/usr/bin/$b.py3
         install -Dm0755 $workdir/$b.bin $installdir/usr/bin/$b.bin
         # this can be used to switch the used version between the nuitka .bin ones and the pure .py ones
-        #ln -srvf $installdir/usr/bin/$b.py $installdir/usr/bin/$b
+        #ln -srvf $installdir/usr/bin/$b.py3 $installdir/usr/bin/$b
         ln -srvf $installdir/usr/bin/$b.bin $installdir/usr/bin/$b
     done
     # show the current symlink targets for convenience

diff --git a/packages/y/ypkg/pspec_x86_64.xml b/packages/y/ypkg/pspec_x86_64.xml
@@ -3,8 +3,8 @@
         <Name>ypkg</Name>
         <Homepage>https://github.com/getsolus/ypkg</Homepage>
         <Packager>
-            <Name>Gavin Zhao</Name>
-            <Email>[email protected]</Email>
+            <Name>Rune Morling</Name>
+            <Email>[email protected]</Email>
         </Packager>
         <License>GPL-3.0-or-later</License>
         <PartOf>system.devel</PartOf>
@@ -26,22 +26,22 @@ Simply put, it is a tool to convert a build process into a packaging operation.
         <Files>
             <Path fileType="executable">/usr/bin/ybump</Path>
             <Path fileType="executable">/usr/bin/ybump.bin</Path>
-            <Path fileType="executable">/usr/bin/ybump.py</Path>
+            <Path fileType="executable">/usr/bin/ybump.py3</Path>
             <Path fileType="executable">/usr/bin/ypkg</Path>
             <Path fileType="executable">/usr/bin/ypkg-build</Path>
             <Path fileType="executable">/usr/bin/ypkg-build.bin</Path>
-            <Path fileType="executable">/usr/bin/ypkg-build.py</Path>
+            <Path fileType="executable">/usr/bin/ypkg-build.py3</Path>
             <Path fileType="executable">/usr/bin/ypkg-gen-history</Path>
             <Path fileType="executable">/usr/bin/ypkg-gen-history.bin</Path>
-            <Path fileType="executable">/usr/bin/ypkg-gen-history.py</Path>
+            <Path fileType="executable">/usr/bin/ypkg-gen-history.py3</Path>
             <Path fileType="executable">/usr/bin/ypkg-install-deps</Path>
             <Path fileType="executable">/usr/bin/ypkg-install-deps.bin</Path>
-            <Path fileType="executable">/usr/bin/ypkg-install-deps.py</Path>
+            <Path fileType="executable">/usr/bin/ypkg-install-deps.py3</Path>
             <Path fileType="executable">/usr/bin/ypkg.bin</Path>
-            <Path fileType="executable">/usr/bin/ypkg.py</Path>
+            <Path fileType="executable">/usr/bin/ypkg.py3</Path>
             <Path fileType="executable">/usr/bin/yupdate</Path>
             <Path fileType="executable">/usr/bin/yupdate.bin</Path>
-            <Path fileType="executable">/usr/bin/yupdate.py</Path>
+            <Path fileType="executable">/usr/bin/yupdate.py3</Path>
             <Path fileType="library">/usr/lib/python3.11/site-packages/ypkg2-31.0.0-py3.11.egg-info/PKG-INFO</Path>
             <Path fileType="library">/usr/lib/python3.11/site-packages/ypkg2-31.0.0-py3.11.egg-info/SOURCES.txt</Path>
             <Path fileType="library">/usr/lib/python3.11/site-packages/ypkg2-31.0.0-py3.11.egg-info/dependency_links.txt</Path>
@@ -82,12 +82,12 @@ Simply put, it is a tool to convert a build process into a packaging operation.
         </Files>
     </Package>
     <History>
-        <Update release="182">
-            <Date>2024-04-08</Date>
+        <Update release="183">
+            <Date>2024-04-11</Date>
             <Version>31</Version>
             <Comment>Packaging update</Comment>
-            <Name>Gavin Zhao</Name>
-            <Email>[email protected]</Email>
+            <Name>Rune Morling</Name>
+            <Email>[email protected]</Email>
         </Update>
     </History>
 </PISI>