dev-tcltk/tkimg: multilib--, missing dies

Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2021-04-16 22:37:25 +01:00
parent 44de9efdf4
commit 9980f49777
4 changed files with 37 additions and 24 deletions

View File

@@ -3,7 +3,7 @@
EAPI=7
inherit autotools edos2unix multilib prefix toolchain-funcs virtualx
inherit autotools edos2unix prefix toolchain-funcs virtualx
MYP=Img-${PV}-Source
@@ -11,8 +11,9 @@ DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
HOMEPAGE="http://tkimg.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${PN}/1.4/${PN}%20${PV}/${MYP}.tar.gz
https://dev.gentoo.org/~tupone/distfiles/${P}-patchset-1.tar.gz"
SLOT="0"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE="doc test static-libs"
@@ -51,15 +52,17 @@ src_prepare() {
libtiff/tifftclStubInit.c \
tiff/tiff.c \
jpeg/jpeg.c
default
find . -name configure -delete
find compat/{libjpeg,libpng,zlib,libtiff} -delete
default
find . -name configure -delete || die
find compat/{libjpeg,libpng,zlib,libtiff} -delete || die
eautoreconf
for dir in zlib libpng libtiff libjpeg base bmp gif ico jpeg pcx pixmap png\
ppm ps sgi sun tga tiff window xbm xpm dted raw flir ; do
(cd $dir; eautoreconf)
(cd ${dir}; eautoreconf)
done
eprefixify */*.h
@@ -80,7 +83,7 @@ src_install() {
# Make library links
for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
bl=$(basename $l)
bl=$(basename ${l})
dosym Img${PV}/${bl} /usr/$(get_libdir)/${bl}
done

View File

@@ -3,7 +3,7 @@
EAPI=7
inherit autotools edos2unix multilib prefix toolchain-funcs virtualx
inherit autotools edos2unix prefix toolchain-funcs virtualx
MYP=Img-${PV}-Source
@@ -11,8 +11,9 @@ DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
HOMEPAGE="http://tkimg.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${PN}/1.4/${PN}%20${PV}/${MYP}.tar.gz
https://dev.gentoo.org/~tupone/distfiles/${P}-patchset-1.tar.gz"
SLOT="0"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE="doc test static-libs"
@@ -50,15 +51,19 @@ src_prepare() {
libtiff/tifftclStubInit.c \
tiff/tiff.c \
jpeg/jpeg.c
default
find compat/libtiff/config -name ltmain.sh -delete
find compat/libtiff/config -name ltmain.sh -delete || die
#rm -r compat/{libjpeg,libpng,zlib} || die
eautoreconf
local dir
for dir in zlib libpng libtiff libjpeg base bmp gif ico jpeg pcx pixmap png\
ppm ps sgi sun tga tiff window xbm xpm dted raw flir ; do
(cd $dir; AT_NOELIBTOOLIZE=yes eautoreconf)
(cd ${dir}; AT_NOELIBTOOLIZE=yes eautoreconf)
done
eprefixify */*.h
@@ -83,7 +88,7 @@ src_install() {
# Make library links
for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
bl=$(basename $l)
bl=$(basename ${l})
dosym Img${PV}/${bl} /usr/$(get_libdir)/${bl}
done

View File

@@ -3,7 +3,7 @@
EAPI=7
inherit autotools edos2unix multilib prefix toolchain-funcs virtualx
inherit autotools edos2unix prefix toolchain-funcs virtualx
MYP=Img-${PV}-Source
@@ -11,8 +11,9 @@ DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
HOMEPAGE="http://tkimg.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${PN}/1.4/${PN}%20${PV}/${MYP}.tar.gz
https://dev.gentoo.org/~tupone/distfiles/${PN}-1.4.12-patchset-1.tar.gz"
SLOT="0"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE="doc test static-libs"
@@ -44,8 +45,10 @@ src_prepare() {
zlib/zlibtclDecls.h \
libpng/pngtclDecls.h \
libtiff/tifftclDecls.h
default
find compat/libtiff/config -name ltmain.sh -delete
find compat/libtiff/config -name ltmain.sh -delete || die
sed -i \
-e 's:"--with-CC=$TIFFCC"::' \
libtiff/configure.ac || die
@@ -53,7 +56,7 @@ src_prepare() {
eautoreconf
for dir in zlib libpng libtiff libjpeg base bmp gif ico jpeg pcx pixmap png\
ppm ps sgi sun tga tiff window xbm xpm dted raw flir ; do
(cd $dir; AT_NOELIBTOOLIZE=yes eautoreconf)
(cd ${dir}; AT_NOELIBTOOLIZE=yes eautoreconf)
done
eprefixify */*.h
@@ -78,7 +81,7 @@ src_install() {
# Make library links
for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
bl=$(basename $l)
bl=$(basename ${l})
dosym Img${PV}/${bl} /usr/$(get_libdir)/${bl}
done

View File

@@ -3,7 +3,7 @@
EAPI=7
inherit autotools edos2unix multilib prefix toolchain-funcs virtualx
inherit autotools edos2unix prefix toolchain-funcs virtualx
MYP=Img-${PV}-Source
@@ -11,8 +11,9 @@ DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
HOMEPAGE="http://tkimg.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${PN}/1.4/${PN}%20${PV}/${MYP}.tar.gz
https://dev.gentoo.org/~tupone/distfiles/${PN}-1.4.7-patchset-1.tar.xz"
SLOT="0"
LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
IUSE="doc test static-libs"
@@ -59,15 +60,16 @@ src_prepare() {
libtiff/tifftclStubInit.c \
tiff/tiff.c \
jpeg/jpeg.c
default
find . -name configure -delete
find compat/{libjpeg,libpng,zlib,libtiff} -delete
default
find . -name configure -delete || die
find compat/{libjpeg,libpng,zlib,libtiff} -delete || die
eautoreconf
for dir in zlib libpng libtiff libjpeg base bmp gif ico jpeg pcx pixmap png\
ppm ps sgi sun tga tiff window xbm xpm dted raw flir ; do
(cd $dir; eautoreconf)
(cd ${dir}; eautoreconf)
done
eprefixify */*.h
@@ -88,7 +90,7 @@ src_install() {
# Make library links
for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
bl=$(basename $l)
bl=$(basename ${l})
dosym Img${PV}/${bl} /usr/$(get_libdir)/${bl}
done