wok-next rev 20207
Fix and recook packages that depends on its own.
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Sat Nov 04 12:51:03 2017 +0200 (2017-11-04) |
| parents | 8bf043780c63 |
| children | 2e60fe1db5a4 |
| files | libindicator-gtk2/receipt libwrap/receipt llvm/receipt lz4/receipt mtools/receipt opencc/receipt picard/receipt qemacs/receipt |
line diff
1.1 --- a/libindicator-gtk2/receipt Sat Nov 04 09:19:58 2017 +0100 1.2 +++ b/libindicator-gtk2/receipt Sat Nov 04 12:51:03 2017 +0200 1.3 @@ -40,9 +40,9 @@ 1.4 rm -r $fs/usr/share 1.5 DEPENDS="atk-dev bzlib cairo-dev fontconfig-dev freetype-dev \ 1.6 gdk-pixbuf-dev glib-dev gtk+-dev harfbuzz-dev libffi-dev \ 1.7 - libindicator-gtk2 libpng16-dev libxml2-dev pango-dev pcre-dev \ 1.8 - util-linux-blkid-dev util-linux-mount-dev util-linux-uuid-dev \ 1.9 - xorg-libX11-dev xorg-libXau-dev xorg-libXdmcp-dev xorg-libXext-dev \ 1.10 + libpng16-dev libxml2-dev pango-dev pcre-dev util-linux-blkid-dev \ 1.11 + util-linux-mount-dev util-linux-uuid-dev xorg-libX11-dev \ 1.12 + xorg-libXau-dev xorg-libXdmcp-dev xorg-libXext-dev \ 1.13 xorg-libXrender-dev xorg-libxcb-dev xorg-pixman-dev xz-dev zlib" 1.14 ;; 1.15 *-dev)
2.1 --- a/libwrap/receipt Sat Nov 04 09:19:58 2017 +0100 2.2 +++ b/libwrap/receipt Sat Nov 04 12:51:03 2017 +0200 2.3 @@ -3,7 +3,7 @@ 2.4 PACKAGE="libwrap" 2.5 VERSION="7.6" 2.6 CATEGORY="system-tools" 2.7 -SHORT_DESC="Wietse Venema's network logger." 2.8 +SHORT_DESC="Wietse Venema's network logger" 2.9 MAINTAINER="erjo@slitaz.org" 2.10 LICENSE="BSD" 2.11 SOURCE="tcp_wrappers" 2.12 @@ -12,7 +12,7 @@ 2.13 WGET_URL="ftp://ftp.porcupine.org/pub/security/$TARBALL" 2.14 HOST_ARCH="i486 arm" 2.15 2.16 -SPLIT="libwrap libwrap-dev tcpd" 2.17 +SPLIT="libwrap-dev tcpd" 2.18 2.19 # Rules to configure and make the package. 2.20 compile_rules() 2.21 @@ -35,13 +35,12 @@ 2.22 cp -a $src/shared/*.so* $fs/usr/lib 2.23 ;; 2.24 libwrap-dev) 2.25 - CAT="development|Wietse Venema's network logger devel files." 2.26 mkdir -p $fs/usr/include $fs/usr/lib 2.27 cp -a $src/tcpd.h $fs/usr/include 2.28 cp -a $src/*.a $fs/usr/lib 2.29 ;; 2.30 tcpd) 2.31 - CAT="development|Wietse Venema's network encapsulation files." 2.32 + CAT="development|network encapsulation files" 2.33 CONFIG_FILES="/etc/hosts.allow /etc/hosts.deny" 2.34 DEPENDS="libwrap" 2.35 mkdir -p $fs/usr/sbin $fs/etc 2.36 @@ -55,8 +54,3 @@ 2.37 ;; 2.38 esac 2.39 } 2.40 - 2.41 -clean_wok() 2.42 -{ 2.43 - rm -rf $PWD/${SOURCE}_${VERSION} 2.44 -}
3.1 --- a/llvm/receipt Sat Nov 04 09:19:58 2017 +0100 3.2 +++ b/llvm/receipt Sat Nov 04 12:51:03 2017 +0200 3.3 @@ -12,7 +12,7 @@ 3.4 WGET_URL="${WEB_SITE}releases/$VERSION/$TARBALL" 3.5 3.6 BUILD_DEPENDS="cmake zlib-dev libffi-dev python" 3.7 -SPLIT="llvm llvm-dev llvm-libs" 3.8 +SPLIT="llvm-dev llvm-libs" 3.9 3.10 # Rules to configure and make the package. 3.11 compile_rules() 3.12 @@ -39,13 +39,12 @@ 3.13 copy bin/ 3.14 ;; 3.15 llvm-dev) 3.16 - CAT="development|LLVM (Low Level Virtual Machine): development files" 3.17 DEPENDS="llvm" 3.18 copy include/ cmake/ 3.19 ;; 3.20 llvm-libs) 3.21 - CAT="libs|LLVM (Low Level Virtual Machine): libraries" 3.22 - DEPENDS="libffi gcc-lib-base llvm-libs" 3.23 + CAT="libs|libraries" 3.24 + DEPENDS="libffi gcc-lib-base" 3.25 copy *.so* 3.26 ;; 3.27 esac
4.1 --- a/lz4/receipt Sat Nov 04 09:19:58 2017 +0100 4.2 +++ b/lz4/receipt Sat Nov 04 12:51:03 2017 +0200 4.3 @@ -3,7 +3,7 @@ 4.4 PACKAGE="lz4" 4.5 VERSION="1.7.5" 4.6 CATEGORY="base-system" 4.7 -SHORT_DESC="High speed lossless compressor." 4.8 +SHORT_DESC="High speed lossless compressor" 4.9 MAINTAINER="pascal.bellard@slitaz.org" 4.10 LICENSE="BSD" 4.11 WEB_SITE="http://lz4.github.io/lz4/" 4.12 @@ -12,7 +12,7 @@ 4.13 TARBALL="$PACKAGE-$VERSION.tar.gz" 4.14 WGET_URL="$GITHUB/lz4/lz4/tarball/v$VERSION" 4.15 4.16 -SPLIT="lz4 lz4-dev lz4-lib lz4c" 4.17 +SPLIT="lz4-dev lz4-lib lz4c" 4.18 4.19 # Rules to configure and make the package. 4.20 compile_rules() 4.21 @@ -26,19 +26,20 @@ 4.22 case $PACKAGE in 4.23 lz4) 4.24 copy lz4 unlz4 lz4cat 4.25 + DEPENDS=" " 4.26 ;; 4.27 lz4c) 4.28 - CAT="base-system|The lz4c compressor" 4.29 + CAT="base-system|lz4c compressor" 4.30 copy lz4c 4.31 + DEPENDS=" " 4.32 + ;; 4.33 + lz4-lib) 4.34 + CAT="base-system|lz4c compressor shared library" 4.35 + copy *.so* 4.36 + DEPENDS=" " 4.37 ;; 4.38 lz4-dev) 4.39 - CAT="development|LZ4 development files." 4.40 - DEPENDS="pkg-config lz4-lib" 4.41 - copy *.h *.a *.pc 4.42 - ;; 4.43 - lz4-lib) 4.44 - CAT="base-system|The lz4c compressor shared library" 4.45 - copy *.so* 4.46 + copy @dev 4.47 ;; 4.48 esac 4.49 }
5.1 --- a/mtools/receipt Sat Nov 04 09:19:58 2017 +0100 5.2 +++ b/mtools/receipt Sat Nov 04 12:51:03 2017 +0200 5.3 @@ -30,8 +30,7 @@ 5.4 DEPENDS="xorg-libX11 xorg-libXau" 5.5 ;; 5.6 mtools) 5.7 - copy @std 5.8 - remove_already_packed 5.9 + copy @std @rm 5.10 ;; 5.11 esac 5.12 }
6.1 --- a/opencc/receipt Sat Nov 04 09:19:58 2017 +0100 6.2 +++ b/opencc/receipt Sat Nov 04 12:51:03 2017 +0200 6.3 @@ -11,7 +11,7 @@ 6.4 WGET_URL="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/opencc/$TARBALL" 6.5 6.6 BUILD_DEPENDS="cmake gettext" 6.7 -SPLIT="opencc opencc-dev opencc-tools" 6.8 +SPLIT="opencc-tools opencc opencc-dev" 6.9 6.10 # Rules to configure and make the package. 6.11 compile_rules() 6.12 @@ -28,24 +28,16 @@ 6.13 genpkg_rules() 6.14 { 6.15 case $PACKAGE in 6.16 + opencc-tools) 6.17 + CAT="utilities|command line tools" 6.18 + DEPENDS="opencc" 6.19 + copy usr/bin/ # only binaries 6.20 + ;; 6.21 opencc) 6.22 - mkdir -p $fs/usr/lib/ $fs/usr/share/ 6.23 - cp -a $install/usr/lib/lib*.so.* $fs/usr/lib/ 6.24 - cp -a $install/usr/share/opencc/ $fs/usr/share/ 6.25 + copy @std @rm # all the rest 6.26 ;; 6.27 opencc-dev) 6.28 - CAT="development|Development files for OpenCC" 6.29 - DEPENDS="opencc pkg-config" 6.30 - mkdir -p $fs/usr/lib/pkgconfig/ 6.31 - cp -a $install/usr/include $fs/usr 6.32 - cp -a $install/usr/lib/*.so $fs/usr/lib/ 6.33 - cp -a $install/usr/lib/pkgconfig/*.pc $fs/usr/lib/pkgconfig/ 6.34 - ;; 6.35 - opencc-tools) 6.36 - CAT="utilities|Command line tools for OpenCC" 6.37 - DEPENDS="opencc" 6.38 - mkdir -p $fs/usr 6.39 - cp -a $install/usr/bin $fs/usr 6.40 + copy @dev 6.41 ;; 6.42 esac 6.43 }
7.1 --- a/picard/receipt Sat Nov 04 09:19:58 2017 +0100 7.2 +++ b/picard/receipt Sat Nov 04 12:51:03 2017 +0200 7.3 @@ -13,7 +13,7 @@ 7.4 WGET_URL="https://github.com/metabrainz/picard/archive/$COMMIT.tar.gz" 7.5 7.6 DEPENDS="python PyQt-x11-gpl mutagen" 7.7 -BUILD_DEPENDS="python-dev PyQt-x11-gpl mutagen" 7.8 +BUILD_DEPENDS="python-dev PyQt-x11-gpl mutagen gettext" 7.9 7.10 # Rules to configure and make the package. 7.11 compile_rules()
8.1 --- a/qemacs/receipt Sat Nov 04 09:19:58 2017 +0100 8.2 +++ b/qemacs/receipt Sat Nov 04 12:51:03 2017 +0200 8.3 @@ -3,7 +3,7 @@ 8.4 PACKAGE="qemacs" 8.5 VERSION="0.3.3" 8.6 CATEGORY="editors" 8.7 -SHORT_DESC="Light emacs clone." 8.8 +SHORT_DESC="Light emacs clone" 8.9 MAINTAINER="pascal.bellard@slitaz.org" 8.10 LICENSE="LGPL2.1" 8.11 TARBALL="$PACKAGE-$VERSION.tar.gz" 8.12 @@ -38,14 +38,14 @@ 8.13 ln -s qemacs $fs/usr/bin/qe 8.14 install -m 755 -s $src/html2png $fs/usr/bin 8.15 install $src/kmaps $src/ligatures $fs/usr/share/qe 8.16 - DEPENDS="" 8.17 + DEPENDS=" " 8.18 TAGS="editor" 8.19 ;; 8.20 qemacs-tiny) 8.21 mkdir -p $fs/usr/bin 8.22 install -m 755 $src/qe-tiny $fs/usr/bin/qemacs 8.23 ln -s qemacs $fs/usr/bin/qe 8.24 - DEPENDS="" 8.25 + DEPENDS=" " 8.26 TAGS="editor" 8.27 ;; 8.28 qemacs-x11)