| 1 |
commit: 2eaad5448fd8d5ef4ff3b74deaf59ba0def07d92 |
| 2 |
Author: Huang Rui <vowstar <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue May 31 09:32:08 2022 +0000 |
| 4 |
Commit: Rui Huang <vowstar <AT> gmail <DOT> com> |
| 5 |
CommitDate: Tue May 31 09:32:51 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2eaad544 |
| 7 |
|
| 8 |
media-gfx/zw3d: fix install path to solve maintenance issues |
| 9 |
|
| 10 |
Signed-off-by: Huang Rui <vowstar <AT> gmail.com> |
| 11 |
|
| 12 |
...2022.26.00.ebuild => zw3d-2022.26.00-r1.ebuild} | 29 ++++++++++------------ |
| 13 |
1 file changed, 13 insertions(+), 16 deletions(-) |
| 14 |
|
| 15 |
diff --git a/media-gfx/zw3d/zw3d-2022.26.00.ebuild b/media-gfx/zw3d/zw3d-2022.26.00-r1.ebuild |
| 16 |
similarity index 75% |
| 17 |
rename from media-gfx/zw3d/zw3d-2022.26.00.ebuild |
| 18 |
rename to media-gfx/zw3d/zw3d-2022.26.00-r1.ebuild |
| 19 |
index 05ed0a720..013b83e1f 100644 |
| 20 |
--- a/media-gfx/zw3d/zw3d-2022.26.00.ebuild |
| 21 |
+++ b/media-gfx/zw3d/zw3d-2022.26.00-r1.ebuild |
| 22 |
@@ -53,18 +53,17 @@ S=${WORKDIR} |
| 23 |
QA_PREBUILT="*" |
| 24 |
|
| 25 |
src_install() { |
| 26 |
- # Move ${MY_PGK_NAME} out from /opt/apps |
| 27 |
+ # Move ${MY_PGK_NAME} out from /opt/apps/apps |
| 28 |
mkdir -p "${S}"/usr/share/icons/hicolor/scalable/apps || die |
| 29 |
- mv "${S}"/opt/apps/${MY_PGK_NAME} "${S}"/opt/${MY_PGK_NAME} || die |
| 30 |
- mv "${S}"/opt/${MY_PGK_NAME}/entries/icons/hicolor/scalable/apps/*.svg "${S}"/usr/share/icons/hicolor/scalable/apps || die |
| 31 |
+ mv "${S}"/opt/apps/${MY_PGK_NAME}/entries/icons/hicolor/scalable/apps/*.svg "${S}"/usr/share/icons/hicolor/scalable/apps || die |
| 32 |
|
| 33 |
# Set RPATH for preserve-libs handling |
| 34 |
- pushd "${S}"/opt/${MY_PGK_NAME}/files || die |
| 35 |
+ pushd "${S}"/opt/apps/${MY_PGK_NAME}/files || die |
| 36 |
local x |
| 37 |
for x in $(find) ; do |
| 38 |
# Use \x7fELF header to separate ELF executables and libraries |
| 39 |
[[ -f ${x} && $(od -t x1 -N 4 "${x}") == *"7f 45 4c 46"* ]] || continue |
| 40 |
- local RPATH_ROOT="/opt/${MY_PGK_NAME}/files" |
| 41 |
+ local RPATH_ROOT="/opt/apps/${MY_PGK_NAME}/files" |
| 42 |
local RPATH_S="${RPATH_ROOT}/:${RPATH_ROOT}/lib/:${RPATH_ROOT}/lib/xlator/:${RPATH_ROOT}/lib/xlator/InterOp/:${RPATH_ROOT}/libqt/:${RPATH_ROOT}/libqt/plugins/designer/:${RPATH_ROOT}/lib3rd/" |
| 43 |
patchelf --set-rpath "${RPATH_S}" "${x}" || \ |
| 44 |
die "patchelf failed on ${x}" |
| 45 |
@@ -81,29 +80,27 @@ src_install() { |
| 46 |
# Add zw3d command |
| 47 |
mkdir -p "${S}"/usr/bin/ || die |
| 48 |
|
| 49 |
- cat >> "${S}"/opt/${MY_PGK_NAME}/zw3d <<- EOF || die |
| 50 |
+ cat >> "${S}"/opt/apps/${MY_PGK_NAME}/zw3d <<- EOF || die |
| 51 |
#!/bin/sh |
| 52 |
-sh /opt/${MY_PGK_NAME}/files/zw3drun.sh \$* |
| 53 |
+sh /opt/apps/${MY_PGK_NAME}/files/zw3drun.sh \$* |
| 54 |
EOF |
| 55 |
|
| 56 |
- ln -s /opt/${MY_PGK_NAME}/zw3d "${S}"/usr/bin/zw3d || die |
| 57 |
- |
| 58 |
- sed -i 's|/opt/apps/|/opt/|g' "${S}/opt/${MY_PGK_NAME}/files/zw3drun.sh" || die |
| 59 |
+ ln -s /opt/apps/${MY_PGK_NAME}/zw3d "${S}"/usr/bin/zw3d || die |
| 60 |
|
| 61 |
# Use system libraries |
| 62 |
- rm -rf "${S}"/opt/${MY_PGK_NAME}/files/lib3rd/libMagickCore* || die |
| 63 |
- rm -rf "${S}"/opt/${MY_PGK_NAME}/files/lib3rd/libjpeg* || die |
| 64 |
+ rm -rf "${S}"/opt/apps/${MY_PGK_NAME}/files/lib3rd/libMagickCore* || die |
| 65 |
+ rm -rf "${S}"/opt/apps/${MY_PGK_NAME}/files/lib3rd/libjpeg* || die |
| 66 |
|
| 67 |
# Install package and fix permissions |
| 68 |
- insinto /opt |
| 69 |
- doins -r opt/${MY_PGK_NAME} |
| 70 |
+ insinto /opt/apps |
| 71 |
+ doins -r opt/apps/${MY_PGK_NAME} |
| 72 |
insinto /usr |
| 73 |
doins -r usr/* |
| 74 |
|
| 75 |
- fperms 0755 /opt/${MY_PGK_NAME}/zw3d |
| 76 |
+ fperms 0755 /opt/apps/${MY_PGK_NAME}/zw3d |
| 77 |
|
| 78 |
pushd "${S}" || die |
| 79 |
- for x in $(find "opt/${MY_PGK_NAME}") ; do |
| 80 |
+ for x in $(find "opt/apps/${MY_PGK_NAME}") ; do |
| 81 |
# Fix shell script permissions |
| 82 |
[[ "${x: -3}" == ".sh" ]] && fperms 0755 "/${x}" |
| 83 |
# Use \x7fELF header to separate ELF executables and libraries |
Archives