diff options
29 files changed, 213 insertions, 402 deletions
diff --git a/app-cdr/cuegen/cuegen-1.2.0.ebuild b/app-cdr/cuegen/cuegen-1.2.0-r1.ebuild index 2f72c4191258..85cb4049484a 100644 --- a/app-cdr/cuegen/cuegen-1.2.0.ebuild +++ b/app-cdr/cuegen/cuegen-1.2.0-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit flag-o-matic toolchain-funcs +inherit toolchain-funcs DESCRIPTION="CUEgen is a FLAC-compatible cuesheet generator for Linux" HOMEPAGE="http://www.cs.man.ac.uk/~slavinp/cuegen.html" @@ -12,12 +12,13 @@ SRC_URI="http://www.cs.man.ac.uk/~slavinp/files/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" -PATCHES=( "${FILESDIR}"/${PN}-1.2.0-fix-build-system.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-1.2.0-fix-build-system.patch + "${FILESDIR}"/${PN}-1.2.0-missing-includes.patch +) src_configure() { - append-cflags -W -Wall -Wstrict-prototypes -Wmissing-prototypes tc-export CC } diff --git a/app-cdr/cuegen/files/cuegen-1.2.0-fix-build-system.patch b/app-cdr/cuegen/files/cuegen-1.2.0-fix-build-system.patch index 614ec59f905d..fa54235d0e4f 100644 --- a/app-cdr/cuegen/files/cuegen-1.2.0-fix-build-system.patch +++ b/app-cdr/cuegen/files/cuegen-1.2.0-fix-build-system.patch @@ -1,11 +1,12 @@ --- a/Makefile +++ b/Makefile -@@ -1,9 +1 @@ +@@ -1,9 +1,3 @@ -TARGET := cuegen -CC := gcc -CFLAGS := -O2 -pipe -fomit-frame-pointer -WARN := -W -Wall -Wstrict-prototypes -Wmissing-prototypes -- ++CFLAGS += -W -Wall -Wstrict-prototypes -Wmissing-prototypes + all: cuegen - -cuegen: cuegen.o diff --git a/app-cdr/cuegen/files/cuegen-1.2.0-missing-includes.patch b/app-cdr/cuegen/files/cuegen-1.2.0-missing-includes.patch new file mode 100644 index 000000000000..98a273cddb13 --- /dev/null +++ b/app-cdr/cuegen/files/cuegen-1.2.0-missing-includes.patch @@ -0,0 +1,17 @@ +--- a/cuegen.c ++++ b/cuegen.c +@@ -10,12 +10,14 @@ + */ + + ++#include <fcntl.h> + #include <stdio.h> + #include <stdlib.h> + #include <linux/cdrom.h> + #include <sys/ioctl.h> + #include <sys/file.h> + #include <sys/types.h> ++#include <sys/stat.h> + #include <unistd.h> + #include <string.h> + diff --git a/app-cdr/daa2iso/daa2iso-0.1.7e.ebuild b/app-cdr/daa2iso/daa2iso-0.1.7e-r1.ebuild index 1f49851b0089..7d825d3686d5 100644 --- a/app-cdr/daa2iso/daa2iso-0.1.7e.ebuild +++ b/app-cdr/daa2iso/daa2iso-0.1.7e-r1.ebuild @@ -1,23 +1,21 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs DESCRIPTION="Program for converting the DAA and GBI files to ISO" HOMEPAGE="http://aluigi.org/mytoolz.htm" SRC_URI="http://aluigi.org/mytoolz/${PN}.zip -> ${P}.zip" +S="${WORKDIR}/src" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" -IUSE="" -DEPEND="app-arch/unzip" -RDEPEND="" +BDEPEND="app-arch/unzip" -S=${WORKDIR}/src PATCHES=( "${FILESDIR}"/${P}-buildsystem.patch ) src_configure() { @@ -25,6 +23,6 @@ src_configure() { } src_install() { - emake PREFIX="${ED%/}"/usr install + emake PREFIX="${ED}"/usr install einstalldocs } diff --git a/app-cdr/disc-cover/disc-cover-1.5.6-r1.ebuild b/app-cdr/disc-cover/disc-cover-1.5.6-r2.ebuild index 6e832050733c..a1ac3c577040 100644 --- a/app-cdr/disc-cover/disc-cover-1.5.6-r1.ebuild +++ b/app-cdr/disc-cover/disc-cover-1.5.6-r2.ebuild @@ -1,22 +1,20 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Creates CD-Covers via LaTeX by fetching cd-info from freedb.org or local file" HOMEPAGE="https://web.archive.org/web/20151104062521/http://www.vanhemert.co.uk/disc-cover.html" SRC_URI="http://www.vanhemert.co.uk/files/${P}.tar.gz" LICENSE="GPL-2" -KEYWORDS="amd64 ppc sparc x86" -IUSE="" SLOT="0" +KEYWORDS="amd64 ppc sparc x86" -DEPEND="dev-lang/perl" -RDEPEND="${DEPEND} +BDEPEND="dev-lang/perl" +RDEPEND="${BDEPEND} dev-perl/Audio-CD-disc-cover - virtual/latex-base -" + virtual/latex-base" src_compile() { pod2man disc-cover > disc-cover.1 || die @@ -24,8 +22,10 @@ src_compile() { src_install() { dobin disc-cover - dodoc AUTHORS CHANGELOG TODO + + einstalldocs doman disc-cover.1 - insinto /usr/share/${PN}/templates - doins templates/* + + insinto /usr/share/disc-cover/templates + doins -r templates/. } diff --git a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild deleted file mode 100644 index f2e040ecf9d2..000000000000 --- a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit toolchain-funcs - -DESCRIPTION="A set of tools for DVD+RW/-RW drives" -HOMEPAGE="http://fy.chalmers.se/~appro/linux/DVD+RW/" -SRC_URI="http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND="app-cdr/cdrtools" -DEPEND="${RDEPEND} - sys-devel/m4" - -PATCHES=( - "${FILESDIR}"/${PN}-7.0-sysmacros.patch - "${FILESDIR}"/${PN}-7.0-wctomb-r1.patch - "${FILESDIR}"/${PN}-7.0-glibc2.6.90.patch - "${FILESDIR}"/${PN}-7.0-dvddl-r1.patch - "${FILESDIR}"/${PN}-7.0-wexit.patch - "${FILESDIR}"/${PN}-7.0-reload.patch - "${FILESDIR}"/${PN}-7.1-noevent.patch - "${FILESDIR}"/${PN}-7.1-lastshort.patch - "${FILESDIR}"/${PN}-7.1-bluray_srm+pow.patch - "${FILESDIR}"/${PN}-7.1-bluray_pow_freespace.patch -) - -src_prepare() { - # Linux compiler flags only include -O2 and are incremental. - sed -i '/FLAGS/s:-O2::' Makefile.m4 || die "failed to sed out FLAGS" - default -} - -src_compile() { - emake SHELL="${EPREFIX}"/bin/bash CC="$(tc-getCC)" CXX="$(tc-getCXX)" -} - -src_install() { - emake SHELL="${EPREFIX}"/bin/bash prefix="${ED}/usr" install - dodoc index.html -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]] ; then - elog 'If you receive an error, "unable to anonymously mmap...' - elog 'Resource temporarily unavailable" when running growisofs,' - elog 'then you may need to run "ulimit -l unlimited".' - fi -} diff --git a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r4.ebuild b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r4.ebuild index a1505f94a078..e7b519f1933e 100644 --- a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r4.ebuild +++ b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r4.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND="app-cdr/cdrtools" diff --git a/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild b/app-cdr/dvdshrink/dvdshrink-2.6.1_p10-r1.ebuild index e052a53b1fb1..e55e9cbe6fdc 100644 --- a/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild +++ b/app-cdr/dvdshrink/dvdshrink-2.6.1_p10-r1.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit desktop DESCRIPTION="Scriptable DVD copy software" HOMEPAGE="http://dvdshrink.sourceforge.net" SRC_URI="mirror://sourceforge/${PN}/${P/_p/-}mdk.tar.gz" +S="${WORKDIR}/${PN}" LICENSE="GPL-2" SLOT="0" @@ -22,11 +23,8 @@ RDEPEND=" >=media-video/mjpegtools-1.8.0-r1 >=media-video/subtitleripper-0.3.4-r1 >=media-video/transcode-1.0.2-r2[dvd] - gtk? ( >=dev-perl/Gtk2-1.104 ) -" -DEPEND="" + gtk? ( >=dev-perl/Gtk2-1.104 )" -S=${WORKDIR}/${PN} PATCHES=( "${FILESDIR}"/${PN}-2.6.1_p10-fix-paths.patch ) src_install() { diff --git a/app-cdr/dvdshrink/metadata.xml b/app-cdr/dvdshrink/metadata.xml index a161229051ce..70683941b6ed 100644 --- a/app-cdr/dvdshrink/metadata.xml +++ b/app-cdr/dvdshrink/metadata.xml @@ -3,9 +3,8 @@ <pkgmetadata> <!-- maintainer-needed --> <longdescription> -XDVDShrink is a project in BASH and Perl-Gtk2 that allows you to create fair-use -archival copies of DVD content on single-layer writable DVDs. -</longdescription> + XDVDShrink is a project in BASH and Perl-Gtk2 that allows you to create fair-use archival copies of DVD content on single-layer writable DVDs. + </longdescription> <upstream> <remote-id type="sourceforge">dvdshrink</remote-id> </upstream> diff --git a/app-cdr/gaffitter/files/gaffitter-0.6.0-fix-build-system.patch b/app-cdr/gaffitter/files/gaffitter-0.6.0-fix-build-system.patch index df7d99b9c31e..7d6ea908607a 100644 --- a/app-cdr/gaffitter/files/gaffitter-0.6.0-fix-build-system.patch +++ b/app-cdr/gaffitter/files/gaffitter-0.6.0-fix-build-system.patch @@ -26,7 +26,7 @@ -gaffitter: $(OBJS) gaffitter.cc Params.h - $(CXX) $(CXXFLAGS) $@.cc $(OBJS) -o $@ $(LDFLAGS) -+gaffitter: $(OBJS) Params.h ++gaffitter: $(OBJS) ########################################################################### objs: $(OBJS) diff --git a/app-cdr/gaffitter/gaffitter-0.6.0-r1.ebuild b/app-cdr/gaffitter/gaffitter-0.6.0-r2.ebuild index f3f46c1d5e98..964b631ce675 100644 --- a/app-cdr/gaffitter/gaffitter-0.6.0-r1.ebuild +++ b/app-cdr/gaffitter/gaffitter-0.6.0-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit toolchain-funcs diff --git a/app-cdr/graveman/files/cflags.patch b/app-cdr/graveman/files/cflags.patch new file mode 100644 index 000000000000..45df210130fa --- /dev/null +++ b/app-cdr/graveman/files/cflags.patch @@ -0,0 +1,25 @@ +--- a/configure.in ++++ b/configure.in +@@ -23,7 +23,7 @@ + + + +-AC_INIT(configure.in) ++AC_INIT(configure.ac) + AC_CONFIG_HEADER(config.h) + AM_MAINTAINER_MODE + +@@ -283,13 +283,6 @@ + AC_SUBST(GETTEXT_PACKAGE) + AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[gettext domain]) + +-if test "A$enable_debug" = "A"; then +- enable_debug=no +- CFLAGS="-Wall" +-else +- CFLAGS="-Wall -g" +-fi +- + dnl Ecriture des fichiers + AC_OUTPUT([ m4/Makefile + Makefile diff --git a/app-cdr/graveman/files/desktop-entry.patch b/app-cdr/graveman/files/desktop-entry.patch index 4a683d2c84ec..e2a678af8ba0 100644 --- a/app-cdr/graveman/files/desktop-entry.patch +++ b/app-cdr/graveman/files/desktop-entry.patch @@ -1,6 +1,5 @@ -diff -ur graveman-0.3.12-5.orig/desktop/graveman.desktop.in graveman-0.3.12-5/desktop/graveman.desktop.in ---- graveman-0.3.12-5.orig/desktop/graveman.desktop.in 2005-05-24 00:07:08.000000000 +0300 -+++ graveman-0.3.12-5/desktop/graveman.desktop.in 2008-05-10 06:33:32.000000000 +0300 +--- a/desktop/graveman.desktop.in ++++ b/desktop/graveman.desktop.in @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 diff --git a/app-cdr/graveman/files/joliet-long.patch b/app-cdr/graveman/files/joliet-long.patch index 0b0f66656aa3..47f6ecf04011 100644 --- a/app-cdr/graveman/files/joliet-long.patch +++ b/app-cdr/graveman/files/joliet-long.patch @@ -1,5 +1,5 @@ ---- a/src/mkisofs.c.old 2005-05-28 02:37:14.000000000 +0200 -+++ b/src/mkisofs.c 2005-07-11 02:10:44.000000000 +0200 +--- a/src/mkisofs.c ++++ b/src/mkisofs.c @@ -91,13 +91,13 @@ } } diff --git a/app-cdr/graveman/files/rename.patch b/app-cdr/graveman/files/rename.patch index 5970656a3c55..a2410354c23e 100644 --- a/app-cdr/graveman/files/rename.patch +++ b/app-cdr/graveman/files/rename.patch @@ -1,5 +1,5 @@ ---- a/src/callbacks.c.old 2006-05-23 17:42:48.642913000 +0200 -+++ b/src/callbacks.c 2006-05-23 17:42:52.553201500 +0200 +--- a/src/callbacks.c ++++ b/src/callbacks.c @@ -268,7 +268,7 @@ gtk_tree_model_get(Ltreemodel, &Liter, 2, &Lname, -1); diff --git a/app-cdr/graveman/files/sox.patch b/app-cdr/graveman/files/sox.patch index 570bc8406177..d0a9b3f2fac4 100644 --- a/app-cdr/graveman/files/sox.patch +++ b/app-cdr/graveman/files/sox.patch @@ -1,6 +1,5 @@ -diff -Naur /var/tmp/portage/graveman-0.3.12_p5/work/graveman-0.3.12-5/src/sox.c ./src/sox.c ---- a/src/sox.c 2005-05-28 02:37:14.000000000 +0200 -+++ b/src/sox.c 2007-01-27 18:22:11.000000000 +0100 +--- a/src/sox.c ++++ b/src/sox.c @@ -37,7 +37,7 @@ gboolean check_sox() { diff --git a/app-cdr/graveman/graveman-0.3.12_p5-r3.ebuild b/app-cdr/graveman/graveman-0.3.12_p5-r4.ebuild index d9adf8a2b0cb..47779a863ae3 100644 --- a/app-cdr/graveman/graveman-0.3.12_p5-r3.ebuild +++ b/app-cdr/graveman/graveman-0.3.12_p5-r4.ebuild @@ -1,12 +1,14 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + inherit autotools gnome2 DESCRIPTION="Graphical frontend for cdrecord, mkisofs, readcd and sox using GTK+2" HOMEPAGE="http://graveman.tuxfamily.org/" SRC_URI="http://graveman.tuxfamily.org/sources/${PN}-${PV/_p/-}.tar.gz" +S="${WORKDIR}/${P/_p/-}" LICENSE="GPL-2" SLOT="0" @@ -33,30 +35,30 @@ RDEPEND=" media-libs/libogg media-libs/libvorbis media-sound/sox - ) -" -DEPEND="${RDEPEND} + )" +DEPEND="${RDEPEND}" +BDEPEND=" dev-util/intltool virtual/pkgconfig - nls? ( sys-devel/gettext ) -" - -S="${WORKDIR}/${P/_p/-}" + nls? ( sys-devel/gettext )" src_prepare() { eapply \ "${FILESDIR}"/joliet-long.patch \ "${FILESDIR}"/rename.patch \ - "${FILESDIR}"/desktop-entry.patch + "${FILESDIR}"/desktop-entry.patch \ + "${FILESDIR}"/cflags.patch if use mp3 || use vorbis; then eapply "${FILESDIR}"/sox.patch fi # Fix tests - echo glade/dialog_media.glade >> po/POTFILES.in - echo glade/window_welcome.glade >> po/POTFILES.in - echo src/flac.c >> po/POTFILES.in + cat <<- EOF >> po/POTFILES.in || die + glade/dialog_media.glade + glade/window_welcome.glade + src/flac.c + EOF # Prevent m4_copy error when running aclocal # m4_copy: won't overwrite defined macro: glib_DEFUN, bug #579918 diff --git a/app-cdr/mirage2iso/mirage2iso-0.4.2.ebuild b/app-cdr/mirage2iso/mirage2iso-0.4.2-r1.ebuild index c1efb10c0087..86120322a7c6 100644 --- a/app-cdr/mirage2iso/mirage2iso-0.4.2.ebuild +++ b/app-cdr/mirage2iso/mirage2iso-0.4.2-r1.ebuild @@ -1,33 +1,28 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="CD/DVD image converter using libmirage" HOMEPAGE="https://github.com/mgorny/mirage2iso/" -SRC_URI="https://github.com/mgorny/${PN}/releases/download/v${PV}/${P}.tar.xz +SRC_URI=" + https://github.com/mgorny/${PN}/releases/download/v${PV}/${P}.tar.xz test? ( https://github.com/mgorny/${PN}/releases/download/v${PV}/${P}-tests.tar.xz )" LICENSE="BSD" SLOT="0" KEYWORDS="amd64 x86" IUSE="pinentry test" +RESTRICT="!test? ( test )" -COMMON_DEPEND=">=dev-libs/libmirage-2.0.0:0= +DEPEND=" + >=dev-libs/libmirage-2.0.0:0= dev-libs/glib:2= pinentry? ( dev-libs/libassuan:0= )" -DEPEND="${COMMON_DEPEND} - app-arch/xz-utils - virtual/pkgconfig" -RDEPEND="${COMMON_DEPEND} +RDEPEND="${DEPEND} pinentry? ( app-crypt/pinentry )" - -RESTRICT="!test? ( test )" +BDEPEND="virtual/pkgconfig" src_configure() { - local myconf=( - $(use_with pinentry libassuan) - ) - - econf "${myconf[@]}" + econf $(use_with pinentry libassuan) } diff --git a/app-cdr/mirage2iso/mirage2iso-9999.ebuild b/app-cdr/mirage2iso/mirage2iso-9999.ebuild index 117ba275a26e..3ad793f93b52 100644 --- a/app-cdr/mirage2iso/mirage2iso-9999.ebuild +++ b/app-cdr/mirage2iso/mirage2iso-9999.ebuild @@ -1,31 +1,26 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -EGIT_REPO_URI="https://github.com/mgorny/mirage2iso.git" inherit autotools git-r3 DESCRIPTION="CD/DVD image converter using libmirage" HOMEPAGE="https://github.com/mgorny/mirage2iso/" -SRC_URI="" +EGIT_REPO_URI="https://github.com/mgorny/mirage2iso.git" LICENSE="BSD" SLOT="0" -KEYWORDS="" IUSE="pinentry test" +RESTRICT="!test? ( test )" -COMMON_DEPEND=">=dev-libs/libmirage-2.0.0:0= +DEPEND=" + >=dev-libs/libmirage-2.0.0:0= dev-libs/glib:2= pinentry? ( dev-libs/libassuan:0= )" -DEPEND="${COMMON_DEPEND} - dev-libs/libassuan - virtual/pkgconfig - test? ( app-arch/xz-utils )" -RDEPEND="${COMMON_DEPEND} +RDEPEND="${DEPEND} pinentry? ( app-crypt/pinentry )" - -RESTRICT="!test? ( test )" +BDEPEND="virtual/pkgconfig" src_prepare() { default @@ -33,9 +28,5 @@ src_prepare() { } src_configure() { - local myconf=( - $(use_with pinentry libassuan) - ) - - econf "${myconf[@]}" + econf $(use_with pinentry libassuan) } diff --git a/app-cdr/multicd/multicd-1.7.5-r1.ebuild b/app-cdr/multicd/multicd-1.7.5-r2.ebuild index aaba8ca308a8..6060d9c2af62 100644 --- a/app-cdr/multicd/multicd-1.7.5-r1.ebuild +++ b/app-cdr/multicd/multicd-1.7.5-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="Tool for making direct copies of your files to multiple cd's" HOMEPAGE="http://danborn.net/multicd/" @@ -10,12 +10,10 @@ SRC_URI="http://danborn.net/multicd/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~ppc x86" -IUSE="" RDEPEND=" app-cdr/cdrtools - >=dev-lang/perl-5.8.6 -" + dev-lang/perl" src_install() { dobin multicd diff --git a/app-cdr/nrg2iso/nrg2iso-0.4-r2.ebuild b/app-cdr/nrg2iso/nrg2iso-0.4-r3.ebuild index 16c6a8f6cce1..487dbc003d53 100644 --- a/app-cdr/nrg2iso/nrg2iso-0.4-r2.ebuild +++ b/app-cdr/nrg2iso/nrg2iso-0.4-r3.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=8 inherit toolchain-funcs DESCRIPTION="Convert CD images from nrg (Nero) to iso" HOMEPAGE="http://gregory.kokanosky.free.fr/v4/linux/nrg2iso.en.html" -SRC_URI="http://gregory.kokanosky.free.fr/v4/linux/${P}.tar.gz +SRC_URI=" + http://gregory.kokanosky.free.fr/v4/linux/${P}.tar.gz test? ( https://yegortimoshenko.s3.amazonaws.com/${PN}-test.iso https://yegortimoshenko.s3.amazonaws.com/${PN}-test.nrg @@ -18,19 +19,22 @@ SLOT="0" KEYWORDS="amd64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="test" RESTRICT="!test? ( test )" -DOCS=( CHANGELOG ) + +src_configure() { + tc-export CC +} src_compile() { - $(tc-getCC) ${CFLAGS} ${LDFLAGS} ${PN}.c -o ${PN} + emake nrg2iso } src_test() { einfo "checking that nrg -> iso matches the expected output" - "${S}/${PN}" "${DISTDIR}/${PN}-test.nrg" "${T}/${PN}-test.iso" || die "conversion failed" - diff "${DISTDIR}/${PN}-test.iso" "${T}/${PN}-test.iso" || die "unexpected iso" + ./nrg2iso "${DISTDIR}"/nrg2iso-test.nrg "${T}"/nrg2iso-test.iso || die "conversion failed" + diff "${DISTDIR}"/nrg2iso-test.iso "${T}"/nrg2iso-test.iso || die "unexpected iso" } src_install() { - dobin ${PN} + dobin nrg2iso einstalldocs } diff --git a/app-cdr/uif2iso/uif2iso-0.1.7c-r1.ebuild b/app-cdr/uif2iso/uif2iso-0.1.7c-r1.ebuild deleted file mode 100644 index 5c029a5a00fb..000000000000 --- a/app-cdr/uif2iso/uif2iso-0.1.7c-r1.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -inherit toolchain-funcs - -DESCRIPTION="Convert CD images from uif (MagicISO) to iso" -HOMEPAGE="http://aluigi.altervista.org/mytoolz.htm#uif2iso" -SRC_URI="mirror://gentoo/${P}.zip - test? ( https://yegortimoshenko.s3.amazonaws.com/${PN}-test.iso - https://yegortimoshenko.s3.amazonaws.com/${PN}-test.uif )" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="sys-libs/zlib" -DEPEND="${RDEPEND} - app-arch/unzip" - -S="${WORKDIR}" - -src_compile() { - emake CC="$(tc-getCC)" -C src -f - <<-'EOF' - CPPFLAGS += -DMAGICISO_IS_SHIT - LDLIBS = -lz - uif2iso: $(patsubst %.c,%.o,$(wildcard *.c)) - EOF -} - -src_test() { - einfo "checking that uif -> iso matches the expected output" - src/${PN} "${DISTDIR}/${PN}-test.uif" "${T}/${PN}-test.iso" # always returns 1 - diff "${DISTDIR}/${PN}-test.iso" "${T}/${PN}-test.iso" || die "unexpected iso" -} - -src_install() { - dobin src/${PN} - dodoc ${PN}.txt README -} diff --git a/app-cdr/uif2iso/uif2iso-0.1.7c-r2.ebuild b/app-cdr/uif2iso/uif2iso-0.1.7c-r2.ebuild new file mode 100644 index 000000000000..ae20184cc167 --- /dev/null +++ b/app-cdr/uif2iso/uif2iso-0.1.7c-r2.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Convert CD images from uif (MagicISO) to iso" +HOMEPAGE="http://aluigi.altervista.org/mytoolz.htm#uif2iso" +SRC_URI=" + mirror://gentoo/${P}.zip + test? ( + https://yegortimoshenko.s3.amazonaws.com/${PN}-test.iso + https://yegortimoshenko.s3.amazonaws.com/${PN}-test.uif + )" +S="${WORKDIR}" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="sys-libs/zlib" +DEPEND="${RDEPEND}" +BDEPEND="app-arch/unzip" + +src_compile() { + emake CC="$(tc-getCC)" -C src -f - <<- 'EOF' + CPPFLAGS += -DMAGICISO_IS_SHIT + LDLIBS = -lz + uif2iso: $(patsubst %.c,%.o,$(wildcard *.c)) + EOF +} + +src_test() { + einfo "checking that uif -> iso matches the expected output" + src/uif2iso "${DISTDIR}"/uif2iso-test.uif "${T}"/uif2iso-test.iso # always returns 1 + diff "${DISTDIR}"/uif2iso-test.iso "${T}"/uif2iso-test.iso || die "unexpected iso" +} + +src_install() { + dobin src/uif2iso + dodoc uif2iso.txt README +} diff --git a/app-crypt/kbfs/Manifest b/app-crypt/kbfs/Manifest index 2bc893cd7aa7..5ebfa6f690e2 100644 --- a/app-crypt/kbfs/Manifest +++ b/app-crypt/kbfs/Manifest @@ -1,4 +1 @@ -DIST kbfs-2.10.1.tar.gz 4471525 BLAKE2B 79a1046a6d225ab790081e2ec0aa057c8aab9c3c1fd0fe9832769b01f2e92137aa3b6424c303b736dbc6142917aecbb32c54d98111b42be80e66ee459524c7f2 SHA512 66b07a07c4b4734465d8ea8eccf3b1d05c0c3ba8792161ed3fd8ed9eaccb43d51cf5ef44c8c44fca4a22ab2b360093f1801d9eb77904d2aa917d0a76026fffa9 DIST kbfs-2.11.0.tar.gz 4520872 BLAKE2B 4472360205f42f59bc18f64634b4e10f38f532db262de38260a459faf0d76b9f805fb3d5e12d21afecbd51a980e63c68cc2be47b4e5ab597b7b0bfdd491dd54d SHA512 f735f7fc1c958eabcb38933f19edeba0cd3854e3d5a2030c6e4301c9cea714c432993e099b2199060e1275982755f60728545e71151c5796eb9be4978790e2f5 -DIST kbfs-2.6.0.tar.gz 5836566 BLAKE2B 14ca1fa35d01330ad51c5ca735bea059dc4f5be10298f36d2a7bd10ab5cfe2a399104dbade2da58ea3e0e77ef1e24f0644b751e7f06b91e9f4360514aaa7f6df SHA512 f636f6d01fa12e63930be7fa2d0cd919c37e68820bd602af6a54703a64759e475c5e19e29bf60b94d02dd9db188709c9ecd4da7abd05af7880fdf5e94a8d3590 -DIST kbfs-2.8.0.tar.gz 4459997 BLAKE2B b361ae343ab5fada7f9edac8c5083173dca103362b6e0688df069fbc0bf7dbb0eab6779259bd5c1038c542d7f51b68259404aa24c797da5c3aee6fab9fc4dab1 SHA512 892b7c51f52ca129145f10932e23c22f0f7003ea8662d26939d4f9e72cd8296fc5a66516dc7a3135fdc1cb96b1d02160c0f1dd32a4a6fe13ddcd4750eac9b8fc diff --git a/app-crypt/kbfs/kbfs-2.10.1.ebuild b/app-crypt/kbfs/kbfs-2.10.1.ebuild deleted file mode 100644 index f6dfded5dc62..000000000000 --- a/app-crypt/kbfs/kbfs-2.10.1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit golang-build systemd - -DESCRIPTION="Keybase Filesystem (KBFS)" -HOMEPAGE="https://keybase.io/docs/kbfs" -SRC_URI="https://github.com/keybase/kbfs/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND=" - app-crypt/gnupg - sys-fs/fuse - " - -src_unpack() { - unpack "${P}.tar.gz" - mkdir -vp "${S}/src/github.com/keybase" || die - ln -vs "${S}" "${S}/src/github.com/keybase/kbfs" || die -} - -src_compile() { - EGO_PN="github.com/keybase/kbfs/kbfsfuse" \ - EGO_BUILD_FLAGS="-tags production -o ${T}/kbfsfuse" \ - golang-build_src_compile - EGO_PN="github.com/keybase/kbfs/kbfsgit/git-remote-keybase" \ - EGO_BUILD_FLAGS="-tags production -o ${T}/git-remote-keybase" \ - golang-build_src_compile - EGO_PN="github.com/keybase/kbfs/redirector" \ - EGO_BUILD_FLAGS="-tags production -o ${T}/keybase-redirector" \ - golang-build_src_compile -} - -src_test() { - EGO_PN="github.com/keybase/kbfs/kbfsfuse" \ - golang-build_src_test -} - -src_install() { - dobin "${T}/kbfsfuse" - dobin "${T}/git-remote-keybase" - dobin "${T}/keybase-redirector" - systemd_douserunit "${S}/packaging/linux/systemd/kbfs.service" -} diff --git a/app-crypt/kbfs/kbfs-2.6.0.ebuild b/app-crypt/kbfs/kbfs-2.6.0.ebuild deleted file mode 100644 index 41a15fe68057..000000000000 --- a/app-crypt/kbfs/kbfs-2.6.0.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit golang-build systemd - -DESCRIPTION="Keybase Filesystem (KBFS)" -HOMEPAGE="https://keybase.io/docs/kbfs" -SRC_URI="https://github.com/keybase/kbfs/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND=" - app-crypt/gnupg - sys-fs/fuse - " - -src_unpack() { - unpack "${P}.tar.gz" - mkdir -vp "${S}/src/github.com/keybase" || die - ln -vs "${S}" "${S}/src/github.com/keybase/kbfs" || die -} - -src_compile() { - EGO_PN="github.com/keybase/kbfs/kbfsfuse" \ - EGO_BUILD_FLAGS="-tags production -o ${T}/kbfsfuse" \ - golang-build_src_compile - EGO_PN="github.com/keybase/kbfs/kbfsgit/git-remote-keybase" \ - EGO_BUILD_FLAGS="-tags production -o ${T}/git-remote-keybase" \ - golang-build_src_compile - EGO_PN="github.com/keybase/kbfs/redirector" \ - EGO_BUILD_FLAGS="-tags production -o ${T}/keybase-redirector" \ - golang-build_src_compile -} - -src_test() { - EGO_PN="github.com/keybase/kbfs/kbfsfuse" \ - golang-build_src_test -} - -src_install() { - dobin "${T}/kbfsfuse" - dobin "${T}/git-remote-keybase" - dobin "${T}/keybase-redirector" - systemd_douserunit "${S}/packaging/linux/systemd/kbfs.service" -} diff --git a/app-crypt/kbfs/kbfs-2.8.0.ebuild b/app-crypt/kbfs/kbfs-2.8.0.ebuild deleted file mode 100644 index f6dfded5dc62..000000000000 --- a/app-crypt/kbfs/kbfs-2.8.0.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit golang-build systemd - -DESCRIPTION="Keybase Filesystem (KBFS)" -HOMEPAGE="https://keybase.io/docs/kbfs" -SRC_URI="https://github.com/keybase/kbfs/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="" -RDEPEND=" - app-crypt/gnupg - sys-fs/fuse - " - -src_unpack() { - unpack "${P}.tar.gz" - mkdir -vp "${S}/src/github.com/keybase" || die - ln -vs "${S}" "${S}/src/github.com/keybase/kbfs" || die -} - -src_compile() { - EGO_PN="github.com/keybase/kbfs/kbfsfuse" \ - EGO_BUILD_FLAGS="-tags production -o ${T}/kbfsfuse" \ - golang-build_src_compile - EGO_PN="github.com/keybase/kbfs/kbfsgit/git-remote-keybase" \ - EGO_BUILD_FLAGS="-tags production -o ${T}/git-remote-keybase" \ - golang-build_src_compile - EGO_PN="github.com/keybase/kbfs/redirector" \ - EGO_BUILD_FLAGS="-tags production -o ${T}/keybase-redirector" \ - golang-build_src_compile -} - -src_test() { - EGO_PN="github.com/keybase/kbfs/kbfsfuse" \ - golang-build_src_test -} - -src_install() { - dobin "${T}/kbfsfuse" - dobin "${T}/git-remote-keybase" - dobin "${T}/keybase-redirector" - systemd_douserunit "${S}/packaging/linux/systemd/kbfs.service" -} diff --git a/eclass/opam.eclass b/eclass/opam.eclass index dee40a4e9f96..197c3256f015 100644 --- a/eclass/opam.eclass +++ b/eclass/opam.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: opam.eclass @@ -7,15 +7,15 @@ # ML <ml@gentoo.org> # @AUTHOR: # Alexis Ballier <aballier@gentoo.org> -# @SUPPORTED_EAPIS: 5 6 7 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: Provides functions for installing opam packages. # @DESCRIPTION: # Provides dependencies on opam and ocaml, opam-install and a default # src_install for opam-based packages. -case ${EAPI:-0} in - 5|6|7) ;; - *) die "${ECLASS}: EAPI ${EAPI} not supported" ;; +case ${EAPI} in + 7|8) ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac # Do not complain about CFLAGS etc since ml projects do not use them. @@ -28,15 +28,8 @@ QA_FLAGS_IGNORED='.*' : ${OPAM_INSTALLER_DEP:="dev-ml/opam-installer"} RDEPEND=">=dev-lang/ocaml-4:=" -case ${EAPI:-0} in - 5|6) - DEPEND="${RDEPEND} ${OPAM_INSTALLER_DEP}" - ;; - *) - BDEPEND="${OPAM_INSTALLER_DEP} dev-lang/ocaml" - DEPEND="${RDEPEND}" - ;; -esac +BDEPEND="${OPAM_INSTALLER_DEP} dev-lang/ocaml" +DEPEND="${RDEPEND}" # @ECLASS_VARIABLE: OPAM_INSTALLER # @DESCRIPTION: @@ -52,10 +45,10 @@ opam-install() { local pkg for pkg ; do ${OPAM_INSTALLER} -i \ - --prefix="${ED%/}/usr" \ - --libdir="${D%/}/$(ocamlc -where)" \ - --docdir="${ED%/}/usr/share/doc/${PF}" \ - --mandir="${ED%/}/usr/share/man" \ + --prefix="${ED}/usr" \ + --libdir="${D}/$(ocamlc -where)" \ + --docdir="${ED}/usr/share/doc/${PF}" \ + --mandir="${ED}/usr/share/man" \ "${pkg}.install" || die done } @@ -64,9 +57,9 @@ opam_src_install() { local pkg="${1:-${PN}}" opam-install "${pkg}" # Handle opam putting doc in a subdir - if [ -d "${ED%/}/usr/share/doc/${PF}/${pkg}" ] ; then - mv "${ED%/}/usr/share/doc/${PF}/${pkg}/"* "${ED%/}/usr/share/doc/${PF}/" || die - rmdir "${ED%/}/usr/share/doc/${PF}/${pkg}" || die + if [[ -d ${ED}/usr/share/doc/${PF}/${pkg} ]] ; then + mv "${ED}/usr/share/doc/${PF}/${pkg}/"* "${ED}/usr/share/doc/${PF}/" || die + rmdir "${ED}/usr/share/doc/${PF}/${pkg}" || die fi } diff --git a/eclass/ros-catkin.eclass b/eclass/ros-catkin.eclass index feded640abfb..24e9857f3fc1 100644 --- a/eclass/ros-catkin.eclass +++ b/eclass/ros-catkin.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: ros-catkin.eclass @@ -13,9 +13,9 @@ # Provides function for building ROS packages on Gentoo. # It supports selectively building messages, single-python installation, live ebuilds (git only). -case "${EAPI:-0}" in +case ${EAPI} in 7) ;; - *) die "EAPI='${EAPI}' is not supported" ;; + *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac # @ECLASS_VARIABLE: ROS_REPO_URI @@ -36,17 +36,14 @@ EGIT_REPO_URI="${ROS_REPO_URI}" # @DESCRIPTION: # Set to enable in-source build. -SCM="" -if [ "${PV#9999}" != "${PV}" ] ; then - SCM="git-r3" -fi +[[ ${PV} == *9999 ]] && inherit git-r3 # ROS only really works with one global python version and the target # version depends on the release. Noetic targets 3.7 and 3.8. # py3.9 or later are ok to add there as long as dev-ros/* have their deps satisfied. PYTHON_COMPAT=( python3_{8..10} ) -inherit ${SCM} python-single-r1 cmake flag-o-matic +inherit python-single-r1 cmake flag-o-matic REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -54,8 +51,8 @@ IUSE="test" RESTRICT="!test? ( test )" RDEPEND="${PYTHON_DEPS}" DEPEND="${RDEPEND} - $(python_gen_cond_dep "dev-util/catkin[\${PYTHON_USEDEP}]") - $(python_gen_cond_dep "dev-python/empy[\${PYTHON_USEDEP}]") + $(python_gen_cond_dep 'dev-util/catkin[${PYTHON_USEDEP}]') + $(python_gen_cond_dep 'dev-python/empy[${PYTHON_USEDEP}]') " # @ECLASS_VARIABLE: CATKIN_HAS_MESSAGES @@ -70,7 +67,7 @@ DEPEND="${RDEPEND} # Some messages have dependencies on other messages. # In that case, CATKIN_MESSAGES_TRANSITIVE_DEPS should contain a space-separated list of atoms # representing those dependencies. The eclass uses it to ensure proper dependencies on these packages. -if [ -n "${CATKIN_HAS_MESSAGES}" ] ; then +if [[ -n ${CATKIN_HAS_MESSAGES} ]] ; then IUSE="${IUSE} +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs" RDEPEND="${RDEPEND} ros_messages_cxx? ( dev-ros/gencpp:=[${PYTHON_SINGLE_USEDEP}] ) @@ -84,12 +81,13 @@ if [ -n "${CATKIN_HAS_MESSAGES}" ] ; then dev-ros/message_generation dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}] " - if [ -n "${CATKIN_MESSAGES_TRANSITIVE_DEPS}" ] ; then + if [[ -n ${CATKIN_MESSAGES_TRANSITIVE_DEPS} ]] ; then for i in ${CATKIN_MESSAGES_TRANSITIVE_DEPS} ; do ds="${i}[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( ${i}[${PYTHON_SINGLE_USEDEP}] )" RDEPEND="${RDEPEND} ${ds}" DEPEND="${DEPEND} ${ds}" done + unset i fi fi @@ -118,9 +116,9 @@ CATKIN_MESSAGES_EUS_USEDEP="ros_messages_eus(-)" # Use it as cat/pkg[${CATKIN_MESSAGES_NODEJS_USEDEP}] to indicate a dependency on the nodejs messages of cat/pkg. CATKIN_MESSAGES_NODEJS_USEDEP="ros_messages_nodejs(-)" -if [ "${PV#9999}" != "${PV}" ] ; then - SRC_URI="" - KEYWORDS="" +if [[ ${PV} == *9999 ]] ; then + unset SRC_URI + unset KEYWORDS S=${WORKDIR}/${P}/${ROS_SUBDIR} else SRC_URI="${ROS_REPO_URI}/archive/${VER_PREFIX}${PV%_*}${VER_SUFFIX}.tar.gz -> ${ROS_REPO_URI##*/}-${PV}.tar.gz" @@ -135,11 +133,11 @@ HOMEPAGE="https://wiki.ros.org/${PN} ${ROS_REPO_URI}" # by installing a recursive CMakeLists.txt to handle bundles. ros-catkin_src_prepare() { # If no multibuild, just use cmake IN_SOURCE support - [ -n "${CATKIN_IN_SOURCE_BUILD}" ] && export CMAKE_IN_SOURCE_BUILD=yes + [[ -n ${CATKIN_IN_SOURCE_BUILD} ]] && export CMAKE_IN_SOURCE_BUILD=yes cmake_src_prepare - if [ ! -f "${S}/CMakeLists.txt" ] ; then + if [[ ! -f ${S}/CMakeLists.txt ]] ; then catkin_init_workspace || die fi @@ -162,7 +160,7 @@ ros-catkin_src_configure() { export ROS_ROOT="${EPREFIX}/usr/share/ros" export ROS_PYTHON_VERSION="${EPYTHON#python}" - if [ -n "${CATKIN_HAS_MESSAGES}" ] ; then + if [[ -n ${CATKIN_HAS_MESSAGES} ]] ; then ROS_LANG_DISABLE="" use ros_messages_cxx || ROS_LANG_DISABLE="${ROS_LANG_DISABLE}:gencpp" use ros_messages_eus || ROS_LANG_DISABLE="${ROS_LANG_DISABLE}:geneus" @@ -184,7 +182,7 @@ ros-catkin_src_configure() { -DPYTHON_EXECUTABLE="${PYTHON}" -DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}" ) - if [ -n "${CATKIN_IN_SOURCE_BUILD}" ] ; then + if [[ -n ${CATKIN_IN_SOURCE_BUILD} ]] ; then export CMAKE_USE_DIR="${BUILD_DIR}" fi @@ -205,7 +203,7 @@ ros-catkin_src_test() { cd "${BUILD_DIR}" || die # Regenerate env for tests, PYTHONPATH is not set properly otherwise... - if [ -f catkin_generated/generate_cached_setup.py ] ; then + if [[ -f catkin_generated/generate_cached_setup.py ]] ; then einfo "Regenerating setup_cached.sh for tests" ${PYTHON:-python} catkin_generated/generate_cached_setup.py || die fi @@ -218,7 +216,7 @@ ros-catkin_src_test() { # @DESCRIPTION: # Installs a catkin-based package. ros-catkin_src_install() { - if [ -n "${CATKIN_IN_SOURCE_BUILD}" ] ; then + if [[ -n ${CATKIN_IN_SOURCE_BUILD} ]] ; then export CMAKE_USE_DIR="${BUILD_DIR}" fi |