diff options
143 files changed, 675 insertions, 395 deletions
diff --git a/app-arch/tar/tar-1.32.ebuild b/app-arch/tar/tar-1.32.ebuild index 5cd710f63505..eedf274e20ed 100644 --- a/app-arch/tar/tar-1.32.ebuild +++ b/app-arch/tar/tar-1.32.ebuild @@ -38,9 +38,9 @@ src_prepare() { src_configure() { use static && append-ldflags -static local myeconfargs=( - --bindir="${EPREFIX%/}"/bin + --bindir="${EPREFIX}"/bin --enable-backup-scripts - --libexecdir="${EPREFIX%/}"/usr/sbin + --libexecdir="${EPREFIX}"/usr/sbin $(usex userland_GNU "" "--program-prefix=g") $(use_with acl posix-acls) $(use_enable nls) diff --git a/app-editors/nvi/nvi-1.81.6-r7.ebuild b/app-editors/nvi/nvi-1.81.6-r7.ebuild index dc52ca6e54cb..322ca70ae4fd 100644 --- a/app-editors/nvi/nvi-1.81.6-r7.ebuild +++ b/app-editors/nvi/nvi-1.81.6-r7.ebuild @@ -57,7 +57,7 @@ src_configure() { use unicode && myconf="${myconf} --enable-widechar" use tcl && myconf="${myconf} --enable-tclinterp" - append-cppflags "-D_PATH_MSGCAT=\"\\\"${EPREFIX%/}/usr/share/vi/catalog/\\\"\"" + append-cppflags "-D_PATH_MSGCAT=\"\\\"${EPREFIX}/usr/share/vi/catalog/\\\"\"" append-cppflags -I"$(db_includedir)" # Darwin doesn't have stropts.h, bug #619416 diff --git a/app-emulation/faudio/faudio-19.06.ebuild b/app-emulation/faudio/faudio-19.06.ebuild index bf85557a0a05..bc47b4154131 100644 --- a/app-emulation/faudio/faudio-19.06.ebuild +++ b/app-emulation/faudio/faudio-19.06.ebuild @@ -44,7 +44,6 @@ multilib_src_configure() { "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_INCLUDEDIR=include/${FAUDIO_PN}" "-DCMAKE_INSTALL_LIBDIR=$(get_libdir)" - "-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr" "-DCMAKE_BUILD_TYPE=$(usex debug Debug Release)" "-DFORCE_ENABLE_DEBUGCONFIGURATION=$(usex debug ON OFF)" "-DBUILD_TESTS=$(usex test ON OFF)" diff --git a/app-emulation/faudio/faudio-19.09.ebuild b/app-emulation/faudio/faudio-19.09.ebuild index bf85557a0a05..bc47b4154131 100644 --- a/app-emulation/faudio/faudio-19.09.ebuild +++ b/app-emulation/faudio/faudio-19.09.ebuild @@ -44,7 +44,6 @@ multilib_src_configure() { "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_INCLUDEDIR=include/${FAUDIO_PN}" "-DCMAKE_INSTALL_LIBDIR=$(get_libdir)" - "-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr" "-DCMAKE_BUILD_TYPE=$(usex debug Debug Release)" "-DFORCE_ENABLE_DEBUGCONFIGURATION=$(usex debug ON OFF)" "-DBUILD_TESTS=$(usex test ON OFF)" diff --git a/app-emulation/faudio/faudio-9999.ebuild b/app-emulation/faudio/faudio-9999.ebuild index bf85557a0a05..bc47b4154131 100644 --- a/app-emulation/faudio/faudio-9999.ebuild +++ b/app-emulation/faudio/faudio-9999.ebuild @@ -44,7 +44,6 @@ multilib_src_configure() { "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_INCLUDEDIR=include/${FAUDIO_PN}" "-DCMAKE_INSTALL_LIBDIR=$(get_libdir)" - "-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr" "-DCMAKE_BUILD_TYPE=$(usex debug Debug Release)" "-DFORCE_ENABLE_DEBUGCONFIGURATION=$(usex debug ON OFF)" "-DBUILD_TESTS=$(usex test ON OFF)" diff --git a/app-eselect/eselect-wine/eselect-wine-1.2.2.ebuild b/app-eselect/eselect-wine/eselect-wine-1.2.2.ebuild index b9ffbc92c0d4..2036ec1a6c56 100644 --- a/app-eselect/eselect-wine/eselect-wine-1.2.2.ebuild +++ b/app-eselect/eselect-wine/eselect-wine-1.2.2.ebuild @@ -30,7 +30,7 @@ pkg_postinst() { # In /usr/include this breaks gcc build. # https://bugs.gentoo.org/434180 if [[ $(readlink "${EROOT%/}"/usr/include/wine) == //* ]]; then - ewarn "Leading double slash in ${EPREFIX%/}/usr/include/wine symlink detected." + ewarn "Leading double slash in ${EPREFIX}/usr/include/wine symlink detected." ewarn "Re-setting wine symlinks..." eselect wine update --if-unset fi diff --git a/app-i18n/imhangul/imhangul-2.1.0-r1.ebuild b/app-i18n/imhangul/imhangul-2.1.0-r1.ebuild index be31caf2f266..5fd39a7e384b 100644 --- a/app-i18n/imhangul/imhangul-2.1.0-r1.ebuild +++ b/app-i18n/imhangul/imhangul-2.1.0-r1.ebuild @@ -28,7 +28,7 @@ src_prepare() { } src_configure() { - econf --with-gtk-im-module-dir="${EPREFIX%/}"/usr/$(get_libdir)/gtk-2.0/$(pkg-config gtk+-2.0 --variable=gtk_binary_version)/immodules + econf --with-gtk-im-module-dir="${EPREFIX}"/usr/$(get_libdir)/gtk-2.0/$(pkg-config gtk+-2.0 --variable=gtk_binary_version)/immodules } src_install() { diff --git a/app-i18n/imhangul/imhangul-2.1.1.ebuild b/app-i18n/imhangul/imhangul-2.1.1.ebuild index 296851718916..d55a5638bcfa 100644 --- a/app-i18n/imhangul/imhangul-2.1.1.ebuild +++ b/app-i18n/imhangul/imhangul-2.1.1.ebuild @@ -28,7 +28,7 @@ src_prepare() { } src_configure() { - econf --with-gtk-im-module-dir="${EPREFIX%/}"/usr/$(get_libdir)/gtk-2.0/$(pkg-config gtk+-2.0 --variable=gtk_binary_version)/immodules + econf --with-gtk-im-module-dir="${EPREFIX}"/usr/$(get_libdir)/gtk-2.0/$(pkg-config gtk+-2.0 --variable=gtk_binary_version)/immodules } src_install() { diff --git a/app-i18n/imhangul/imhangul-3.1.1.ebuild b/app-i18n/imhangul/imhangul-3.1.1.ebuild index 667c30d3e7f9..6be5482fcaf5 100644 --- a/app-i18n/imhangul/imhangul-3.1.1.ebuild +++ b/app-i18n/imhangul/imhangul-3.1.1.ebuild @@ -28,7 +28,7 @@ src_prepare() { } src_configure() { - econf --with-gtk-im-module-dir="${EPREFIX%/}"/usr/$(get_libdir)/gtk-3.0/$(pkg-config gtk+-3.0 --variable=gtk_binary_version)/immodules + econf --with-gtk-im-module-dir="${EPREFIX}"/usr/$(get_libdir)/gtk-3.0/$(pkg-config gtk+-3.0 --variable=gtk_binary_version)/immodules } src_install() { diff --git a/app-portage/elt-patches/elt-patches-20170815.ebuild b/app-portage/elt-patches/elt-patches-20170815.ebuild index e3277fd1030d..dc6afb3eda28 100644 --- a/app-portage/elt-patches/elt-patches-20170815.ebuild +++ b/app-portage/elt-patches/elt-patches-20170815.ebuild @@ -16,9 +16,9 @@ RDEPEND="sys-apps/gentoo-functions" DEPEND="app-arch/xz-utils" src_compile() { - emake rootprefix="${EPREFIX%/}" libdirname="$(get_libdir)" + emake rootprefix="${EPREFIX}" libdirname="$(get_libdir)" } src_install() { - emake DESTDIR="${D}" rootprefix="${EPREFIX%/}" install + emake DESTDIR="${D}" rootprefix="${EPREFIX}" install } diff --git a/app-portage/elt-patches/elt-patches-20170826.1.ebuild b/app-portage/elt-patches/elt-patches-20170826.1.ebuild index 83c31abb0a3b..69f1f1e61fb5 100644 --- a/app-portage/elt-patches/elt-patches-20170826.1.ebuild +++ b/app-portage/elt-patches/elt-patches-20170826.1.ebuild @@ -16,9 +16,9 @@ RDEPEND="sys-apps/gentoo-functions" DEPEND="app-arch/xz-utils" src_compile() { - emake rootprefix="${EPREFIX%/}" libdirname="$(get_libdir)" + emake rootprefix="${EPREFIX}" libdirname="$(get_libdir)" } src_install() { - emake DESTDIR="${D}" rootprefix="${EPREFIX%/}" install + emake DESTDIR="${D}" rootprefix="${EPREFIX}" install } diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild index c4997d7b9543..11f78ab3576b 100644 --- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild +++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild @@ -71,7 +71,7 @@ multilib_src_configure() { -DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF) -DWITH_CURL=$(usex curl ON OFF) -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF) - -DMARIADB_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock" + -DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" -DINSTALL_LIBDIR="$(get_libdir)" -DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin" -DINSTALL_BINDIR=bin diff --git a/dev-db/mariadb/mariadb-10.1.38-r1.ebuild b/dev-db/mariadb/mariadb-10.1.38-r1.ebuild index bd01fadd2b56..07de6ddfdd2c 100644 --- a/dev-db/mariadb/mariadb-10.1.38-r1.ebuild +++ b/dev-db/mariadb/mariadb-10.1.38-r1.ebuild @@ -288,8 +288,7 @@ src_configure(){ mycmakeargs=( -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" - -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr" - -DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql" + -DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql" -DINSTALL_BINDIR=bin -DINSTALL_DOCDIR=share/doc/${PF} -DINSTALL_DOCREADMEDIR=share/doc/${PF} @@ -301,15 +300,15 @@ src_configure(){ -DINSTALL_MYSQLTESTDIR=$(usex test 'share/mariadb/mysql-test' '') -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin -DINSTALL_SCRIPTDIR=share/mariadb/scripts - -DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql" + -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql" -DINSTALL_SBINDIR=sbin - -DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mariadb" + -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb" -DCOMPILATION_COMMENT="Gentoo Linux ${PF}" -DWITH_UNIT_TESTS=$(usex test ON OFF) -DWITH_ZLIB=system -DENABLED_LOCAL_INFILE=1 - -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock" - -DINSTALL_UNIX_ADDRDIR="${EPREFIX%/}/var/run/mysqld/mysqld.sock" + -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" + -DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock" -DWITH_DEFAULT_COMPILER_OPTIONS=0 -DWITH_DEFAULT_FEATURE_SET=0 -DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)" diff --git a/dev-db/mariadb/mariadb-10.1.43.ebuild b/dev-db/mariadb/mariadb-10.1.43.ebuild index efd07a576537..d131c0c4cb07 100644 --- a/dev-db/mariadb/mariadb-10.1.43.ebuild +++ b/dev-db/mariadb/mariadb-10.1.43.ebuild @@ -293,8 +293,7 @@ src_configure(){ mycmakeargs=( -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" - -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr" - -DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql" + -DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql" -DINSTALL_BINDIR=bin -DINSTALL_DOCDIR=share/doc/${PF} -DINSTALL_DOCREADMEDIR=share/doc/${PF} @@ -306,15 +305,15 @@ src_configure(){ -DINSTALL_MYSQLTESTDIR=$(usex test 'share/mariadb/mysql-test' '') -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin -DINSTALL_SCRIPTDIR=share/mariadb/scripts - -DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql" + -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql" -DINSTALL_SBINDIR=sbin - -DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mariadb" + -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb" -DCOMPILATION_COMMENT="Gentoo Linux ${PF}" -DWITH_UNIT_TESTS=$(usex test ON OFF) -DWITH_ZLIB=system -DENABLED_LOCAL_INFILE=1 - -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock" - -DINSTALL_UNIX_ADDRDIR="${EPREFIX%/}/var/run/mysqld/mysqld.sock" + -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" + -DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock" -DWITH_DEFAULT_COMPILER_OPTIONS=0 -DWITH_DEFAULT_FEATURE_SET=0 -DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)" diff --git a/dev-db/mariadb/mariadb-10.1.44.ebuild b/dev-db/mariadb/mariadb-10.1.44.ebuild index 4e0e9491bb2a..b68568b59247 100644 --- a/dev-db/mariadb/mariadb-10.1.44.ebuild +++ b/dev-db/mariadb/mariadb-10.1.44.ebuild @@ -297,8 +297,7 @@ src_configure(){ mycmakeargs=( -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" - -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr" - -DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql" + -DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql" -DINSTALL_BINDIR=bin -DINSTALL_DOCDIR=share/doc/${PF} -DINSTALL_DOCREADMEDIR=share/doc/${PF} @@ -310,15 +309,15 @@ src_configure(){ -DINSTALL_MYSQLTESTDIR=$(usex test 'share/mariadb/mysql-test' '') -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin -DINSTALL_SCRIPTDIR=share/mariadb/scripts - -DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql" + -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql" -DINSTALL_SBINDIR=sbin - -DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mariadb" + -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb" -DCOMPILATION_COMMENT="Gentoo Linux ${PF}" -DWITH_UNIT_TESTS=$(usex test ON OFF) -DWITH_ZLIB=system -DENABLED_LOCAL_INFILE=1 - -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock" - -DINSTALL_UNIX_ADDRDIR="${EPREFIX%/}/var/run/mysqld/mysqld.sock" + -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" + -DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock" -DWITH_DEFAULT_COMPILER_OPTIONS=0 -DWITH_DEFAULT_FEATURE_SET=0 -DINSTALL_SYSTEMD_UNITDIR="$(systemd_get_systemunitdir)" diff --git a/dev-db/mariadb/mariadb-10.2.22-r1.ebuild b/dev-db/mariadb/mariadb-10.2.22-r1.ebuild index ce87ebab1b39..79d8b88b16d4 100644 --- a/dev-db/mariadb/mariadb-10.2.22-r1.ebuild +++ b/dev-db/mariadb/mariadb-10.2.22-r1.ebuild @@ -326,7 +326,6 @@ src_configure(){ mycmakeargs=( -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql" -DSYSCONFDIR="${EPREFIX}/etc/mysql" -DINSTALL_BINDIR=bin diff --git a/dev-db/mariadb/mariadb-10.2.29.ebuild b/dev-db/mariadb/mariadb-10.2.29.ebuild index 7b99a2969bbd..fc259fc3c054 100644 --- a/dev-db/mariadb/mariadb-10.2.29.ebuild +++ b/dev-db/mariadb/mariadb-10.2.29.ebuild @@ -335,7 +335,6 @@ src_configure(){ mycmakeargs=( -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql" -DSYSCONFDIR="${EPREFIX}/etc/mysql" -DINSTALL_BINDIR=bin diff --git a/dev-db/mariadb/mariadb-10.2.31.ebuild b/dev-db/mariadb/mariadb-10.2.31.ebuild index b95e1279e5c7..8e713f24f7cd 100644 --- a/dev-db/mariadb/mariadb-10.2.31.ebuild +++ b/dev-db/mariadb/mariadb-10.2.31.ebuild @@ -336,7 +336,6 @@ src_configure(){ mycmakeargs=( -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql" -DSYSCONFDIR="${EPREFIX}/etc/mysql" -DINSTALL_BINDIR=bin diff --git a/dev-db/mariadb/mariadb-10.3.20.ebuild b/dev-db/mariadb/mariadb-10.3.20.ebuild index 7fb13269e69d..cc2498f533dd 100644 --- a/dev-db/mariadb/mariadb-10.3.20.ebuild +++ b/dev-db/mariadb/mariadb-10.3.20.ebuild @@ -325,7 +325,6 @@ src_configure(){ mycmakeargs=( -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql" -DSYSCONFDIR="${EPREFIX}/etc/mysql" -DINSTALL_BINDIR=bin diff --git a/dev-db/mariadb/mariadb-10.3.22.ebuild b/dev-db/mariadb/mariadb-10.3.22.ebuild index cf26f76d0451..f65deda16f81 100644 --- a/dev-db/mariadb/mariadb-10.3.22.ebuild +++ b/dev-db/mariadb/mariadb-10.3.22.ebuild @@ -326,7 +326,6 @@ src_configure(){ mycmakeargs=( -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql" -DSYSCONFDIR="${EPREFIX}/etc/mysql" -DINSTALL_BINDIR=bin diff --git a/dev-db/mariadb/mariadb-10.4.10.ebuild b/dev-db/mariadb/mariadb-10.4.10.ebuild index c479a1ae70d5..c5d00cd5a4e2 100644 --- a/dev-db/mariadb/mariadb-10.4.10.ebuild +++ b/dev-db/mariadb/mariadb-10.4.10.ebuild @@ -335,7 +335,6 @@ src_configure(){ mycmakeargs=( -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql" -DSYSCONFDIR="${EPREFIX}/etc/mysql" -DINSTALL_BINDIR=bin diff --git a/dev-db/mariadb/mariadb-10.4.12.ebuild b/dev-db/mariadb/mariadb-10.4.12.ebuild index 13396dc69603..10c241797c7d 100644 --- a/dev-db/mariadb/mariadb-10.4.12.ebuild +++ b/dev-db/mariadb/mariadb-10.4.12.ebuild @@ -336,7 +336,6 @@ src_configure(){ mycmakeargs=( -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql" -DSYSCONFDIR="${EPREFIX}/etc/mysql" -DINSTALL_BINDIR=bin diff --git a/dev-db/mariadb/mariadb-5.5.66.ebuild b/dev-db/mariadb/mariadb-5.5.66.ebuild index 2cd8c6360ff0..17ef7180271b 100644 --- a/dev-db/mariadb/mariadb-5.5.66.ebuild +++ b/dev-db/mariadb/mariadb-5.5.66.ebuild @@ -254,8 +254,7 @@ src_configure(){ mycmakeargs=( -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" - -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr" - -DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql" + -DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql" -DINSTALL_BINDIR=bin -DINSTALL_DOCDIR=share/doc/${PF} -DINSTALL_DOCREADMEDIR=share/doc/${PF} @@ -266,15 +265,15 @@ src_configure(){ -DINSTALL_MYSQLSHAREDIR=share/mariadb -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin -DINSTALL_SCRIPTDIR=share/mariadb/scripts - -DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql" + -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql" -DINSTALL_SBINDIR=sbin - -DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mariadb" + -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb" -DCOMPILATION_COMMENT="Gentoo Linux ${PF}" -DWITH_UNIT_TESTS=$(usex test ON OFF) -DWITH_ZLIB=system -DENABLED_LOCAL_INFILE=1 - -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock" - -DINSTALL_UNIX_ADDRDIR="${EPREFIX%/}/var/run/mysqld/mysqld.sock" + -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" + -DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock" # The build forces this to be defined when cross-compiling. We pass it # all the time for simplicity and to make sure it is actually correct. -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1) diff --git a/dev-db/mariadb/mariadb-5.5.67.ebuild b/dev-db/mariadb/mariadb-5.5.67.ebuild index 414400eba524..fbd7f924edf8 100644 --- a/dev-db/mariadb/mariadb-5.5.67.ebuild +++ b/dev-db/mariadb/mariadb-5.5.67.ebuild @@ -254,8 +254,7 @@ src_configure(){ mycmakeargs=( -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" - -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr" - -DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql" + -DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql" -DINSTALL_BINDIR=bin -DINSTALL_DOCDIR=share/doc/${PF} -DINSTALL_DOCREADMEDIR=share/doc/${PF} @@ -266,15 +265,15 @@ src_configure(){ -DINSTALL_MYSQLSHAREDIR=share/mariadb -DINSTALL_PLUGINDIR=$(get_libdir)/mariadb/plugin -DINSTALL_SCRIPTDIR=share/mariadb/scripts - -DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql" + -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql" -DINSTALL_SBINDIR=sbin - -DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mariadb" + -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mariadb" -DCOMPILATION_COMMENT="Gentoo Linux ${PF}" -DWITH_UNIT_TESTS=$(usex test ON OFF) -DWITH_ZLIB=system -DENABLED_LOCAL_INFILE=1 - -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock" - -DINSTALL_UNIX_ADDRDIR="${EPREFIX%/}/var/run/mysqld/mysqld.sock" + -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" + -DINSTALL_UNIX_ADDRDIR="${EPREFIX}/var/run/mysqld/mysqld.sock" # The build forces this to be defined when cross-compiling. We pass it # all the time for simplicity and to make sure it is actually correct. -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1) diff --git a/dev-db/mysql++/mysql++-3.2.4.ebuild b/dev-db/mysql++/mysql++-3.2.4.ebuild index 24978aa9f91f..ba9a947c7f13 100644 --- a/dev-db/mysql++/mysql++-3.2.4.ebuild +++ b/dev-db/mysql++/mysql++-3.2.4.ebuild @@ -43,7 +43,7 @@ src_prepare() { src_configure() { local myconf=( --enable-thread-check - --with-mysql="${EPREFIX%/}/usr" + --with-mysql="${EPREFIX}/usr" --with-mysql-lib="${EPREFIX}$(mysql_config --variable=pkglibdir)" --with-mysql-include="${EPREFIX}$(mysql_config --variable=pkgincludedir)" ) diff --git a/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild index 8ecb148dc58a..048d9b67f192 100644 --- a/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild +++ b/dev-db/mysql-cluster/mysql-cluster-7.2.34.ebuild @@ -238,8 +238,7 @@ src_configure(){ mycmakeargs=( -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" - -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr" - -DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql" + -DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql" -DINSTALL_BINDIR=bin -DINSTALL_DOCDIR=share/doc/${PF} -DINSTALL_DOCREADMEDIR=share/doc/${PF} @@ -250,14 +249,14 @@ src_configure(){ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin -DINSTALL_SCRIPTDIR=share/mysql/scripts - -DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql" + -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql" -DINSTALL_SBINDIR=sbin - -DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mysql" + -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql" -DCOMPILATION_COMMENT="Gentoo Linux ${PF}" -DWITH_UNIT_TESTS=$(usex test ON OFF) -DWITH_ZLIB=system -DENABLED_LOCAL_INFILE=1 - -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock" + -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" # The build forces this to be defined when cross-compiling. We pass it # all the time for simplicity and to make sure it is actually correct. -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1) diff --git a/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild index 8a33824b92a4..9456b1c4a778 100644 --- a/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild +++ b/dev-db/mysql-cluster/mysql-cluster-7.3.22.ebuild @@ -239,8 +239,7 @@ src_configure(){ mycmakeargs=( -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" - -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr" - -DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql" + -DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql" -DINSTALL_BINDIR=bin -DINSTALL_DOCDIR=share/doc/${PF} -DINSTALL_DOCREADMEDIR=share/doc/${PF} @@ -251,16 +250,16 @@ src_configure(){ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin -DINSTALL_SCRIPTDIR=share/mysql/scripts - -DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql" + -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql" -DINSTALL_SBINDIR=sbin - -DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mysql" + -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql" -DCOMPILATION_COMMENT="Gentoo Linux ${PF}" -DWITH_UNIT_TESTS=$(usex test ON OFF) -DWITH_EDITLINE=bundled -DWITH_ZLIB=system -DWITH_LIBWRAP=OFF -DENABLED_LOCAL_INFILE=1 - -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock" + -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" # The build forces this to be defined when cross-compiling. We pass it # all the time for simplicity and to make sure it is actually correct. -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1) diff --git a/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild b/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild index 8d0360acf3a8..a4c51a22cc00 100644 --- a/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild +++ b/dev-db/mysql-cluster/mysql-cluster-7.4.21.ebuild @@ -239,8 +239,7 @@ src_configure(){ mycmakeargs=( -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" - -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr" - -DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql" + -DDEFAULT_SYSCONFDIR="${EPREFIX}/etc/mysql" -DINSTALL_BINDIR=bin -DINSTALL_DOCDIR=share/doc/${PF} -DINSTALL_DOCREADMEDIR=share/doc/${PF} @@ -251,16 +250,16 @@ src_configure(){ -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin -DINSTALL_SCRIPTDIR=share/mysql/scripts - -DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql" + -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql" -DINSTALL_SBINDIR=sbin - -DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mysql" + -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql" -DCOMPILATION_COMMENT="Gentoo Linux ${PF}" -DWITH_UNIT_TESTS=$(usex test ON OFF) -DWITH_EDITLINE=bundled -DWITH_ZLIB=system -DWITH_LIBWRAP=OFF -DENABLED_LOCAL_INFILE=1 - -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock" + -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" # The build forces this to be defined when cross-compiling. We pass it # all the time for simplicity and to make sure it is actually correct. -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1) diff --git a/dev-db/mysql/mysql-5.6.44-r1.ebuild b/dev-db/mysql/mysql-5.6.44-r1.ebuild index 65e334429702..0238c0f2d4b7 100644 --- a/dev-db/mysql/mysql-5.6.44-r1.ebuild +++ b/dev-db/mysql/mysql-5.6.44-r1.ebuild @@ -245,7 +245,6 @@ src_configure(){ mycmakeargs=( -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql" -DSYSCONFDIR="${EPREFIX}/etc/mysql" -DINSTALL_BINDIR=bin @@ -536,10 +535,10 @@ src_test() { } mysql_init_vars() { - MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX%/}/usr/share/mysql"} - MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX%/}/etc/mysql"} - MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX%/}/var/lib/mysql"} - MY_LOGDIR=${MY_LOGDIR="${EPREFIX%/}/var/log/mysql"} + MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"} + MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"} + MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"} + MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"} if [[ -z "${MY_DATADIR}" ]] ; then MY_DATADIR="" @@ -602,7 +601,7 @@ pkg_config() { local old_MY_DATADIR="${MY_DATADIR}" local old_HOME="${HOME}" # my_print_defaults needs to read stuff in $HOME/.my.cnf - export HOME=${EPREFIX%/}/root + export HOME=${EPREFIX}/root # Make sure the vars are correctly initialized mysql_init_vars @@ -763,13 +762,13 @@ pkg_config() { if [[ -r "${help_tables}" ]] ; then cat "${help_tables}" >> "${sqltmp}" fi - cmd+=( "--basedir=${EPREFIX%/}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" ) + cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" ) einfo "Command: ${cmd[*]}" su -s /bin/sh -c "${cmd[*]}" mysql \ >"${TMPDIR%/}"/mysql_install_db.log 2>&1 if [ $? -ne 0 ]; then grep -B5 -A999 -i "ERROR" "${TMPDIR%/}"/mysql_install_db.log 1>&2 - die "Failed to initialize mysqld. Please review ${EPREFIX%/}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log" + die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log" fi popd &>/dev/null || die [[ -f "${ROOT%/}/${MY_DATADIR}/mysql/user.frm" ]] \ diff --git a/dev-db/mysql/mysql-5.6.45-r2.ebuild b/dev-db/mysql/mysql-5.6.45-r2.ebuild index 1ea042478213..6f1c6b5e8485 100644 --- a/dev-db/mysql/mysql-5.6.45-r2.ebuild +++ b/dev-db/mysql/mysql-5.6.45-r2.ebuild @@ -254,7 +254,6 @@ src_configure(){ mycmakeargs=( -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql" -DSYSCONFDIR="${EPREFIX}/etc/mysql" -DINSTALL_BINDIR=bin @@ -545,10 +544,10 @@ src_test() { } mysql_init_vars() { - MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX%/}/usr/share/mysql"} - MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX%/}/etc/mysql"} - MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX%/}/var/lib/mysql"} - MY_LOGDIR=${MY_LOGDIR="${EPREFIX%/}/var/log/mysql"} + MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"} + MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"} + MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"} + MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"} if [[ -z "${MY_DATADIR}" ]] ; then MY_DATADIR="" @@ -611,7 +610,7 @@ pkg_config() { local old_MY_DATADIR="${MY_DATADIR}" local old_HOME="${HOME}" # my_print_defaults needs to read stuff in $HOME/.my.cnf - export HOME=${EPREFIX%/}/root + export HOME=${EPREFIX}/root # Make sure the vars are correctly initialized mysql_init_vars @@ -772,13 +771,13 @@ pkg_config() { if [[ -r "${help_tables}" ]] ; then cat "${help_tables}" >> "${sqltmp}" fi - cmd+=( "--basedir=${EPREFIX%/}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" ) + cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" ) einfo "Command: ${cmd[*]}" su -s /bin/sh -c "${cmd[*]}" mysql \ >"${TMPDIR%/}"/mysql_install_db.log 2>&1 if [ $? -ne 0 ]; then grep -B5 -A999 -i "ERROR" "${TMPDIR%/}"/mysql_install_db.log 1>&2 - die "Failed to initialize mysqld. Please review ${EPREFIX%/}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log" + die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log" fi popd &>/dev/null || die [[ -f "${ROOT%/}/${MY_DATADIR}/mysql/user.frm" ]] \ diff --git a/dev-db/mysql/mysql-5.7.26-r1.ebuild b/dev-db/mysql/mysql-5.7.26-r1.ebuild index 7cf6286849df..8825edb4d07a 100644 --- a/dev-db/mysql/mysql-5.7.26-r1.ebuild +++ b/dev-db/mysql/mysql-5.7.26-r1.ebuild @@ -125,10 +125,10 @@ RDEPEND="${COMMON_DEPEND} PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )" mysql_init_vars() { - MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX%/}/usr/share/mysql"} - MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX%/}/etc/mysql"} - MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX%/}/var/lib/mysql"} - MY_LOGDIR=${MY_LOGDIR="${EPREFIX%/}/var/log/mysql"} + MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"} + MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"} + MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"} + MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"} if [[ -z "${MY_DATADIR}" ]] ; then MY_DATADIR="" @@ -333,9 +333,8 @@ multilib_src_configure() { mycmakeargs=( -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" - -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr" - -DMYSQL_DATADIR="${EPREFIX%/}/var/lib/mysql" - -DSYSCONFDIR="${EPREFIX%/}/etc/mysql" + -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql" + -DSYSCONFDIR="${EPREFIX}/etc/mysql" -DINSTALL_BINDIR=bin -DINSTALL_DOCDIR=share/doc/${PF} -DINSTALL_DOCREADMEDIR=share/doc/${PF} @@ -346,9 +345,9 @@ multilib_src_configure() { -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin -DINSTALL_SCRIPTDIR=share/mysql/scripts - -DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql" + -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql" -DINSTALL_SBINDIR=sbin - -DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mysql" + -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql" -DCOMPILATION_COMMENT="Gentoo Linux ${PF}" -DWITH_UNIT_TESTS=$(usex test ON OFF) ### TODO: make this system but issues with UTF-8 prevent it @@ -356,7 +355,7 @@ multilib_src_configure() { -DWITH_ZLIB=system -DWITH_LIBWRAP=0 -DENABLED_LOCAL_INFILE=1 - -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock" + -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" -DWITH_DEFAULT_COMPILER_OPTIONS=0 -DWITH_DEFAULT_FEATURE_SET=0 # The build forces this to be defined when cross-compiling. We pass it @@ -774,7 +773,7 @@ pkg_config() { local old_MY_DATADIR="${MY_DATADIR}" local old_HOME="${HOME}" # my_print_defaults needs to read stuff in $HOME/.my.cnf - export HOME=${EPREFIX%/}/root + export HOME=${EPREFIX}/root # Make sure the vars are correctly initialized mysql_init_vars @@ -930,13 +929,13 @@ pkg_config() { # --initialize-insecure will not set root password # --initialize would set a random one in the log which we don't need as we set it ourselves local cmd=( "${EROOT%/}/usr/sbin/mysqld" "--initialize-insecure" "--init-file='${sqltmp}'" ) - cmd+=( "--basedir=${EPREFIX%/}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" ) + cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" ) einfo "Command: ${cmd[*]}" su -s /bin/sh -c "${cmd[*]}" mysql \ >"${TMPDIR%/}"/mysql_install_db.log 2>&1 if [[ $? -ne 0 ]] ; then grep -B5 -A999 -i "ERROR" "${TMPDIR%/}"/mysql_install_db.log 1>&2 - die "Failed to initialize mysqld. Please review ${EPREFIX%/}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log" + die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log" fi popd &>/dev/null || die [[ -f "${ROOT%/}/${MY_DATADIR}/mysql/user.frm" ]] \ diff --git a/dev-db/mysql/mysql-5.7.27-r1.ebuild b/dev-db/mysql/mysql-5.7.27-r1.ebuild index 5a103007c82a..0bfc4b1cbcf7 100644 --- a/dev-db/mysql/mysql-5.7.27-r1.ebuild +++ b/dev-db/mysql/mysql-5.7.27-r1.ebuild @@ -133,10 +133,10 @@ RDEPEND="${COMMON_DEPEND} PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )" mysql_init_vars() { - MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX%/}/usr/share/mysql"} - MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX%/}/etc/mysql"} - MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX%/}/var/lib/mysql"} - MY_LOGDIR=${MY_LOGDIR="${EPREFIX%/}/var/log/mysql"} + MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"} + MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"} + MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"} + MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"} if [[ -z "${MY_DATADIR}" ]] ; then MY_DATADIR="" @@ -344,9 +344,8 @@ multilib_src_configure() { mycmakeargs=( -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" - -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr" - -DMYSQL_DATADIR="${EPREFIX%/}/var/lib/mysql" - -DSYSCONFDIR="${EPREFIX%/}/etc/mysql" + -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql" + -DSYSCONFDIR="${EPREFIX}/etc/mysql" -DINSTALL_BINDIR=bin -DINSTALL_DOCDIR=share/doc/${PF} -DINSTALL_DOCREADMEDIR=share/doc/${PF} @@ -357,9 +356,9 @@ multilib_src_configure() { -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin -DINSTALL_SCRIPTDIR=share/mysql/scripts - -DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql" + -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql" -DINSTALL_SBINDIR=sbin - -DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mysql" + -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql" -DCOMPILATION_COMMENT="Gentoo Linux ${PF}" -DWITH_UNIT_TESTS=$(usex test ON OFF) ### TODO: make this system but issues with UTF-8 prevent it @@ -367,7 +366,7 @@ multilib_src_configure() { -DWITH_ZLIB=system -DWITH_LIBWRAP=0 -DENABLED_LOCAL_INFILE=1 - -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock" + -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" -DWITH_DEFAULT_COMPILER_OPTIONS=0 -DWITH_DEFAULT_FEATURE_SET=0 # The build forces this to be defined when cross-compiling. We pass it @@ -785,7 +784,7 @@ pkg_config() { local old_MY_DATADIR="${MY_DATADIR}" local old_HOME="${HOME}" # my_print_defaults needs to read stuff in $HOME/.my.cnf - export HOME=${EPREFIX%/}/root + export HOME=${EPREFIX}/root # Make sure the vars are correctly initialized mysql_init_vars @@ -941,13 +940,13 @@ pkg_config() { # --initialize-insecure will not set root password # --initialize would set a random one in the log which we don't need as we set it ourselves local cmd=( "${EROOT%/}/usr/sbin/mysqld" "--initialize-insecure" "--init-file='${sqltmp}'" ) - cmd+=( "--basedir=${EPREFIX%/}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" ) + cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" ) einfo "Command: ${cmd[*]}" su -s /bin/sh -c "${cmd[*]}" mysql \ >"${TMPDIR%/}"/mysql_install_db.log 2>&1 if [[ $? -ne 0 ]] ; then grep -B5 -A999 -i "ERROR" "${TMPDIR%/}"/mysql_install_db.log 1>&2 - die "Failed to initialize mysqld. Please review ${EPREFIX%/}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log" + die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log" fi popd &>/dev/null || die [[ -f "${ROOT%/}/${MY_DATADIR}/mysql/user.frm" ]] \ diff --git a/dev-db/mysql/mysql-5.7.29.ebuild b/dev-db/mysql/mysql-5.7.29.ebuild index d87e28c839bd..79346f5415bb 100644 --- a/dev-db/mysql/mysql-5.7.29.ebuild +++ b/dev-db/mysql/mysql-5.7.29.ebuild @@ -131,10 +131,10 @@ RDEPEND="${COMMON_DEPEND} PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )" mysql_init_vars() { - MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX%/}/usr/share/mysql"} - MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX%/}/etc/mysql"} - MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX%/}/var/lib/mysql"} - MY_LOGDIR=${MY_LOGDIR="${EPREFIX%/}/var/log/mysql"} + MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"} + MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"} + MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"} + MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"} if [[ -z "${MY_DATADIR}" ]] ; then MY_DATADIR="" @@ -342,9 +342,8 @@ multilib_src_configure() { mycmakeargs=( -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" - -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr" - -DMYSQL_DATADIR="${EPREFIX%/}/var/lib/mysql" - -DSYSCONFDIR="${EPREFIX%/}/etc/mysql" + -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql" + -DSYSCONFDIR="${EPREFIX}/etc/mysql" -DINSTALL_BINDIR=bin -DINSTALL_DOCDIR=share/doc/${PF} -DINSTALL_DOCREADMEDIR=share/doc/${PF} @@ -355,9 +354,9 @@ multilib_src_configure() { -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin -DINSTALL_SCRIPTDIR=share/mysql/scripts - -DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql" + -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql" -DINSTALL_SBINDIR=sbin - -DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mysql" + -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql" -DCOMPILATION_COMMENT="Gentoo Linux ${PF}" -DWITH_UNIT_TESTS=$(usex test ON OFF) ### TODO: make this system but issues with UTF-8 prevent it @@ -365,7 +364,7 @@ multilib_src_configure() { -DWITH_ZLIB=system -DWITH_LIBWRAP=0 -DENABLED_LOCAL_INFILE=1 - -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock" + -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" -DWITH_DEFAULT_COMPILER_OPTIONS=0 -DWITH_DEFAULT_FEATURE_SET=0 # The build forces this to be defined when cross-compiling. We pass it @@ -783,7 +782,7 @@ pkg_config() { local old_MY_DATADIR="${MY_DATADIR}" local old_HOME="${HOME}" # my_print_defaults needs to read stuff in $HOME/.my.cnf - export HOME=${EPREFIX%/}/root + export HOME=${EPREFIX}/root # Make sure the vars are correctly initialized mysql_init_vars @@ -939,13 +938,13 @@ pkg_config() { # --initialize-insecure will not set root password # --initialize would set a random one in the log which we don't need as we set it ourselves local cmd=( "${EROOT%/}/usr/sbin/mysqld" "--initialize-insecure" "--init-file='${sqltmp}'" ) - cmd+=( "--basedir=${EPREFIX%/}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" ) + cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" ) einfo "Command: ${cmd[*]}" su -s /bin/sh -c "${cmd[*]}" mysql \ >"${TMPDIR%/}"/mysql_install_db.log 2>&1 if [[ $? -ne 0 ]] ; then grep -B5 -A999 -i "ERROR" "${TMPDIR%/}"/mysql_install_db.log 1>&2 - die "Failed to initialize mysqld. Please review ${EPREFIX%/}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log" + die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log" fi popd &>/dev/null || die [[ -f "${ROOT%/}/${MY_DATADIR}/mysql/user.frm" ]] \ diff --git a/dev-db/mysql/mysql-8.0.19-r1.ebuild b/dev-db/mysql/mysql-8.0.19-r1.ebuild index 5fced0177f01..a4a825347945 100644 --- a/dev-db/mysql/mysql-8.0.19-r1.ebuild +++ b/dev-db/mysql/mysql-8.0.19-r1.ebuild @@ -222,7 +222,6 @@ src_configure(){ mycmakeargs=( -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql" -DSYSCONFDIR="${EPREFIX}/etc/mysql" -DINSTALL_BINDIR=bin diff --git a/dev-db/percona-server/percona-server-5.7.27.30.ebuild b/dev-db/percona-server/percona-server-5.7.27.30.ebuild index 5c4af55fc2eb..e936725d18de 100644 --- a/dev-db/percona-server/percona-server-5.7.27.30.ebuild +++ b/dev-db/percona-server/percona-server-5.7.27.30.ebuild @@ -161,10 +161,10 @@ python_check_deps() { } mysql_init_vars() { - MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX%/}/usr/share/mysql"} - MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX%/}/etc/mysql"} - MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX%/}/var/lib/mysql"} - MY_LOGDIR=${MY_LOGDIR="${EPREFIX%/}/var/log/mysql"} + MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"} + MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"} + MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"} + MY_LOGDIR=${MY_LOGDIR="${EPREFIX}/var/log/mysql"} if [[ -z "${MY_DATADIR}" ]] ; then MY_DATADIR="" @@ -395,9 +395,8 @@ multilib_src_configure() { mycmakeargs=( -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" - -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr" - -DMYSQL_DATADIR="${EPREFIX%/}/var/lib/mysql" - -DSYSCONFDIR="${EPREFIX%/}/etc/mysql" + -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql" + -DSYSCONFDIR="${EPREFIX}/etc/mysql" -DINSTALL_BINDIR=bin -DINSTALL_DOCDIR=share/doc/${PF} -DINSTALL_DOCREADMEDIR=share/doc/${PF} @@ -408,9 +407,9 @@ multilib_src_configure() { -DINSTALL_MYSQLSHAREDIR=share/mysql -DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin -DINSTALL_SCRIPTDIR=share/mysql/scripts - -DINSTALL_MYSQLDATADIR="${EPREFIX%/}/var/lib/mysql" + -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql" -DINSTALL_SBINDIR=sbin - -DINSTALL_SUPPORTFILESDIR="${EPREFIX%/}/usr/share/mysql" + -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql" -DCOMPILATION_COMMENT="Gentoo Linux ${PF}" -DWITH_UNIT_TESTS=$(usex test ON OFF) ### TODO: make this system but issues with UTF-8 prevent it @@ -418,7 +417,7 @@ multilib_src_configure() { -DWITH_ZLIB=system -DWITH_LIBWRAP=0 -DENABLED_LOCAL_INFILE=1 - -DMYSQL_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock" + -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" -DWITH_DEFAULT_COMPILER_OPTIONS=0 -DWITH_DEFAULT_FEATURE_SET=0 # The build forces this to be defined when cross-compiling. We pass it @@ -917,7 +916,7 @@ pkg_config() { local old_MY_DATADIR="${MY_DATADIR}" local old_HOME="${HOME}" # my_print_defaults needs to read stuff in $HOME/.my.cnf - export HOME=${EPREFIX%/}/root + export HOME=${EPREFIX}/root # Make sure the vars are correctly initialized mysql_init_vars @@ -1073,13 +1072,13 @@ pkg_config() { # --initialize-insecure will not set root password # --initialize would set a random one in the log which we don't need as we set it ourselves local cmd=( "${EROOT%/}/usr/sbin/mysqld" "--initialize-insecure" "--init-file='${sqltmp}'" ) - cmd+=( "--basedir=${EPREFIX%/}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" ) + cmd+=( "--basedir=${EPREFIX}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" ) einfo "Command: ${cmd[*]}" su -s /bin/sh -c "${cmd[*]}" mysql \ >"${TMPDIR%/}"/mysql_install_db.log 2>&1 if [[ $? -ne 0 ]] ; then grep -B5 -A999 -i "ERROR" "${TMPDIR%/}"/mysql_install_db.log 1>&2 - die "Failed to initialize mysqld. Please review ${EPREFIX%/}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log" + die "Failed to initialize mysqld. Please review ${EPREFIX}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log" fi popd &>/dev/null || die [[ -f "${ROOT%/}/${MY_DATADIR}/mysql/user.frm" ]] \ diff --git a/dev-db/percona-server/percona-server-8.0.18.9.ebuild b/dev-db/percona-server/percona-server-8.0.18.9.ebuild index a3c7cca82238..93fbfaacf7f7 100644 --- a/dev-db/percona-server/percona-server-8.0.18.9.ebuild +++ b/dev-db/percona-server/percona-server-8.0.18.9.ebuild @@ -233,7 +233,6 @@ src_configure(){ mycmakeargs=( -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql" -DSYSCONFDIR="${EPREFIX}/etc/mysql" -DINSTALL_BINDIR=bin diff --git a/dev-db/pgmodeler/pgmodeler-0.9.1.ebuild b/dev-db/pgmodeler/pgmodeler-0.9.1.ebuild index 0c8fc05f6763..7db68b875d7d 100644 --- a/dev-db/pgmodeler/pgmodeler-0.9.1.ebuild +++ b/dev-db/pgmodeler/pgmodeler-0.9.1.ebuild @@ -34,10 +34,10 @@ S="${WORKDIR}/${PN}-${MY_PV}" src_configure() { eqmake5 \ - PREFIX="${EPREFIX%/}/usr" \ - PLUGINSDIR="${EPREFIX%/}/usr/$(get_libdir)/${PN}/plugins" \ - PRIVATEBINDIR="${EPREFIX%/}/usr/$(get_libdir)/${PN}/bin" \ - PRIVATELIBDIR="${EPREFIX%/}/usr/$(get_libdir)/${PN}" \ + PREFIX="${EPREFIX}/usr" \ + PLUGINSDIR="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins" \ + PRIVATEBINDIR="${EPREFIX}/usr/$(get_libdir)/${PN}/bin" \ + PRIVATELIBDIR="${EPREFIX}/usr/$(get_libdir)/${PN}" \ NO_UPDATE_CHECK=1 \ -r ${PN}.pro } diff --git a/dev-db/postgresql/postgresql-9.4.22.ebuild b/dev-db/postgresql/postgresql-9.4.22.ebuild index 3ca85697fc72..cf992d873e2a 100644 --- a/dev-db/postgresql/postgresql-9.4.22.ebuild +++ b/dev-db/postgresql/postgresql-9.4.22.ebuild @@ -127,7 +127,7 @@ src_configure() { export LDFLAGS_SL="${LDFLAGS}" export LDFLAGS_EX="${LDFLAGS}" - local PO="${EPREFIX%/}" + local PO="${EPREFIX}" local i uuid_config="" if use uuid; then diff --git a/dev-db/postgresql/postgresql-9.5.17.ebuild b/dev-db/postgresql/postgresql-9.5.17.ebuild index b8663e8bbf3e..9918b3fc1fe2 100644 --- a/dev-db/postgresql/postgresql-9.5.17.ebuild +++ b/dev-db/postgresql/postgresql-9.5.17.ebuild @@ -127,7 +127,7 @@ src_configure() { export LDFLAGS_SL="${LDFLAGS}" export LDFLAGS_EX="${LDFLAGS}" - local PO="${EPREFIX%/}" + local PO="${EPREFIX}" local i uuid_config="" if use uuid; then diff --git a/dev-db/postgresql/postgresql-9.6.13.ebuild b/dev-db/postgresql/postgresql-9.6.13.ebuild index bbb43aee8a94..74f8af4248ab 100644 --- a/dev-db/postgresql/postgresql-9.6.13.ebuild +++ b/dev-db/postgresql/postgresql-9.6.13.ebuild @@ -131,7 +131,7 @@ src_configure() { export LDFLAGS_SL="${LDFLAGS}" export LDFLAGS_EX="${LDFLAGS}" - local PO="${EPREFIX%/}" + local PO="${EPREFIX}" local i uuid_config="" if use uuid; then diff --git a/dev-games/newton/newton-3.14.ebuild b/dev-games/newton/newton-3.14.ebuild index 8cefdb483437..d77ff4cd90c8 100644 --- a/dev-games/newton/newton-3.14.ebuild +++ b/dev-games/newton/newton-3.14.ebuild @@ -27,7 +27,6 @@ src_prepare() { src_configure() { local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX=/usr/ -DNEWTON_DEMOS_SANDBOX=OFF -DCMAKE_VERBOSE_MAKEFILE=ON ) diff --git a/dev-lang/julia/julia-9999.ebuild b/dev-lang/julia/julia-9999.ebuild index 7105dfb500b4..ec42a1aa9c9d 100644 --- a/dev-lang/julia/julia-9999.ebuild +++ b/dev-lang/julia/julia-9999.ebuild @@ -63,7 +63,7 @@ src_prepare() { sed -i \ -e "s|GENTOOCFLAGS|${CFLAGS}|g" \ - -e "s|/usr/include|${EPREFIX%/}/usr/include|g" \ + -e "s|/usr/include|${EPREFIX}/usr/include|g" \ deps/Makefile || die local libblas="$($(tc-getPKG_CONFIG) --libs-only-l blas)" diff --git a/dev-lang/mlton/mlton-20180207.ebuild b/dev-lang/mlton/mlton-20180207.ebuild index b8df540a09ff..c4ff66ee2e6f 100644 --- a/dev-lang/mlton/mlton-20180207.ebuild +++ b/dev-lang/mlton/mlton-20180207.ebuild @@ -46,7 +46,7 @@ mlton_subdir() { } mlton_dir() { - echo "${EPREFIX%/}"/usr/$(mlton_subdir) + echo "${EPREFIX}"/usr/$(mlton_subdir) } mlton_memory_requirement() { @@ -137,7 +137,7 @@ mlton_create_bin_stubs() { for i in ${BIN_STUBS[*]}; do cat <<- EOF >> ${i} #!/bin/bash - exec ${EPREFIX%/}/usr/${SUBDIR}/bin/${i} \$* + exec ${EPREFIX}/usr/${SUBDIR}/bin/${i} \$* EOF chmod a+x ${i} || die done diff --git a/dev-lang/moarvm/moarvm-2019.03-r1.ebuild b/dev-lang/moarvm/moarvm-2019.03-r1.ebuild index 70a0082df833..2357769a5f1b 100644 --- a/dev-lang/moarvm/moarvm-2019.03-r1.ebuild +++ b/dev-lang/moarvm/moarvm-2019.03-r1.ebuild @@ -39,8 +39,8 @@ RESTRICT=test src_configure() { MAKEOPTS+=" NOISY=1" use doc && DOCS+=( docs/* ) - local prefix="${EPREFIX%/}/usr" - local libdir="${EPREFIX%/}/usr/$(get_libdir)" + local prefix="${EPREFIX}/usr" + local libdir="${EPREFIX}/usr/$(get_libdir)" einfo "--prefix '${prefix}'" einfo "--libdir '${libdir}'" local myconfigargs=( diff --git a/dev-lang/moarvm/moarvm-2019.07-r1.ebuild b/dev-lang/moarvm/moarvm-2019.07-r1.ebuild index fd84dc9ac68c..6b94964a1fd4 100644 --- a/dev-lang/moarvm/moarvm-2019.07-r1.ebuild +++ b/dev-lang/moarvm/moarvm-2019.07-r1.ebuild @@ -44,8 +44,8 @@ PATCHES="${FILESDIR}/fix-quoting.patch" src_configure() { MAKEOPTS+=" NOISY=1" use doc && DOCS+=( docs/* ) - local prefix="${EPREFIX%/}/usr" - local libdir="${EPREFIX%/}/usr/$(get_libdir)" + local prefix="${EPREFIX}/usr" + local libdir="${EPREFIX}/usr/$(get_libdir)" einfo "--prefix '${prefix}'" einfo "--libdir '${libdir}'" local myconfigargs=( diff --git a/dev-lang/moarvm/moarvm-2019.11.ebuild b/dev-lang/moarvm/moarvm-2019.11.ebuild index 7ca933ccf7b4..732ff5144878 100644 --- a/dev-lang/moarvm/moarvm-2019.11.ebuild +++ b/dev-lang/moarvm/moarvm-2019.11.ebuild @@ -41,8 +41,8 @@ RESTRICT=test src_configure() { MAKEOPTS+=" NOISY=1" use doc && DOCS+=( docs/* ) - local prefix="${EPREFIX%/}/usr" - local libdir="${EPREFIX%/}/usr/$(get_libdir)" + local prefix="${EPREFIX}/usr" + local libdir="${EPREFIX}/usr/$(get_libdir)" einfo "--prefix '${prefix}'" einfo "--libdir '${libdir}'" local myconfigargs=( diff --git a/dev-lang/nqp/nqp-2019.03-r1.ebuild b/dev-lang/nqp/nqp-2019.03-r1.ebuild index 663242f61de6..9e1f45775e4c 100644 --- a/dev-lang/nqp/nqp-2019.03-r1.ebuild +++ b/dev-lang/nqp/nqp-2019.03-r1.ebuild @@ -70,7 +70,7 @@ nqp_configure() { pushd "${BUILD_DIR}" > /dev/null || die local myconfargs=( "--backend=${MULTIBUILD_VARIANT}" - "--prefix=${EPREFIX%/}/usr" ) + "--prefix=${EPREFIX}/usr" ) perl Configure.pl "${myconfargs[@]}" || die popd || die diff --git a/dev-lang/smlnj/smlnj-110.82.ebuild b/dev-lang/smlnj/smlnj-110.82.ebuild index 1df1108e8973..1f7c23a57126 100644 --- a/dev-lang/smlnj/smlnj-110.82.ebuild +++ b/dev-lang/smlnj/smlnj-110.82.ebuild @@ -137,8 +137,8 @@ src_install() { SUBDIR=$(smlnj_get_libdir)/${PN} DIR=/usr/${SUBDIR} for file in bin/{*,.*}; do - [[ -f ${file} ]] && sed -e "2iSMLNJ_HOME=${EPREFIX%/}/${DIR}" \ - -e "s:${WORKDIR}:${EPREFIX%/}/${DIR}:" -i ${file} + [[ -f ${file} ]] && sed -e "2iSMLNJ_HOME=${EPREFIX}/${DIR}" \ + -e "s:${WORKDIR}:${EPREFIX}/${DIR}:" -i ${file} done dodir ${DIR}/bin exeinto ${DIR}/bin diff --git a/dev-lang/snobol/snobol-1.4.1.ebuild b/dev-lang/snobol/snobol-1.4.1.ebuild index 3e9ecb949052..0a29b17c94d9 100644 --- a/dev-lang/snobol/snobol-1.4.1.ebuild +++ b/dev-lang/snobol/snobol-1.4.1.ebuild @@ -35,9 +35,9 @@ src_prepare() { } src_configure() { - ./configure --prefix="${EPREFIX%/}/usr" \ - --snolibdir="${EPREFIX%/}/usr/lib/snobol4" \ - --mandir="${EPREFIX%/}/usr/share/man" \ + ./configure --prefix="${EPREFIX}/usr" \ + --snolibdir="${EPREFIX}/usr/lib/snobol4" \ + --mandir="${EPREFIX}/usr/share/man" \ --add-cflags="${CFLAGS}" } diff --git a/dev-lang/spidermonkey/spidermonkey-38.3.0.ebuild b/dev-lang/spidermonkey/spidermonkey-38.3.0.ebuild index a0c8d08062f1..30082712a0d8 100644 --- a/dev-lang/spidermonkey/spidermonkey-38.3.0.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-38.3.0.ebuild @@ -57,7 +57,7 @@ src_prepare() { } src_configure() { - export SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" + export SHELL="${SHELL:-${EPREFIX}/bin/bash}" cd "${BUILDDIR}" || die diff --git a/dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild b/dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild index 1c936015960e..ced690db1ef3 100644 --- a/dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild +++ b/dev-lang/spidermonkey/spidermonkey-45.0.2.ebuild @@ -58,7 +58,7 @@ src_prepare() { } src_configure() { - export SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" + export SHELL="${SHELL:-${EPREFIX}/bin/bash}" cd "${BUILDDIR}" || die econf \ diff --git a/dev-libs/hiredis/hiredis-0.13.3.ebuild b/dev-libs/hiredis/hiredis-0.13.3.ebuild index 77e4dc9e8c53..33c0e2fabc38 100644 --- a/dev-libs/hiredis/hiredis-0.13.3.ebuild +++ b/dev-libs/hiredis/hiredis-0.13.3.ebuild @@ -29,7 +29,7 @@ _build() { emake \ AR="$(tc-getAR)" \ CC="$(tc-getCC)" \ - PREFIX="${EPREFIX%/}/usr" \ + PREFIX="${EPREFIX}/usr" \ LIBRARY_PATH="$(get_libdir)" \ ARCH= \ DEBUG= \ diff --git a/dev-libs/leatherman/leatherman-1.10.0.ebuild b/dev-libs/leatherman/leatherman-1.10.0.ebuild index ac093ea96d57..aef4cd923095 100644 --- a/dev-libs/leatherman/leatherman-1.10.0.ebuild +++ b/dev-libs/leatherman/leatherman-1.10.0.ebuild @@ -31,7 +31,6 @@ src_configure() { local mycmakeargs=( -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=None - -DCMAKE_INSTALL_PREFIX=/usr ) if ! use static-libs; then mycmakeargs+=( diff --git a/dev-libs/leatherman/leatherman-1.3.0.ebuild b/dev-libs/leatherman/leatherman-1.3.0.ebuild index 276c9fbb29ff..34c6c1180ae0 100644 --- a/dev-libs/leatherman/leatherman-1.3.0.ebuild +++ b/dev-libs/leatherman/leatherman-1.3.0.ebuild @@ -31,7 +31,6 @@ src_configure() { local mycmakeargs=( -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=None - -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LOCALSTATEDIR=/var ) diff --git a/dev-libs/leatherman/leatherman-1.8.0.ebuild b/dev-libs/leatherman/leatherman-1.8.0.ebuild index 978d0a696adf..c4941f2415ce 100644 --- a/dev-libs/leatherman/leatherman-1.8.0.ebuild +++ b/dev-libs/leatherman/leatherman-1.8.0.ebuild @@ -31,7 +31,6 @@ src_configure() { local mycmakeargs=( -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=None - -DCMAKE_INSTALL_PREFIX=/usr ) if ! use static-libs; then mycmakeargs+=( diff --git a/dev-libs/leatherman/leatherman-1.9.0.ebuild b/dev-libs/leatherman/leatherman-1.9.0.ebuild index 978d0a696adf..c4941f2415ce 100644 --- a/dev-libs/leatherman/leatherman-1.9.0.ebuild +++ b/dev-libs/leatherman/leatherman-1.9.0.ebuild @@ -31,7 +31,6 @@ src_configure() { local mycmakeargs=( -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=None - -DCMAKE_INSTALL_PREFIX=/usr ) if ! use static-libs; then mycmakeargs+=( diff --git a/dev-libs/leatherman/leatherman-1.9.1.ebuild b/dev-libs/leatherman/leatherman-1.9.1.ebuild index 5767dcd6355c..af63706df334 100644 --- a/dev-libs/leatherman/leatherman-1.9.1.ebuild +++ b/dev-libs/leatherman/leatherman-1.9.1.ebuild @@ -31,7 +31,6 @@ src_configure() { local mycmakeargs=( -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=None - -DCMAKE_INSTALL_PREFIX=/usr ) if ! use static-libs; then mycmakeargs+=( diff --git a/dev-libs/libgaminggear/libgaminggear-0.15.1.ebuild b/dev-libs/libgaminggear/libgaminggear-0.15.1.ebuild index 40164dbc61bf..ce042cf9a600 100644 --- a/dev-libs/libgaminggear/libgaminggear-0.15.1.ebuild +++ b/dev-libs/libgaminggear/libgaminggear-0.15.1.ebuild @@ -46,7 +46,6 @@ src_prepare() { src_configure() { mycmakeargs=( - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr -DWITH_DOC="$(usex doc)" ) cmake_src_configure diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.44.0-r2.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.44.0-r2.ebuild index 7990f37b2599..fdd2457611a2 100644 --- a/dev-perl/DBD-mysql/DBD-mysql-4.44.0-r2.ebuild +++ b/dev-perl/DBD-mysql/DBD-mysql-4.44.0-r2.ebuild @@ -43,7 +43,7 @@ src_configure() { --testuser=test \ --testpassword=test" fi - myconf="${myconf} --$(usex ssl ssl nossl) --mysql_config=${EPREFIX%/}/usr/bin/${impl}_config" + myconf="${myconf} --$(usex ssl ssl nossl) --mysql_config=${EPREFIX}/usr/bin/${impl}_config" perl-module_src_configure } diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.50.0.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.50.0.ebuild index 79609e1cbaa5..e2eb88d676fb 100644 --- a/dev-perl/DBD-mysql/DBD-mysql-4.50.0.ebuild +++ b/dev-perl/DBD-mysql/DBD-mysql-4.50.0.ebuild @@ -45,7 +45,7 @@ src_configure() { --testuser=test \ --testpassword=test" fi - myconf="${myconf} --$(usex ssl ssl nossl) --mysql_config=${EPREFIX%/}/usr/bin/${impl}_config" + myconf="${myconf} --$(usex ssl ssl nossl) --mysql_config=${EPREFIX}/usr/bin/${impl}_config" perl-module_src_configure } diff --git a/dev-python/mysql-connector-python/mysql-connector-python-2.1.7-r1.ebuild b/dev-python/mysql-connector-python/mysql-connector-python-2.1.7-r1.ebuild index d3b0348b4c0b..17033a7a7b03 100644 --- a/dev-python/mysql-connector-python/mysql-connector-python-2.1.7-r1.ebuild +++ b/dev-python/mysql-connector-python/mysql-connector-python-2.1.7-r1.ebuild @@ -26,7 +26,7 @@ RESTRICT="test" DOCS=( README.txt CHANGES.txt docs/README_DOCS.txt ) python_test() { - "${EPYTHON}" unittests.py --with-mysql="${EPREFIX%/}/usr" --unix-socket="${T}" --mysql-topdir="${T}" + "${EPYTHON}" unittests.py --with-mysql="${EPREFIX}/usr" --unix-socket="${T}" --mysql-topdir="${T}" } python_install_all(){ diff --git a/dev-util/cmake/cmake-3.13.5.ebuild b/dev-util/cmake/cmake-3.13.5.ebuild index 529cc0a350ef..4c4b1fe6488c 100644 --- a/dev-util/cmake/cmake-3.13.5.ebuild +++ b/dev-util/cmake/cmake-3.13.5.ebuild @@ -162,7 +162,6 @@ src_configure() { local mycmakeargs=( -DCMAKE_USE_SYSTEM_LIBRARIES=ON -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp) - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr -DCMAKE_DOC_DIR=/share/doc/${PF} -DCMAKE_MAN_DIR=/share/man -DCMAKE_DATA_DIR=/share/${PN} diff --git a/dev-util/cmake/cmake-3.14.6.ebuild b/dev-util/cmake/cmake-3.14.6.ebuild index 81506d785420..4ed3f6c3ca9f 100644 --- a/dev-util/cmake/cmake-3.14.6.ebuild +++ b/dev-util/cmake/cmake-3.14.6.ebuild @@ -161,7 +161,6 @@ src_configure() { local mycmakeargs=( -DCMAKE_USE_SYSTEM_LIBRARIES=ON -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp) - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr -DCMAKE_DOC_DIR=/share/doc/${PF} -DCMAKE_MAN_DIR=/share/man -DCMAKE_DATA_DIR=/share/${PN} diff --git a/dev-util/cmake/cmake-3.16.3.ebuild b/dev-util/cmake/cmake-3.16.3.ebuild index e12b038dca3e..5b1f3688d59a 100644 --- a/dev-util/cmake/cmake-3.16.3.ebuild +++ b/dev-util/cmake/cmake-3.16.3.ebuild @@ -151,7 +151,6 @@ src_configure() { local mycmakeargs=( -DCMAKE_USE_SYSTEM_LIBRARIES=ON - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr -DCMAKE_DOC_DIR=/share/doc/${PF} -DCMAKE_MAN_DIR=/share/man -DCMAKE_DATA_DIR=/share/${PN} diff --git a/dev-util/cmake/cmake-3.16.4.ebuild b/dev-util/cmake/cmake-3.16.4.ebuild index e12b038dca3e..5b1f3688d59a 100644 --- a/dev-util/cmake/cmake-3.16.4.ebuild +++ b/dev-util/cmake/cmake-3.16.4.ebuild @@ -151,7 +151,6 @@ src_configure() { local mycmakeargs=( -DCMAKE_USE_SYSTEM_LIBRARIES=ON - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr -DCMAKE_DOC_DIR=/share/doc/${PF} -DCMAKE_MAN_DIR=/share/man -DCMAKE_DATA_DIR=/share/${PN} diff --git a/dev-vcs/cvs/cvs-1.12.12-r12.ebuild b/dev-vcs/cvs/cvs-1.12.12-r12.ebuild index ff6dca4d2b97..4b4172400eb9 100644 --- a/dev-vcs/cvs/cvs-1.12.12-r12.ebuild +++ b/dev-vcs/cvs/cvs-1.12.12-r12.ebuild @@ -64,7 +64,7 @@ src_configure() { fi econf \ --with-external-zlib \ - --with-tmpdir=${EPREFIX%/}/tmp \ + --with-tmpdir=${EPREFIX}/tmp \ $(use_enable crypt encryption) \ $(use_with kerberos gssapi) \ $(use_enable nls) \ diff --git a/dev-vcs/subversion/subversion-1.12.2.ebuild b/dev-vcs/subversion/subversion-1.12.2.ebuild index 133e7dedbf40..3f53e0cbd391 100644 --- a/dev-vcs/subversion/subversion-1.12.2.ebuild +++ b/dev-vcs/subversion/subversion-1.12.2.ebuild @@ -184,11 +184,11 @@ src_prepare() { src_configure() { local myconf=( - --libdir="${EPREFIX%/}/usr/$(get_libdir)" + --libdir="${EPREFIX}/usr/$(get_libdir)" $(use_with apache2 apache-libexecdir) $(use_with apache2 apxs "${EPREFIX}"/usr/bin/apxs) - $(use_with berkdb berkeley-db "db.h:${EPREFIX%/}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}") - $(use_with ctypes-python ctypesgen "${EPREFIX%/}/usr") + $(use_with berkdb berkeley-db "db.h:${EPREFIX}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}") + $(use_with ctypes-python ctypesgen "${EPREFIX}/usr") $(use_enable dso runtime-module-search) $(use_with gnome-keyring) $(use_enable java javahl) @@ -197,8 +197,8 @@ src_configure() { $(use_enable nls) $(use_with sasl) $(use_with http serf) - --with-apr="${EPREFIX%/}/usr/bin/apr-1-config" - --with-apr-util="${EPREFIX%/}/usr/bin/apu-1-config" + --with-apr="${EPREFIX}/usr/bin/apr-1-config" + --with-apr-util="${EPREFIX}/usr/bin/apu-1-config" --disable-experimental-libtool --without-jikes --disable-mod-activation @@ -261,8 +261,8 @@ src_configure() { fi # allow overriding Python include directory - ac_cv_path_RUBY=$(usex ruby "${EPREFIX%/}/usr/bin/ruby${RB_VER}" "none") \ - ac_cv_path_RDOC=$(usex ruby "${EPREFIX%/}/usr/bin/rdoc${RB_VER}" "none") \ + ac_cv_path_RUBY=$(usex ruby "${EPREFIX}/usr/bin/ruby${RB_VER}" "none") \ + ac_cv_path_RDOC=$(usex ruby "${EPREFIX}/usr/bin/rdoc${RB_VER}" "none") \ ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \ econf "${myconf[@]}" } diff --git a/dev-vcs/subversion/subversion-1.13.0.ebuild b/dev-vcs/subversion/subversion-1.13.0.ebuild index 030f59949571..e1cb5bd947d9 100644 --- a/dev-vcs/subversion/subversion-1.13.0.ebuild +++ b/dev-vcs/subversion/subversion-1.13.0.ebuild @@ -184,11 +184,11 @@ src_prepare() { src_configure() { local myconf=( - --libdir="${EPREFIX%/}/usr/$(get_libdir)" + --libdir="${EPREFIX}/usr/$(get_libdir)" $(use_with apache2 apache-libexecdir) $(use_with apache2 apxs "${EPREFIX}"/usr/bin/apxs) - $(use_with berkdb berkeley-db "db.h:${EPREFIX%/}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}") - $(use_with ctypes-python ctypesgen "${EPREFIX%/}/usr") + $(use_with berkdb berkeley-db "db.h:${EPREFIX}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}") + $(use_with ctypes-python ctypesgen "${EPREFIX}/usr") $(use_enable dso runtime-module-search) $(use_with gnome-keyring) $(use_enable java javahl) @@ -197,8 +197,8 @@ src_configure() { $(use_enable nls) $(use_with sasl) $(use_with http serf) - --with-apr="${EPREFIX%/}/usr/bin/apr-1-config" - --with-apr-util="${EPREFIX%/}/usr/bin/apu-1-config" + --with-apr="${EPREFIX}/usr/bin/apr-1-config" + --with-apr-util="${EPREFIX}/usr/bin/apu-1-config" --disable-experimental-libtool --without-jikes --disable-mod-activation @@ -261,8 +261,8 @@ src_configure() { fi # allow overriding Python include directory - ac_cv_path_RUBY=$(usex ruby "${EPREFIX%/}/usr/bin/ruby${RB_VER}" "none") \ - ac_cv_path_RDOC=$(usex ruby "${EPREFIX%/}/usr/bin/rdoc${RB_VER}" "none") \ + ac_cv_path_RUBY=$(usex ruby "${EPREFIX}/usr/bin/ruby${RB_VER}" "none") \ + ac_cv_path_RDOC=$(usex ruby "${EPREFIX}/usr/bin/rdoc${RB_VER}" "none") \ ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \ econf "${myconf[@]}" } diff --git a/games-action/supermariowar/supermariowar-2.0_beta1-r1.ebuild b/games-action/supermariowar/supermariowar-2.0_beta1-r1.ebuild index d78992bbd8aa..826d4507de75 100644 --- a/games-action/supermariowar/supermariowar-2.0_beta1-r1.ebuild +++ b/games-action/supermariowar/supermariowar-2.0_beta1-r1.ebuild @@ -49,7 +49,6 @@ src_prepare() { src_configure() { local mycmakeargs=( -DBUILD_STATIC_LIBS=OFF - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" -DSMW_BINDIR="${EPREFIX}/usr/bin" -DSMW_DATADIR="${EPREFIX}/usr/share/${PF}" ) diff --git a/games-emulation/pcsx2/pcsx2-1.4.0-r1.ebuild b/games-emulation/pcsx2/pcsx2-1.4.0-r1.ebuild index 0ddc30dd7ba3..1d948bfb065e 100644 --- a/games-emulation/pcsx2/pcsx2-1.4.0-r1.ebuild +++ b/games-emulation/pcsx2/pcsx2-1.4.0-r1.ebuild @@ -86,7 +86,6 @@ src_configure() { -DPACKAGE_MODE=TRUE -DXDG_STD=TRUE - -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_LIBRARY_PATH="/usr/$(get_libdir)/${PN}" -DDOC_DIR=/usr/share/doc/"${PF}" -DEGL_API=FALSE diff --git a/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild b/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild index 11e3f7bd7c96..f4c574ef75a8 100644 --- a/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild +++ b/games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild @@ -65,7 +65,6 @@ src_configure() { -DPACKAGE_MODE=TRUE -DXDG_STD=TRUE - -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_LIBRARY_PATH="/usr/$(get_libdir)/${PN}" -DDOC_DIR=/usr/share/doc/"${PF}" -DEGL_API=FALSE diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild index f5e4931ead16..24784ff64676 100644 --- a/games-emulation/pcsx2/pcsx2-9999.ebuild +++ b/games-emulation/pcsx2/pcsx2-9999.ebuild @@ -72,7 +72,6 @@ src_configure() { -DPACKAGE_MODE=TRUE -DXDG_STD=TRUE - -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_LIBRARY_PATH="/usr/$(get_libdir)/${PN}" -DDOC_DIR=/usr/share/doc/"${PF}" -DEGL_API=FALSE diff --git a/games-misc/openmsx/files/openmsx-0.3.1-python3.patch b/games-misc/openmsx/files/openmsx-0.3.1-python3.patch new file mode 100644 index 000000000000..0e8a44a5ec3d --- /dev/null +++ b/games-misc/openmsx/files/openmsx-0.3.1-python3.patch @@ -0,0 +1,306 @@ +From 7b298b1bacc56392b9a19ba6b95d368309832ad7 Mon Sep 17 00:00:00 2001 +From: Stefan Strogin <steils@gentoo.org> +Date: Fri, 7 Feb 2020 13:15:16 +0200 +Subject: [PATCH] Fix: support Python 3 + +Correct tabs and spaces in scripts to make them consistent. +Don't call deprecated methods. + +Upstream-Status: Submitted [https://github.com/OpenTTD/OpenMSX/pull/2] +Signed-off-by: Stefan Strogin <steils@gentoo.org> +--- + scripts/authorlist.py | 20 ++++++++--------- + scripts/md5list.py | 48 ++++++++++++++++++++-------------------- + scripts/midifiles.py | 30 ++++++++++++------------- + scripts/namelist.py | 34 ++++++++++++++-------------- + scripts/playlist.py | 42 +++++++++++++++++------------------ + scripts/sanitize_list.py | 48 ++++++++++++++++++++-------------------- + 6 files changed, 111 insertions(+), 111 deletions(-) + +diff --git a/scripts/authorlist.py b/scripts/authorlist.py +index 689ddb9..e041d64 100755 +--- a/scripts/authorlist.py ++++ b/scripts/authorlist.py +@@ -14,14 +14,14 @@ import string + import sys + + while 1: +- data = sys.stdin.readline() +- if data != '': +- # do some processing of the contents of +- # the data variable +- separate = string.split(data,";") +- print '%-30s %s' % (separate[1]+":", separate[2]) +- # end of data processing command group ++ data = sys.stdin.readline() ++ if data != '': ++ # do some processing of the contents of ++ # the data variable ++ separate = data.split(';') ++ print('%-30s %s' % (separate[1]+":", separate[2])) ++ # end of data processing command group + # sys.stdout.write(res) +- else: +- sys.stdout.flush() +- break ++ else: ++ sys.stdout.flush() ++ break +diff --git a/scripts/md5list.py b/scripts/md5list.py +index cf611fc..a60f977 100755 +--- a/scripts/md5list.py ++++ b/scripts/md5list.py +@@ -16,28 +16,28 @@ import subprocess + import os + + while 1: +- data = sys.stdin.readline() +- if data != '': +- # leave out all comment lines (lines starting with '#') +- comment_pos = string.find(data,'#') +- if comment_pos == 0: +- continue +- # separate the single entries by ';' +- separate = string.split(data,";") +- if len(separate) != 4: +- continue +- systemtype = (os.uname())[0] +- if systemtype == 'Linux': +- md5call = ["md5sum"] +- elif systemtype == 'Darwin': +- md5call = ["md5", "-r"] ++ data = sys.stdin.readline() ++ if data != '': ++ # leave out all comment lines (lines starting with '#') ++ comment_pos = data.find('#') ++ if comment_pos == 0: ++ continue ++ # separate the single entries by ';' ++ separate = data.split(';') ++ if len(separate) != 4: ++ continue ++ systemtype = (os.uname())[0] ++ if systemtype == 'Linux': ++ md5call = ["md5sum"] ++ elif systemtype == 'Darwin': ++ md5call = ["md5", "-r"] ++ else: ++ md5call = ["md5sum"] ++ md5call = md5call + ["src/"+separate[1].strip()] ++ md5sum = subprocess.Popen(md5call, stdout=subprocess.PIPE).communicate()[0] ++ md5sum = md5sum.split() ++ res = "%-32s = %s\n" % (separate[1], md5sum[0]) ++ sys.stdout.write(res) + else: +- md5call = ["md5sum"] +- md5call = md5call + ["src/"+string.strip(separate[1])] +- md5sum = subprocess.Popen(md5call, stdout=subprocess.PIPE).communicate()[0] +- md5sum = string.split(md5sum) +- res = "%-32s = %s\n" % (separate[1], md5sum[0]) +- sys.stdout.write(res) +- else: +- sys.stdout.flush() +- break ++ sys.stdout.flush() ++ break +diff --git a/scripts/midifiles.py b/scripts/midifiles.py +index 3b5ec57..a89e4f2 100755 +--- a/scripts/midifiles.py ++++ b/scripts/midifiles.py +@@ -15,18 +15,18 @@ import sys + + res = "" + while 1: +- data = sys.stdin.readline() +- if data != '': +- # leave out all comment lines (lines starting with '#') +- comment_pos = string.find(data,'#') +- if comment_pos == 0: +- continue +- # separate the single entries by ';' +- separate = string.split(data,";") +- if len(separate) != 4: +- continue +- res = res + " src/" + string.strip(separate[1]) +- else: +- sys.stdout.write(res) +- sys.stdout.flush() +- break ++ data = sys.stdin.readline() ++ if data != '': ++ # leave out all comment lines (lines starting with '#') ++ comment_pos = data.find('#') ++ if comment_pos == 0: ++ continue ++ # separate the single entries by ';' ++ separate = data.split(';') ++ if len(separate) != 4: ++ continue ++ res = res + " src/" + separate[1].strip() ++ else: ++ sys.stdout.write(res) ++ sys.stdout.flush() ++ break +diff --git a/scripts/namelist.py b/scripts/namelist.py +index cdac127..107ad00 100755 +--- a/scripts/namelist.py ++++ b/scripts/namelist.py +@@ -14,23 +14,23 @@ import string + import sys + + while 1: +- data = sys.stdin.readline() +- if data != '': +- # leave out all comment lines (lines starting with '#') +- comment_pos = string.find(data,'#') +- if comment_pos == 0: +- continue +- # separate the single entries by ';' +- separate = string.split(data,";") +- if len(separate) != 4: +- continue +- res = "%-32s = %s\n" % (separate[1], string.strip(separate[3])) +- sys.stdout.write(res) +- else: +- sys.stdout.flush() +- break ++ data = sys.stdin.readline() ++ if data != '': ++ # leave out all comment lines (lines starting with '#') ++ comment_pos = data.find('#') ++ if comment_pos == 0: ++ continue ++ # separate the single entries by ';' ++ separate = data.split(';') ++ if len(separate) != 4: ++ continue ++ res = "%-32s = %s\n" % (separate[1], separate[3].strip()) ++ sys.stdout.write(res) ++ else: ++ sys.stdout.flush() ++ break + + def authorlist(mystr): +- separate = string.split() ++ separate = separate.split() + for str in separate: +- print string.strip(str) +\ No newline at end of file ++ print(str.strip()) +diff --git a/scripts/playlist.py b/scripts/playlist.py +index 939d03d..e77b02a 100755 +--- a/scripts/playlist.py ++++ b/scripts/playlist.py +@@ -14,27 +14,27 @@ import string + import sys + + while 1: +- data = sys.stdin.readline() +- if data != '': +- # leave out all comment lines (lines starting with '#') +- comment_pos = string.find(data,'#') +- if comment_pos == 0: +- continue +- # separate the single entries by ';' +- separate = string.split(data,";") +- res = "" +- # leave out all lines which don't have the proper number of elements +- if len(separate) >= 1: +- res = string.strip(separate[0]) + " = " +- if len(separate) == 4: +- res = res + separate[1] +- res = res + "\n" +- sys.stdout.write(res) +- else: +- sys.stdout.flush() +- break ++ data = sys.stdin.readline() ++ if data != '': ++ # leave out all comment lines (lines starting with '#') ++ comment_pos = data.find('#') ++ if comment_pos == 0: ++ continue ++ # separate the single entries by ';' ++ separate = data.split(';') ++ res = "" ++ # leave out all lines which don't have the proper number of elements ++ if len(separate) >= 1: ++ res = separate[0].strip() + " = " ++ if len(separate) == 4: ++ res = res + separate[1] ++ res = res + "\n" ++ sys.stdout.write(res) ++ else: ++ sys.stdout.flush() ++ break + + def authorlist(mystr): +- separate = string.split() ++ separate = separate.split() + for str in separate: +- print string.strip(str) +\ No newline at end of file ++ print(str.strip()) +diff --git a/scripts/sanitize_list.py b/scripts/sanitize_list.py +index f97709a..5368831 100755 +--- a/scripts/sanitize_list.py ++++ b/scripts/sanitize_list.py +@@ -14,30 +14,30 @@ import string + import sys + + while 1: +- data = sys.stdin.readline() +- if data != '': +- # leave out all comment lines (lines starting with '#') +- comment_pos = string.find(data,'#') +- if comment_pos == 0: +- continue +- # separate the single entries by ';' +- separate = string.split(data,";") +- if len(separate) != 4: +- continue +- res = "" +- for str in separate: +- if res != '': +- res = res + ";" + string.strip(str) +- else: +- res = string.strip(str) +- # end of data processing command group +- res = res + "\n" +- sys.stdout.write(res) +- else: +- sys.stdout.flush() +- break ++ data = sys.stdin.readline() ++ if data != '': ++ # leave out all comment lines (lines starting with '#') ++ comment_pos = data.find('#') ++ if comment_pos == 0: ++ continue ++ # separate the single entries by ';' ++ separate = data.split(';') ++ if len(separate) != 4: ++ continue ++ res = "" ++ for str in separate: ++ if res != '': ++ res = res + ";" + str.strip() ++ else: ++ res = str.strip() ++ # end of data processing command group ++ res = res + "\n" ++ sys.stdout.write(res) ++ else: ++ sys.stdout.flush() ++ break + + def authorlist(mystr): +- separate = string.split() ++ separate = separate.split() + for str in separate: +- print string.strip(str) +\ No newline at end of file ++ print(str.strip()) +-- +2.25.0 + diff --git a/games-misc/openmsx/openmsx-0.3.1-r3.ebuild b/games-misc/openmsx/openmsx-0.3.1-r3.ebuild new file mode 100644 index 000000000000..256776545d93 --- /dev/null +++ b/games-misc/openmsx/openmsx-0.3.1-r3.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7} ) + +inherit python-any-r1 + +DESCRIPTION="Open source music base set for OpenTTD" +HOMEPAGE="https://wiki.openttd.org/OpenMSX https://github.com/OpenTTD/OpenMSX" +SRC_URI="https://cdn.openttd.org/openmsx-releases/${PV}/${P}-source.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc64 ~x86" +IUSE="" + +DEPEND="${PYTHON_DEPS}" + +S=${WORKDIR}/${P}-source + +PATCHES=( "${FILESDIR}"/${P}-python3.patch ) + +pkg_setup() { + python-any-r1_pkg_setup +} + +src_compile() { + emake _V= bundle +} + +src_install() { + insinto "/usr/share/games/openttd/gm/${P}" + doins ${P}/{*.mid,openmsx.obm} + dodoc ${P}/{changelog.txt,readme.txt} +} diff --git a/games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild b/games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild index 567f9a34f9b4..6bd50063b3b2 100644 --- a/games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild +++ b/games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild @@ -35,7 +35,6 @@ PATCHES=( "${FILESDIR}"/${P}-cmake.patch ) src_configure() { local mycmakeargs=( -DCMAKE_VERBOSE_MAKEFILE=TRUE - -DCMAKE_INSTALL_PREFIX="/usr" -DBINDIR="/usr/bin" -DDATAROOTDIR="/usr/share" -DICONDIR=/usr/share/icons diff --git a/games-simulation/crrcsim/crrcsim-0.9.13.ebuild b/games-simulation/crrcsim/crrcsim-0.9.13.ebuild index 4d20e437844b..2345ffb53a16 100644 --- a/games-simulation/crrcsim/crrcsim-0.9.13.ebuild +++ b/games-simulation/crrcsim/crrcsim-0.9.13.ebuild @@ -37,8 +37,8 @@ src_prepare() { src_configure() { econf \ --datadir="/usr/share" \ - --datarootdir="${EPREFIX%/}/usr/share" \ - --docdir="${EPREFIX%/}/usr/share/doc/${PF}" \ + --datarootdir="${EPREFIX}/usr/share" \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ $(use_with portaudio) } diff --git a/media-gfx/engauge/engauge-10.6.ebuild b/media-gfx/engauge/engauge-10.6.ebuild index d9161fe8f238..a1741e7df831 100644 --- a/media-gfx/engauge/engauge-10.6.ebuild +++ b/media-gfx/engauge/engauge-10.6.ebuild @@ -70,7 +70,7 @@ src_install() { # Install qt help files insinto /usr/share/doc/${PF} # this must match sed expression in src_prepare doins bin/documentation/engauge.{qch,qhc} - docompress -x "${EPREFIX%/}"/usr/share/doc/$PF/engauge.{qch,qhc} + docompress -x "${EPREFIX}"/usr/share/doc/$PF/engauge.{qch,qhc} if use doc; then pushd doc >/dev/null || die diff --git a/media-gfx/opentoonz/opentoonz-1.1.2.ebuild b/media-gfx/opentoonz/opentoonz-1.1.2.ebuild index ed5cd3d6884d..41ec70caafc7 100644 --- a/media-gfx/opentoonz/opentoonz-1.1.2.ebuild +++ b/media-gfx/opentoonz/opentoonz-1.1.2.ebuild @@ -54,8 +54,8 @@ src_configure() { local mycmakeargs=( -DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a" - -DSUPERLU_INCLUDE_DIR="${EPREFIX%/}/usr/include/superlu" - -DLZO_INCLUDE_DIR="${EPREFIX%/}/usr/include/lzo" + -DSUPERLU_INCLUDE_DIR="${EPREFIX}/usr/include/superlu" + -DLZO_INCLUDE_DIR="${EPREFIX}/usr/include/lzo" -DCMAKE_SKIP_RPATH=ON ) diff --git a/media-gfx/opentoonz/opentoonz-1.2.1-r1.ebuild b/media-gfx/opentoonz/opentoonz-1.2.1-r1.ebuild index bcb59bf1a284..8906b6e2ae54 100644 --- a/media-gfx/opentoonz/opentoonz-1.2.1-r1.ebuild +++ b/media-gfx/opentoonz/opentoonz-1.2.1-r1.ebuild @@ -53,8 +53,8 @@ src_configure() { local mycmakeargs=( -DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a" - -DSUPERLU_INCLUDE_DIR="${EPREFIX%/}/usr/include/superlu" - -DLZO_INCLUDE_DIR="${EPREFIX%/}/usr/include/lzo" + -DSUPERLU_INCLUDE_DIR="${EPREFIX}/usr/include/superlu" + -DLZO_INCLUDE_DIR="${EPREFIX}/usr/include/lzo" -DCMAKE_SKIP_RPATH=ON ) diff --git a/media-gfx/opentoonz/opentoonz-1.3.0-r1.ebuild b/media-gfx/opentoonz/opentoonz-1.3.0-r1.ebuild index 9921de91c2f5..7f206e2ccf0f 100644 --- a/media-gfx/opentoonz/opentoonz-1.3.0-r1.ebuild +++ b/media-gfx/opentoonz/opentoonz-1.3.0-r1.ebuild @@ -52,8 +52,8 @@ CMAKE_USE_DIR="${S}"/toonz/sources src_configure() { local mycmakeargs=( -DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a" - -DSUPERLU_INCLUDE_DIR="${EPREFIX%/}/usr/include/superlu" - -DLZO_INCLUDE_DIR="${EPREFIX%/}/usr/include/lzo" + -DSUPERLU_INCLUDE_DIR="${EPREFIX}/usr/include/superlu" + -DLZO_INCLUDE_DIR="${EPREFIX}/usr/include/lzo" -DCMAKE_SKIP_RPATH=ON ) diff --git a/media-gfx/opentoonz/opentoonz-1.3.0.ebuild b/media-gfx/opentoonz/opentoonz-1.3.0.ebuild index a73803cb0e07..760fe526d498 100644 --- a/media-gfx/opentoonz/opentoonz-1.3.0.ebuild +++ b/media-gfx/opentoonz/opentoonz-1.3.0.ebuild @@ -52,8 +52,8 @@ CMAKE_USE_DIR="${S}"/toonz/sources src_configure() { local mycmakeargs=( -DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a" - -DSUPERLU_INCLUDE_DIR="${EPREFIX%/}/usr/include/superlu" - -DLZO_INCLUDE_DIR="${EPREFIX%/}/usr/include/lzo" + -DSUPERLU_INCLUDE_DIR="${EPREFIX}/usr/include/superlu" + -DLZO_INCLUDE_DIR="${EPREFIX}/usr/include/lzo" -DCMAKE_SKIP_RPATH=ON ) diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild index 3c130ff28f52..c4467c021691 100644 --- a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild +++ b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild @@ -69,11 +69,11 @@ src_configure() { $(use_with expat) $(use_with !expat libxml2) $(use_with X x) - --with-docdir="${EPREFIX%/}"/usr/share/doc/${PF} - --with-fontdir="${EPREFIX%/}"/usr/share/fonts/urw-fonts + --with-docdir="${EPREFIX}"/usr/share/doc/${PF} + --with-fontdir="${EPREFIX}"/usr/share/fonts/urw-fonts --with-freetype - --with-gsfontdir="${EPREFIX%/}"/usr/share/fonts/urw-fonts - --with-gsfontmap="${EPREFIX%/}"/usr/share/ghostscript/9.21/Resource/Init/Fontmap + --with-gsfontdir="${EPREFIX}"/usr/share/fonts/urw-fonts + --with-gsfontmap="${EPREFIX}"/usr/share/ghostscript/9.21/Resource/Init/Fontmap --with-jpeg --with-layers --with-png diff --git a/media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild b/media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild index 2d61a7513cb4..f63f96a8ec95 100644 --- a/media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild +++ b/media-radio/ax25-apps/ax25-apps-0.0.8_rc4.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://www.linux-ax25.org/pub/${PN}/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc x86" IUSE="" RDEPEND=">=dev-libs/libax25-0.0.12_rc2 diff --git a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-8.0.1-r1.ebuild b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-8.0.1-r1.ebuild index ed0bcabf18ff..d616891de50b 100644 --- a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-8.0.1-r1.ebuild +++ b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-8.0.1-r1.ebuild @@ -85,7 +85,6 @@ src_prepare() { src_configure() { local mycmakeargs=( - "-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr" "-DLOCALSTATEDIR=${EPREFIX}/var" "-DSYSCONFDIR=${EPREFIX}/etc" ) diff --git a/net-analyzer/gvm-libs/gvm-libs-10.0.1.ebuild b/net-analyzer/gvm-libs/gvm-libs-10.0.1.ebuild index aa6cf0725a7c..ebcbd5996319 100644 --- a/net-analyzer/gvm-libs/gvm-libs-10.0.1.ebuild +++ b/net-analyzer/gvm-libs/gvm-libs-10.0.1.ebuild @@ -70,7 +70,6 @@ src_prepare() { src_configure() { local mycmakeargs=( - "-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr" "-DLOCALSTATEDIR=${EPREFIX}/var" "-DSYSCONFDIR=${EPREFIX}/etc" $(usex ldap -DBUILD_WITHOUT_LDAP=0 -DBUILD_WITHOUT_LDAP=1) diff --git a/net-analyzer/gvmd/gvmd-8.0.1.ebuild b/net-analyzer/gvmd/gvmd-8.0.1.ebuild index adb7ef65163d..7289dcd5f82a 100644 --- a/net-analyzer/gvmd/gvmd-8.0.1.ebuild +++ b/net-analyzer/gvmd/gvmd-8.0.1.ebuild @@ -69,7 +69,6 @@ src_prepare() { src_configure() { local mycmakeargs=( - "-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr" "-DLOCALSTATEDIR=${EPREFIX}/var" "-DSYSCONFDIR=${EPREFIX}/etc" ) diff --git a/net-analyzer/icinga2/icinga2-2.10.5.ebuild b/net-analyzer/icinga2/icinga2-2.10.5.ebuild index 688e1fd1f38e..7ac8f150a99c 100644 --- a/net-analyzer/icinga2/icinga2-2.10.5.ebuild +++ b/net-analyzer/icinga2/icinga2-2.10.5.ebuild @@ -63,7 +63,6 @@ src_configure() { -DICINGA2_UNITY_BUILD=FALSE -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=None - -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2 diff --git a/net-analyzer/icinga2/icinga2-2.10.6.ebuild b/net-analyzer/icinga2/icinga2-2.10.6.ebuild index d287bf41cefe..366f6b20e82d 100644 --- a/net-analyzer/icinga2/icinga2-2.10.6.ebuild +++ b/net-analyzer/icinga2/icinga2-2.10.6.ebuild @@ -62,7 +62,6 @@ src_configure() { -DICINGA2_UNITY_BUILD=FALSE -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=None - -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2 diff --git a/net-analyzer/icinga2/icinga2-2.11.2.ebuild b/net-analyzer/icinga2/icinga2-2.11.2.ebuild index c01fcf4d1cd5..65f6fb4f7fbb 100644 --- a/net-analyzer/icinga2/icinga2-2.11.2.ebuild +++ b/net-analyzer/icinga2/icinga2-2.11.2.ebuild @@ -62,7 +62,6 @@ src_configure() { -DICINGA2_UNITY_BUILD=FALSE -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=None - -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2 diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild index 39558b4834ec..1f48b8612c0c 100644 --- a/net-analyzer/icinga2/icinga2-9999.ebuild +++ b/net-analyzer/icinga2/icinga2-9999.ebuild @@ -62,7 +62,6 @@ src_configure() { -DICINGA2_UNITY_BUILD=FALSE -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_BUILD_TYPE=None - -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LOCALSTATEDIR=/var -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2 diff --git a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p16.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p16.ebuild index 8c27e80b89bc..aa104dccbeaf 100644 --- a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p16.ebuild +++ b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p16.ebuild @@ -111,7 +111,7 @@ src_install() { cat <<EOF >"${T}"/nagios.cfg # Ensure all data is set to event brokers event_broker_options=-1 -broker_module=${EPREFIX%/}/usr/$(get_libdir)/mk-livestatus/livestatus.o +broker_module=${EPREFIX}/usr/$(get_libdir)/mk-livestatus/livestatus.o EOF # same for icigna cat <<EOF >"${T}"/icigna.cfg diff --git a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26-r1.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26-r1.ebuild index 481cb302ca67..071250a73b6b 100644 --- a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26-r1.ebuild +++ b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26-r1.ebuild @@ -113,7 +113,7 @@ src_install() { cat <<EOF >"${T}"/nagios.cfg # Ensure all data is set to event brokers event_broker_options=-1 -broker_module=${EPREFIX%/}/usr/$(get_libdir)/${PN}/livestatus.o +broker_module=${EPREFIX}/usr/$(get_libdir)/${PN}/livestatus.o EOF # same for icigna cat <<EOF >"${T}"/icigna.cfg diff --git a/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild index aeedaa6e04f9..a1e0d34ebf61 100644 --- a/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild +++ b/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild @@ -73,7 +73,6 @@ src_prepare() { src_configure() { local mycmakeargs=( - "-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr" "-DLOCALSTATEDIR=${EPREFIX}/var" "-DSYSCONFDIR=${EPREFIX}/etc" ) diff --git a/net-im/swift/swift-4.0.2-r1.ebuild b/net-im/swift/swift-4.0.2-r1.ebuild index eac7d6fa9d5d..78727eb9aba8 100644 --- a/net-im/swift/swift-4.0.2-r1.ebuild +++ b/net-im/swift/swift-4.0.2-r1.ebuild @@ -74,9 +74,9 @@ src_prepare() { # Hack for finding Qt system libs mkdir "${T}"/qt || die - ln -s "${EPREFIX%/}"/usr/$(get_libdir)/qt5/bin "${T}"/qt/bin || die - ln -s "${EPREFIX%/}"/usr/$(get_libdir)/qt5 "${T}"/qt/lib || die - ln -s "${EPREFIX%/}"/usr/include/qt5 "${T}"/qt/include || die + ln -s "${EPREFIX}"/usr/$(get_libdir)/qt5/bin "${T}"/qt/bin || die + ln -s "${EPREFIX}"/usr/$(get_libdir)/qt5 "${T}"/qt/lib || die + ln -s "${EPREFIX}"/usr/include/qt5 "${T}"/qt/include || die # Remove parts of Swift, which a user don't want to compile if ! use client; then rm -fr Swift Slimber || die; fi diff --git a/net-libs/davix/davix-0.6.7.ebuild b/net-libs/davix/davix-0.6.7.ebuild index 7bebb2047181..4eb8ff364a23 100644 --- a/net-libs/davix/davix-0.6.7.ebuild +++ b/net-libs/davix/davix-0.6.7.ebuild @@ -40,7 +40,6 @@ REQUIRED_USE="test? ( tools )" src_configure() { local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" -DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${P}" -DENABLE_HTML_DOCS=$(usex doc) -DENABLE_IPV6=$(usex ipv6) diff --git a/net-libs/davix/davix-0.7.3.ebuild b/net-libs/davix/davix-0.7.3.ebuild index 325471ef2fb5..1d6ee68badbd 100644 --- a/net-libs/davix/davix-0.7.3.ebuild +++ b/net-libs/davix/davix-0.7.3.ebuild @@ -45,7 +45,6 @@ src_prepare() { src_configure() { local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" -DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${P}" -DENABLE_HTML_DOCS=$(usex doc) -DENABLE_IPV6=$(usex ipv6) diff --git a/net-libs/davix/davix-0.7.4.ebuild b/net-libs/davix/davix-0.7.4.ebuild index 610959a3bbd9..9aed78284960 100644 --- a/net-libs/davix/davix-0.7.4.ebuild +++ b/net-libs/davix/davix-0.7.4.ebuild @@ -45,7 +45,6 @@ src_prepare() { src_configure() { local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" -DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${P}" -DENABLE_HTML_DOCS=$(usex doc) -DENABLE_IPV6=$(usex ipv6) diff --git a/net-libs/davix/davix-0.7.5.ebuild b/net-libs/davix/davix-0.7.5.ebuild index 610959a3bbd9..9aed78284960 100644 --- a/net-libs/davix/davix-0.7.5.ebuild +++ b/net-libs/davix/davix-0.7.5.ebuild @@ -45,7 +45,6 @@ src_prepare() { src_configure() { local mycmakeargs=( - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" -DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${P}" -DENABLE_HTML_DOCS=$(usex doc) -DENABLE_IPV6=$(usex ipv6) diff --git a/net-mail/dovecot/dovecot-2.3.7.2.ebuild b/net-mail/dovecot/dovecot-2.3.7.2.ebuild index d8cce941ec7b..52fe0014c1f3 100644 --- a/net-mail/dovecot/dovecot-2.3.7.2.ebuild +++ b/net-mail/dovecot/dovecot-2.3.7.2.ebuild @@ -133,7 +133,7 @@ src_configure() { cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" econf \ $( use_enable static-libs static ) \ - --localstatedir="${EPREFIX%/}/var" \ + --localstatedir="${EPREFIX}/var" \ --enable-shared \ --with-dovecot="${S}" \ $( use_with managesieve ) diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p1.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p1.ebuild index 6fcc74573fc8..2af7ed01cfc5 100644 --- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p1.ebuild +++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p1.ebuild @@ -61,9 +61,7 @@ pkg_setup() { } src_configure(){ - mycmakeargs=( - "-DCMAKE_INSTALL_PREFIX=/usr" - ) + local mycmakeargs=() if use fuse; then mycmakeargs+=( "-DHAVE_FUSE_25=yes" ) else diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p2.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p2.ebuild index 21f1ce96df06..f0991d2bc87a 100644 --- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p2.ebuild +++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3.1_p2.ebuild @@ -61,9 +61,7 @@ pkg_setup() { } src_configure(){ - mycmakeargs=( - "-DCMAKE_INSTALL_PREFIX=/usr" - ) + local mycmakeargs=() if use fuse; then mycmakeargs+=( "-DHAVE_FUSE_25=yes" ) else diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p2.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p2.ebuild index fe76de4838c2..ce8b2df72f46 100644 --- a/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p2.ebuild +++ b/net-misc/apt-cacher-ng/apt-cacher-ng-3.3_p2.ebuild @@ -60,9 +60,7 @@ pkg_setup() { } src_configure(){ - mycmakeargs=( - "-DCMAKE_INSTALL_PREFIX=/usr" - ) + local mycmakeargs=() if use fuse; then mycmakeargs+=( "-DHAVE_FUSE_25=yes" ) else diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild index 8bde423cde01..75d78c14ed9f 100644 --- a/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild +++ b/net-misc/apt-cacher-ng/apt-cacher-ng-9999999.ebuild @@ -58,8 +58,7 @@ pkg_setup() { } src_configure(){ - mycmakeargs=( - "-DCMAKE_INSTALL_PREFIX=/usr" + local mycmakeargs=( "-DCMAKE_SKIP_BUILD_RPATH=on" ) if use fuse; then diff --git a/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild b/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild index 7f1c3466c1ab..8ee3b73e8976 100644 --- a/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild +++ b/net-misc/lksctp-tools/lksctp-tools-1.0.18-r1.ebuild @@ -39,7 +39,7 @@ multilib_src_configure() { append-flags -fno-strict-aliasing local myeconfargs=( - --docdir="${EPREFIX%/}"/usr/share/doc/${PF} + --docdir="${EPREFIX}"/usr/share/doc/${PF} --enable-shared $(use_enable static-libs static) ) diff --git a/net-misc/openssh/openssh-7.7_p1-r9.ebuild b/net-misc/openssh/openssh-7.7_p1-r9.ebuild index 7851cc3b95e1..98bf001c684e 100644 --- a/net-misc/openssh/openssh-7.7_p1-r9.ebuild +++ b/net-misc/openssh/openssh-7.7_p1-r9.ebuild @@ -98,7 +98,7 @@ pkg_pretend() { src_prepare() { sed -i \ - -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX%/}/usr/bin/xauth:" \ + -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \ pathnames.h || die # don't break .ssh/authorized_keys2 for fun @@ -255,13 +255,13 @@ src_configure() { --with-ldflags="${LDFLAGS}" --disable-strip --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run - --sysconfdir="${EPREFIX%/}"/etc/ssh - --libexecdir="${EPREFIX%/}"/usr/$(get_libdir)/misc - --datadir="${EPREFIX%/}"/usr/share/openssh - --with-privsep-path="${EPREFIX%/}"/var/empty + --sysconfdir="${EPREFIX}"/etc/ssh + --libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc + --datadir="${EPREFIX}"/usr/share/openssh + --with-privsep-path="${EPREFIX}"/var/empty --with-privsep-user=sshd $(use_with audit audit linux) - $(use_with kerberos kerberos5 "${EPREFIX%/}"/usr) + $(use_with kerberos kerberos5 "${EPREFIX}"/usr) # We apply the sctp patch conditionally, so can't pass --without-sctp # unconditionally else we get unknown flag warnings. $(use sctp && use_with sctp) diff --git a/net-misc/openssh/openssh-7.9_p1-r4.ebuild b/net-misc/openssh/openssh-7.9_p1-r4.ebuild index 9064d66d9fbd..828c4a17b8ef 100644 --- a/net-misc/openssh/openssh-7.9_p1-r4.ebuild +++ b/net-misc/openssh/openssh-7.9_p1-r4.ebuild @@ -110,7 +110,7 @@ pkg_pretend() { src_prepare() { sed -i \ - -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX%/}/usr/bin/xauth:" \ + -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \ pathnames.h || die # don't break .ssh/authorized_keys2 for fun @@ -279,17 +279,17 @@ src_configure() { --with-ldflags="${LDFLAGS}" --disable-strip --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run - --sysconfdir="${EPREFIX%/}"/etc/ssh - --libexecdir="${EPREFIX%/}"/usr/$(get_libdir)/misc - --datadir="${EPREFIX%/}"/usr/share/openssh - --with-privsep-path="${EPREFIX%/}"/var/empty + --sysconfdir="${EPREFIX}"/etc/ssh + --libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc + --datadir="${EPREFIX}"/usr/share/openssh + --with-privsep-path="${EPREFIX}"/var/empty --with-privsep-user=sshd $(use_with audit audit linux) - $(use_with kerberos kerberos5 "${EPREFIX%/}"/usr) + $(use_with kerberos kerberos5 "${EPREFIX}"/usr) # We apply the sctp patch conditionally, so can't pass --without-sctp # unconditionally else we get unknown flag warnings. $(use sctp && use_with sctp) - $(use_with ldns ldns "${EPREFIX%/}"/usr) + $(use_with ldns ldns "${EPREFIX}"/usr) $(use_with libedit) $(use_with pam) $(use_with pie) diff --git a/net-misc/openssh/openssh-8.0_p1-r4.ebuild b/net-misc/openssh/openssh-8.0_p1-r4.ebuild index 0b6e431f7e96..1b1d9363437b 100644 --- a/net-misc/openssh/openssh-8.0_p1-r4.ebuild +++ b/net-misc/openssh/openssh-8.0_p1-r4.ebuild @@ -111,7 +111,7 @@ pkg_pretend() { src_prepare() { sed -i \ - -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX%/}/usr/bin/xauth:" \ + -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \ pathnames.h || die # don't break .ssh/authorized_keys2 for fun @@ -281,17 +281,17 @@ src_configure() { --with-ldflags="${LDFLAGS}" --disable-strip --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run - --sysconfdir="${EPREFIX%/}"/etc/ssh - --libexecdir="${EPREFIX%/}"/usr/$(get_libdir)/misc - --datadir="${EPREFIX%/}"/usr/share/openssh - --with-privsep-path="${EPREFIX%/}"/var/empty + --sysconfdir="${EPREFIX}"/etc/ssh + --libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc + --datadir="${EPREFIX}"/usr/share/openssh + --with-privsep-path="${EPREFIX}"/var/empty --with-privsep-user=sshd $(use_with audit audit linux) - $(use_with kerberos kerberos5 "${EPREFIX%/}"/usr) + $(use_with kerberos kerberos5 "${EPREFIX}"/usr) # We apply the sctp patch conditionally, so can't pass --without-sctp # unconditionally else we get unknown flag warnings. $(use sctp && use_with sctp) - $(use_with ldns ldns "${EPREFIX%/}"/usr) + $(use_with ldns ldns "${EPREFIX}"/usr) $(use_with libedit) $(use_with pam) $(use_with pie) diff --git a/net-news/quiterss/quiterss-0.18.12.ebuild b/net-news/quiterss/quiterss-0.18.12.ebuild index 9eaebe56fd69..cc44c5cb8c9f 100644 --- a/net-news/quiterss/quiterss-0.18.12.ebuild +++ b/net-news/quiterss/quiterss-0.18.12.ebuild @@ -42,7 +42,7 @@ DOCS=( AUTHORS CHANGELOG README.md ) src_configure() { local myqmakeargs=( - PREFIX="${EPREFIX%/}/usr" + PREFIX="${EPREFIX}/usr" SYSTEMQTSA=1 ) eqmake5 "${myqmakeargs[@]}" diff --git a/sci-geosciences/grass/grass-7.4.4-r2.ebuild b/sci-geosciences/grass/grass-7.4.4-r2.ebuild index 4fc916183868..1eae3bc22a9c 100644 --- a/sci-geosciences/grass/grass-7.4.4-r2.ebuild +++ b/sci-geosciences/grass/grass-7.4.4-r2.ebuild @@ -150,23 +150,23 @@ src_configure() { setup-wxwidgets fi - addwrite "${EPREFIX%/}/dev/dri/renderD128" + addwrite "${EPREFIX}/dev/dri/renderD128" local myeconfargs=( --enable-shared --disable-w11 --without-opendwg --with-regex - --with-gdal="${EPREFIX%/}/usr/bin/gdal-config" - --with-proj-includes="${EPREFIX%/}/usr/include/libprojectM" - --with-proj-libs="${EPREFIX%/}/usr/$(get_libdir)" - --with-proj-share="${EPREFIX%/}/usr/share/proj/" + --with-gdal="${EPREFIX}/usr/bin/gdal-config" + --with-proj-includes="${EPREFIX}/usr/include/libprojectM" + --with-proj-libs="${EPREFIX}/usr/$(get_libdir)" + --with-proj-share="${EPREFIX}/usr/share/proj/" $(use_with cxx) $(use_with tiff) $(use_with png) $(use_with postgres) $(use_with mysql) - $(use_with mysql mysql-includes "${EPREFIX%/}/usr/include/mysql") + $(use_with mysql mysql-includes "${EPREFIX}/usr/include/mysql") $(use_with sqlite) $(use_with opengl) $(use_with odbc) @@ -175,16 +175,16 @@ src_configure() { $(use_with lapack) $(use_with X cairo) $(use_with truetype freetype) - $(use_with truetype freetype-includes "${EPREFIX%/}/usr/include/freetype2") + $(use_with truetype freetype-includes "${EPREFIX}/usr/include/freetype2") $(use_with nls) $(use_with readline) $(use_with threads pthread) $(use_with openmp) $(use_with opencl) - $(use_with liblas liblas "${EPREFIX%/}/usr/bin/liblas-config") + $(use_with liblas liblas "${EPREFIX}/usr/bin/liblas-config") $(use_with X wxwidgets "${WX_CONFIG}") - $(use_with netcdf netcdf "${EPREFIX%/}/usr/bin/nc-config") - $(use_with geos geos "${EPREFIX%/}/usr/bin/geos-config") + $(use_with netcdf netcdf "${EPREFIX}/usr/bin/nc-config") + $(use_with geos geos "${EPREFIX}/usr/bin/geos-config") $(use_with X x) ) econf "${myeconfargs[@]}" @@ -244,7 +244,7 @@ src_install() { # get proper fonts path for fontcap sed -i \ - -e "s|${D}/usr/${MY_PM}|${EPREFIX%/}/usr/$(get_libdir)/${MY_PM}|" \ + -e "s|${D}/usr/${MY_PM}|${EPREFIX}/usr/$(get_libdir)/${MY_PM}|" \ "${D}/usr/$(get_libdir)/${MY_PM}/etc/fontcap" || die # set proper python interpreter diff --git a/sci-geosciences/grass/grass-7.4.4.ebuild b/sci-geosciences/grass/grass-7.4.4.ebuild index e875e74c7586..7ab6f3281d16 100644 --- a/sci-geosciences/grass/grass-7.4.4.ebuild +++ b/sci-geosciences/grass/grass-7.4.4.ebuild @@ -150,23 +150,23 @@ src_configure() { setup-wxwidgets fi - addwrite "${EPREFIX%/}/dev/dri/renderD128" + addwrite "${EPREFIX}/dev/dri/renderD128" local myeconfargs=( --enable-shared --disable-w11 --without-opendwg --with-regex - --with-gdal="${EPREFIX%/}/usr/bin/gdal-config" - --with-proj-includes="${EPREFIX%/}/usr/include/libprojectM" - --with-proj-libs="${EPREFIX%/}/usr/$(get_libdir)" - --with-proj-share="${EPREFIX%/}/usr/share/proj/" + --with-gdal="${EPREFIX}/usr/bin/gdal-config" + --with-proj-includes="${EPREFIX}/usr/include/libprojectM" + --with-proj-libs="${EPREFIX}/usr/$(get_libdir)" + --with-proj-share="${EPREFIX}/usr/share/proj/" $(use_with cxx) $(use_with tiff) $(use_with png) $(use_with postgres) $(use_with mysql) - $(use_with mysql mysql-includes "${EPREFIX%/}/usr/include/mysql") + $(use_with mysql mysql-includes "${EPREFIX}/usr/include/mysql") $(use_with sqlite) $(use_with opengl) $(use_with odbc) @@ -175,16 +175,16 @@ src_configure() { $(use_with lapack) $(use_with X cairo) $(use_with truetype freetype) - $(use_with truetype freetype-includes "${EPREFIX%/}/usr/include/freetype2") + $(use_with truetype freetype-includes "${EPREFIX}/usr/include/freetype2") $(use_with nls) $(use_with readline) $(use_with threads pthread) $(use_with openmp) $(use_with opencl) - $(use_with liblas liblas "${EPREFIX%/}/usr/bin/liblas-config") + $(use_with liblas liblas "${EPREFIX}/usr/bin/liblas-config") $(use_with X wxwidgets "${WX_CONFIG}") - $(use_with netcdf netcdf "${EPREFIX%/}/usr/bin/nc-config") - $(use_with geos geos "${EPREFIX%/}/usr/bin/geos-config") + $(use_with netcdf netcdf "${EPREFIX}/usr/bin/nc-config") + $(use_with geos geos "${EPREFIX}/usr/bin/geos-config") $(use_with X x) ) econf "${myeconfargs[@]}" @@ -244,7 +244,7 @@ src_install() { # get proper fonts path for fontcap sed -i \ - -e "s|${D}/usr/${MY_PM}|${EPREFIX%/}/usr/$(get_libdir)/${MY_PM}|" \ + -e "s|${D}/usr/${MY_PM}|${EPREFIX}/usr/$(get_libdir)/${MY_PM}|" \ "${D}/usr/$(get_libdir)/${MY_PM}/etc/fontcap" || die # set proper python interpreter diff --git a/sci-libs/lapack/lapack-3.8.0.ebuild b/sci-libs/lapack/lapack-3.8.0.ebuild index 8ad78cf13254..3c90d0068c8b 100644 --- a/sci-libs/lapack/lapack-3.8.0.ebuild +++ b/sci-libs/lapack/lapack-3.8.0.ebuild @@ -32,7 +32,6 @@ src_configure() { local mycmakeargs=( -DCBLAS=ON -DLAPACKE=$(usex lapacke) - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr -DBUILD_SHARED_LIBS=ON ) cmake-utils_src_configure diff --git a/sci-libs/pastix/pastix-5.2.2.22-r1.ebuild b/sci-libs/pastix/pastix-5.2.2.22-r1.ebuild index 2b4809a5bdea..812c67fafe80 100644 --- a/sci-libs/pastix/pastix-5.2.2.22-r1.ebuild +++ b/sci-libs/pastix/pastix-5.2.2.22-r1.ebuild @@ -56,7 +56,7 @@ src_prepare() { -e "s:^\(CCFOPT\s*=\).*:\1 ${FFLAGS}:" \ -e "s:^\(CCFDEB\s*=\).*:\1 ${FFLAGS}:" \ -e 's:^\(EXTRALIB\s*=\).*:\1 -lm -lrt:' \ - -e "s:^#\s*\(ROOT\s*=\).*:\1 \$(DESTDIR)${EPREFIX%/}/usr:" \ + -e "s:^#\s*\(ROOT\s*=\).*:\1 \$(DESTDIR)${EPREFIX}/usr:" \ -e 's:^#\s*\(INCLUDEDIR\s*=\).*:\1 $(ROOT)/include:' \ -e 's:^#\s*\(BINDIR\s*=\).*:\1 $(ROOT)/bin:' \ -e "s:^#\s*\(LIBDIR\s*=\).*:\1 \$(ROOT)/$(get_libdir):" \ diff --git a/sci-libs/pastix/pastix-5.2.3.ebuild b/sci-libs/pastix/pastix-5.2.3.ebuild index de4649c9db4a..430541e32cd7 100644 --- a/sci-libs/pastix/pastix-5.2.3.ebuild +++ b/sci-libs/pastix/pastix-5.2.3.ebuild @@ -45,7 +45,7 @@ src_prepare() { -e "s:^\(CCFOPT\s*=\).*:\1 ${FFLAGS}:" \ -e "s:^\(CCFDEB\s*=\).*:\1 ${FFLAGS}:" \ -e 's:^\(EXTRALIB\s*=\).*:\1 -lm -lrt:' \ - -e "s:^#\s*\(ROOT\s*=\).*:\1 \$(DESTDIR)${EPREFIX%/}/usr:" \ + -e "s:^#\s*\(ROOT\s*=\).*:\1 \$(DESTDIR)${EPREFIX}/usr:" \ -e 's:^#\s*\(INCLUDEDIR\s*=\).*:\1 $(ROOT)/include:' \ -e 's:^#\s*\(BINDIR\s*=\).*:\1 $(ROOT)/bin:' \ -e "s:^#\s*\(LIBDIR\s*=\).*:\1 \$(ROOT)/$(get_libdir):" \ diff --git a/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild b/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild index f38f5b98ec9d..33d7fc5c0a26 100644 --- a/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild +++ b/sci-libs/pgplot/pgplot-5.2.2-r7.ebuild @@ -125,7 +125,7 @@ src_test() { src_install() { insinto /usr/$(get_libdir)/pgplot doins grfont.dat grexec.f *.inc rgb.txt - echo "PGPLOT_FONT=${EPREFIX%/}/usr/$(get_libdir)/pgplot/grfont.dat" >> 99pgplot + echo "PGPLOT_FONT=${EPREFIX}/usr/$(get_libdir)/pgplot/grfont.dat" >> 99pgplot doenvd 99pgplot dolib.so libpgplot.so* diff --git a/sci-physics/root/root-6.12.06-r11.ebuild b/sci-physics/root/root-6.12.06-r11.ebuild index 2cf1a95ecc94..cf9543852ddf 100644 --- a/sci-physics/root/root-6.12.06-r11.ebuild +++ b/sci-physics/root/root-6.12.06-r11.ebuild @@ -149,8 +149,8 @@ src_configure() { local mycmakeargs=( -DCMAKE_C_FLAGS="${CFLAGS}" -DCMAKE_CXX_FLAGS="${CXXFLAGS}" - -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)" - -DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)/share/man" + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)" + -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)/share/man" -DCMAKE_INSTALL_LIBDIR="lib" -DDEFAULT_SYSROOT="${EPREFIX}" -Dexplicitlink=ON @@ -273,7 +273,7 @@ src_configure() { src_install() { cmake-utils_src_install - ROOTSYS=${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2) + ROOTSYS=${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2) ROOTENV=$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2) cat > ${ROOTENV} <<- EOF || die diff --git a/sci-physics/root/root-6.14.08-r4.ebuild b/sci-physics/root/root-6.14.08-r4.ebuild index 7839ad943f5b..0e7b47c3c07a 100644 --- a/sci-physics/root/root-6.14.08-r4.ebuild +++ b/sci-physics/root/root-6.14.08-r4.ebuild @@ -149,8 +149,8 @@ src_configure() { -DCMAKE_C_FLAGS="${CFLAGS}" -DCMAKE_CXX_FLAGS="${CXXFLAGS}" -DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}" - -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)" - -DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)/share/man" + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)" + -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)/share/man" -DCMAKE_INSTALL_LIBDIR="lib" -DDEFAULT_SYSROOT="${EPREFIX}" -DCLING_BUILD_PLUGINS=OFF @@ -286,7 +286,7 @@ src_compile() { src_install() { cmake-utils_src_install - ROOTSYS=${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2) + ROOTSYS=${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2) ROOTENV=$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2) cat > ${ROOTENV} <<- EOF || die diff --git a/sci-physics/root/root-6.16.00-r4.ebuild b/sci-physics/root/root-6.16.00-r4.ebuild index 54a957e14266..801efd279db0 100644 --- a/sci-physics/root/root-6.16.00-r4.ebuild +++ b/sci-physics/root/root-6.16.00-r4.ebuild @@ -148,8 +148,8 @@ src_configure() { -DCMAKE_C_FLAGS="${CFLAGS}" -DCMAKE_CXX_FLAGS="${CXXFLAGS}" -DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}" - -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)" - -DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)/share/man" + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)" + -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)/share/man" -DCMAKE_INSTALL_LIBDIR="lib" -DDEFAULT_SYSROOT="${EPREFIX}" -DCLING_BUILD_PLUGINS=OFF @@ -285,7 +285,7 @@ src_compile() { src_install() { cmake-utils_src_install - ROOTSYS=${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2) + ROOTSYS=${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2) ROOTENV=$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2) cat > ${ROOTENV} <<- EOF || die diff --git a/sci-physics/root/root-6.18.04.ebuild b/sci-physics/root/root-6.18.04.ebuild index 852491a3c7d7..0438e31b9afb 100644 --- a/sci-physics/root/root-6.18.04.ebuild +++ b/sci-physics/root/root-6.18.04.ebuild @@ -141,8 +141,8 @@ src_configure() { -DCMAKE_CXX_FLAGS="${CXXFLAGS}" -DCMAKE_CXX_STANDARD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-) -DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}" - -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)" - -DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)/share/man" + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)" + -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)/share/man" -DCMAKE_INSTALL_LIBDIR="lib" -DDEFAULT_SYSROOT="${EPREFIX}" -DCLING_BUILD_PLUGINS=OFF @@ -262,7 +262,7 @@ src_compile() { src_install() { cmake-utils_src_install - ROOTSYS=${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2) + ROOTSYS=${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2) ROOTENV=$((9999 - $(ver_cut 2)))${PN}-$(ver_cut 1-2) cat > ${ROOTENV} <<- EOF || die diff --git a/sci-physics/root/root-9999.ebuild b/sci-physics/root/root-9999.ebuild index 27603b4ccc6f..a6dee45e8047 100644 --- a/sci-physics/root/root-9999.ebuild +++ b/sci-physics/root/root-9999.ebuild @@ -149,8 +149,8 @@ src_configure() { -DCMAKE_CXX_FLAGS="${CXXFLAGS}" -DCMAKE_CXX_STANDARD=$((usev c++11 || usev c++14 || usev c++17) | cut -c4-) -DPYTHON_EXECUTABLE="${EPREFIX}/usr/bin/${EPYTHON}" - -DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)" - -DCMAKE_INSTALL_MANDIR="${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2)/share/man" + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)" + -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2)/share/man" -DCMAKE_INSTALL_LIBDIR="lib" -DDEFAULT_SYSROOT="${EPREFIX}" -DCLING_BUILD_PLUGINS=OFF @@ -262,7 +262,7 @@ src_compile() { src_install() { cmake-utils_src_install - ROOTSYS=${EPREFIX%/}/usr/lib/${PN}/$(ver_cut 1-2) + ROOTSYS=${EPREFIX}/usr/lib/${PN}/$(ver_cut 1-2) if [[ ${PV} == "9999" ]]; then ROOTENV="9900${PN}-git" diff --git a/sci-visualization/paraview/paraview-5.6.1.ebuild b/sci-visualization/paraview/paraview-5.6.1.ebuild index 52e09353c23c..71b503e37a9d 100644 --- a/sci-visualization/paraview/paraview-5.6.1.ebuild +++ b/sci-visualization/paraview/paraview-5.6.1.ebuild @@ -134,7 +134,6 @@ src_configure() { local mycmakeargs=( -DCMAKE_INSTALL_LIBDIR="${PVLIBDIR}" - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr -DEXPAT_INCLUDE_DIR="${EPREFIX}"/usr/include -DEXPAT_LIBRARY="${EPREFIX}"/usr/$(get_libdir)/libexpat.so -DBUILD_SHARED_LIBS=ON diff --git a/sys-apps/attr/attr-2.4.48-r3.ebuild b/sys-apps/attr/attr-2.4.48-r3.ebuild index a6f39968dfdb..53966a4fee89 100644 --- a/sys-apps/attr/attr-2.4.48-r3.ebuild +++ b/sys-apps/attr/attr-2.4.48-r3.ebuild @@ -40,11 +40,11 @@ multilib_src_configure() { tc-ld-disable-gold #644048 local myeconfargs=( - --bindir="${EPREFIX%/}"/bin + --bindir="${EPREFIX}"/bin --enable-shared $(use_enable static-libs static) $(use_enable nls) - --libexecdir="${EPREFIX%/}"/usr/$(get_libdir) + --libexecdir="${EPREFIX}"/usr/$(get_libdir) $(use_enable debug) ) ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" diff --git a/sys-apps/groff/groff-1.22.4.ebuild b/sys-apps/groff/groff-1.22.4.ebuild index 5cc2095734ed..f24193f78f45 100644 --- a/sys-apps/groff/groff-1.22.4.ebuild +++ b/sys-apps/groff/groff-1.22.4.ebuild @@ -43,7 +43,7 @@ src_prepare() { default # honor Gentoo's docdir - sed -i -e "s|^docdir =.*|docdir = \"${EPREFIX%/}/usr/share/doc/${PF}\"|g" \ + sed -i -e "s|^docdir =.*|docdir = \"${EPREFIX}/usr/share/doc/${PF}\"|g" \ Makefile.in \ || die "failed to modify Makefile.in" @@ -61,7 +61,7 @@ src_prepare() { src_configure() { local myeconfargs=( - --with-appresdir="${EPREFIX%/}"/usr/share/X11/app-defaults + --with-appresdir="${EPREFIX}"/usr/share/X11/app-defaults $(use_with X x) ) econf "${myeconfargs[@]}" diff --git a/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild b/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild index e0e3327e66ce..7c6651c21260 100644 --- a/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild +++ b/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild @@ -128,13 +128,13 @@ src_install() { emake \ DESTDIR="${D}" \ - PREFIX="${EPREFIX%/}/usr" \ - LIBDIR="${EPREFIX%/}"/$(get_libdir) \ - SBINDIR="${EPREFIX%/}"/sbin \ - CONFDIR="${EPREFIX%/}"/etc/iproute2 \ - DOCDIR="${EPREFIX%/}"/usr/share/doc/${PF} \ - MANDIR="${EPREFIX%/}"/usr/share/man \ - ARPDDIR="${EPREFIX%/}"/var/lib/arpd \ + PREFIX="${EPREFIX}/usr" \ + LIBDIR="${EPREFIX}"/$(get_libdir) \ + SBINDIR="${EPREFIX}"/sbin \ + CONFDIR="${EPREFIX}"/etc/iproute2 \ + DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \ + MANDIR="${EPREFIX}"/usr/share/man \ + ARPDDIR="${EPREFIX}"/var/lib/arpd \ install dodir /bin diff --git a/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild b/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild index 8a94a6506a5c..4a787aecfb0d 100644 --- a/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild +++ b/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild @@ -26,7 +26,7 @@ src_prepare() { } src_configure() { - econf --datadir="${EPREFIX%/}"/usr/share/misc + econf --datadir="${EPREFIX}"/usr/share/misc } src_install() { @@ -57,7 +57,7 @@ src_install() { pkg_postinst() { if [[ ${ROOT} == "/" ]] && type -P create-cracklib-dict >/dev/null ; then ebegin "Regenerating cracklib dictionary" - create-cracklib-dict "${EPREFIX%/}"/usr/share/dict/* > /dev/null + create-cracklib-dict "${EPREFIX}"/usr/share/dict/* > /dev/null eend $? fi diff --git a/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild b/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild index b63f007b6df0..a07862703917 100644 --- a/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild +++ b/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild @@ -117,8 +117,8 @@ src_install() { pkg_postinst() { if use daemon || use update_drivedb; then - local initial_db_file="${EPREFIX%/}/usr/share/${PN}/drivedb.h" - local db_path="${EPREFIX%/}/var/db/${PN}" + local initial_db_file="${EPREFIX}/usr/share/${PN}/drivedb.h" + local db_path="${EPREFIX}/var/db/${PN}" if [[ ! -f "${db_path}/drivedb.h" ]] ; then # No initial database found diff --git a/sys-apps/smartmontools/smartmontools-7.1.ebuild b/sys-apps/smartmontools/smartmontools-7.1.ebuild index 9f111458dc66..4cdbb0a02120 100644 --- a/sys-apps/smartmontools/smartmontools-7.1.ebuild +++ b/sys-apps/smartmontools/smartmontools-7.1.ebuild @@ -117,8 +117,8 @@ src_install() { pkg_postinst() { if use daemon || use update_drivedb; then - local initial_db_file="${EPREFIX%/}/usr/share/${PN}/drivedb.h" - local db_path="${EPREFIX%/}/var/db/${PN}" + local initial_db_file="${EPREFIX}/usr/share/${PN}/drivedb.h" + local db_path="${EPREFIX}/var/db/${PN}" if [[ ! -f "${db_path}/drivedb.h" ]] ; then # No initial database found diff --git a/sys-apps/smartmontools/smartmontools-9999.ebuild b/sys-apps/smartmontools/smartmontools-9999.ebuild index 9f111458dc66..4cdbb0a02120 100644 --- a/sys-apps/smartmontools/smartmontools-9999.ebuild +++ b/sys-apps/smartmontools/smartmontools-9999.ebuild @@ -117,8 +117,8 @@ src_install() { pkg_postinst() { if use daemon || use update_drivedb; then - local initial_db_file="${EPREFIX%/}/usr/share/${PN}/drivedb.h" - local db_path="${EPREFIX%/}/var/db/${PN}" + local initial_db_file="${EPREFIX}/usr/share/${PN}/drivedb.h" + local db_path="${EPREFIX}/var/db/${PN}" if [[ ! -f "${db_path}/drivedb.h" ]] ; then # No initial database found diff --git a/sys-block/partimage/partimage-0.6.9-r1.ebuild b/sys-block/partimage/partimage-0.6.9-r1.ebuild index 400f801dd5f9..83cd55dc190c 100644 --- a/sys-block/partimage/partimage-0.6.9-r1.ebuild +++ b/sys-block/partimage/partimage-0.6.9-r1.ebuild @@ -54,13 +54,13 @@ src_configure() { fi econf \ - --docdir="${EPREFIX%/}"/usr/share/doc/${PF} \ - --sysconfdir="${EPREFIX%/}"/etc \ + --docdir="${EPREFIX}"/usr/share/doc/${PF} \ + --sysconfdir="${EPREFIX}"/etc \ $(use_enable nls) \ $(use_enable ssl) \ --disable-pam \ $(use_enable static all-static) \ - --with-log-dir="${EPREFIX%/}"/var/log/partimage \ + --with-log-dir="${EPREFIX}"/var/log/partimage \ ${myconf} } diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild index a40b043634bb..57548ff8a323 100644 --- a/sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild +++ b/sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild @@ -81,7 +81,7 @@ _emake() { HAVE_AVX2=$(usex cpu_flags_x86_avx2 1 0) \ RPM_OPT_FLAGS="${CFLAGS} ${CPPFLAGS}" \ CFLAGS_OPT='$(CFLAGS)' \ - LDFLAGS="${LDFLAGS} -Wl,-rpath,${EPREFIX%/}/usr/$(get_libdir)/${PN}" \ + LDFLAGS="${LDFLAGS} -Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/${PN}" \ CC="$(tc-getCC)" \ "$@" } diff --git a/sys-fs/mtools/mtools-4.0.22.ebuild b/sys-fs/mtools/mtools-4.0.22.ebuild index 651e08e2c962..42ad7d717b90 100644 --- a/sys-fs/mtools/mtools-4.0.22.ebuild +++ b/sys-fs/mtools/mtools-4.0.22.ebuild @@ -36,7 +36,7 @@ src_configure() { # 447688 use !elibc_glibc && use !elibc_musl && append-libs "-liconv" local myeconfargs=( - --sysconfdir="${EPREFIX%/}"/etc/mtools + --sysconfdir="${EPREFIX}"/etc/mtools $(use_with X x) ) econf "${myeconfargs[@]}" diff --git a/sys-fs/mtools/mtools-4.0.23.ebuild b/sys-fs/mtools/mtools-4.0.23.ebuild index 651e08e2c962..42ad7d717b90 100644 --- a/sys-fs/mtools/mtools-4.0.23.ebuild +++ b/sys-fs/mtools/mtools-4.0.23.ebuild @@ -36,7 +36,7 @@ src_configure() { # 447688 use !elibc_glibc && use !elibc_musl && append-libs "-liconv" local myeconfargs=( - --sysconfdir="${EPREFIX%/}"/etc/mtools + --sysconfdir="${EPREFIX}"/etc/mtools $(use_with X x) ) econf "${myeconfargs[@]}" diff --git a/www-apps/otrs/otrs-5.0.25.ebuild b/www-apps/otrs/otrs-5.0.25.ebuild index 3701f495278f..a21c129d913c 100644 --- a/www-apps/otrs/otrs-5.0.25.ebuild +++ b/www-apps/otrs/otrs-5.0.25.ebuild @@ -90,18 +90,18 @@ src_prepare() { fi mv -f out.png "${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png" || die - sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \ + sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \ || die "sed failed" - sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" "${S}"/Kernel/Config/Defaults.pm \ + sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" "${S}"/Kernel/Config/Defaults.pm \ || die "sed failed" grep -lR "/opt" "${S}"/scripts | \ - xargs sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" \ + xargs sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" \ || die "sed failed" - echo "CONFIG_PROTECT=\"${EPREFIX%/}${OTRS_HOME}/Kernel/Config.pm \ - ${EPREFIX%/}${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}" || die + echo "CONFIG_PROTECT=\"${EPREFIX}${OTRS_HOME}/Kernel/Config.pm \ + ${EPREFIX}${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}" || die eapply_user } diff --git a/www-apps/otrs/otrs-6.0.3.ebuild b/www-apps/otrs/otrs-6.0.3.ebuild index 3158404230ca..8a49432f6abf 100644 --- a/www-apps/otrs/otrs-6.0.3.ebuild +++ b/www-apps/otrs/otrs-6.0.3.ebuild @@ -92,18 +92,18 @@ src_prepare() { fi mv -f out.png "${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png" || die - sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \ + sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \ || die "sed failed" - sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" "${S}"/Kernel/Config/Defaults.pm \ + sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" "${S}"/Kernel/Config/Defaults.pm \ || die "sed failed" grep -lR "/opt" "${S}"/scripts | \ - xargs sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" \ + xargs sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" \ || die "sed failed" - echo "CONFIG_PROTECT=\"${EPREFIX%/}${OTRS_HOME}/Kernel/Config.pm \ - ${EPREFIX%/}${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}" || die + echo "CONFIG_PROTECT=\"${EPREFIX}${OTRS_HOME}/Kernel/Config.pm \ + ${EPREFIX}${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}" || die eapply_user } diff --git a/www-apps/otrs/otrs-6.0.4.ebuild b/www-apps/otrs/otrs-6.0.4.ebuild index 3158404230ca..8a49432f6abf 100644 --- a/www-apps/otrs/otrs-6.0.4.ebuild +++ b/www-apps/otrs/otrs-6.0.4.ebuild @@ -92,18 +92,18 @@ src_prepare() { fi mv -f out.png "${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png" || die - sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \ + sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \ || die "sed failed" - sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" "${S}"/Kernel/Config/Defaults.pm \ + sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" "${S}"/Kernel/Config/Defaults.pm \ || die "sed failed" grep -lR "/opt" "${S}"/scripts | \ - xargs sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" \ + xargs sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" \ || die "sed failed" - echo "CONFIG_PROTECT=\"${EPREFIX%/}${OTRS_HOME}/Kernel/Config.pm \ - ${EPREFIX%/}${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}" || die + echo "CONFIG_PROTECT=\"${EPREFIX}${OTRS_HOME}/Kernel/Config.pm \ + ${EPREFIX}${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}" || die eapply_user } diff --git a/www-apps/otrs/otrs-6.0.5.ebuild b/www-apps/otrs/otrs-6.0.5.ebuild index 3158404230ca..8a49432f6abf 100644 --- a/www-apps/otrs/otrs-6.0.5.ebuild +++ b/www-apps/otrs/otrs-6.0.5.ebuild @@ -92,18 +92,18 @@ src_prepare() { fi mv -f out.png "${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png" || die - sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \ + sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \ || die "sed failed" - sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" "${S}"/Kernel/Config/Defaults.pm \ + sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" "${S}"/Kernel/Config/Defaults.pm \ || die "sed failed" grep -lR "/opt" "${S}"/scripts | \ - xargs sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" \ + xargs sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" \ || die "sed failed" - echo "CONFIG_PROTECT=\"${EPREFIX%/}${OTRS_HOME}/Kernel/Config.pm \ - ${EPREFIX%/}${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}" || die + echo "CONFIG_PROTECT=\"${EPREFIX}${OTRS_HOME}/Kernel/Config.pm \ + ${EPREFIX}${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}" || die eapply_user } diff --git a/www-apps/otrs/otrs-6.0.7.ebuild b/www-apps/otrs/otrs-6.0.7.ebuild index fa7797934ae0..c1ab3165754a 100644 --- a/www-apps/otrs/otrs-6.0.7.ebuild +++ b/www-apps/otrs/otrs-6.0.7.ebuild @@ -93,18 +93,18 @@ src_prepare() { fi mv -f out.png "${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png" || die - sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \ + sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \ || die "sed failed" - sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" "${S}"/Kernel/Config/Defaults.pm \ + sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" "${S}"/Kernel/Config/Defaults.pm \ || die "sed failed" grep -lR "/opt" "${S}"/scripts | \ - xargs sed -i -e "s:/opt/otrs:${EPREFIX%/}${OTRS_HOME}:g" \ + xargs sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" \ || die "sed failed" - echo "CONFIG_PROTECT=\"${EPREFIX%/}${OTRS_HOME}/Kernel/Config.pm \ - ${EPREFIX%/}${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}" || die + echo "CONFIG_PROTECT=\"${EPREFIX}${OTRS_HOME}/Kernel/Config.pm \ + ${EPREFIX}${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}" || die eapply_user } diff --git a/www-client/firefox/firefox-52.9.0.ebuild b/www-client/firefox/firefox-52.9.0.ebuild index 53c26593ce3a..8d3fe03a08cd 100644 --- a/www-client/firefox/firefox-52.9.0.ebuild +++ b/www-client/firefox/firefox-52.9.0.ebuild @@ -241,7 +241,7 @@ src_configure() { fi # workaround for funky/broken upstream configure... - SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \ + SHELL="${SHELL:-${EPREFIX}/bin/bash}" \ emake -f client.mk configure } @@ -267,10 +267,10 @@ src_compile() { shopt -u nullglob [[ -n "${cards}" ]] && addpredict "${cards}" - MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \ + MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" \ virtx emake -f client.mk profiledbuild else - MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \ + MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" \ emake -f client.mk realbuild fi @@ -308,7 +308,7 @@ src_install() { || die done - MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \ + MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" \ emake DESTDIR="${D}" install # Install language packs diff --git a/www-client/seamonkey/seamonkey-2.49.5-r1.ebuild b/www-client/seamonkey/seamonkey-2.49.5-r1.ebuild index a12284003e96..643eef5a7612 100644 --- a/www-client/seamonkey/seamonkey-2.49.5-r1.ebuild +++ b/www-client/seamonkey/seamonkey-2.49.5-r1.ebuild @@ -251,7 +251,7 @@ src_configure() { fi # workaround for funky/broken upstream configure... - SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \ + SHELL="${SHELL:-${EPREFIX}/bin/bash}" \ emake V=1 -f client.mk configure } @@ -295,7 +295,7 @@ src_install() { done fi - MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \ + MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" \ emake DESTDIR="${D}" install MOZ_P="${P/_*}" mozlinguas_src_install cp "${FILESDIR}"/${PN}.desktop "${T}" || die diff --git a/www-client/seamonkey/seamonkey-2.49.9.1_p0.ebuild b/www-client/seamonkey/seamonkey-2.49.9.1_p0.ebuild index f6f9ab9ef831..6101043330bb 100644 --- a/www-client/seamonkey/seamonkey-2.49.9.1_p0.ebuild +++ b/www-client/seamonkey/seamonkey-2.49.9.1_p0.ebuild @@ -279,7 +279,7 @@ src_configure() { fi # workaround for funky/broken upstream configure... - SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \ + SHELL="${SHELL:-${EPREFIX}/bin/bash}" \ emake V=1 -f client.mk configure } @@ -323,7 +323,7 @@ src_install() { done fi - MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \ + MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX}/bin/bash}" \ emake DESTDIR="${D}" install cp "${FILESDIR}"/${PN}.desktop "${T}" || die diff --git a/www-servers/nginx/nginx-1.16.1-r1.ebuild b/www-servers/nginx/nginx-1.16.1-r1.ebuild index fcb191046b1b..9c62c90db19c 100644 --- a/www-servers/nginx/nginx-1.16.1-r1.ebuild +++ b/www-servers/nginx/nginx-1.16.1-r1.ebuild @@ -996,15 +996,15 @@ pkg_postinst() { ewarn "following directories to mitigate a security bug" ewarn "(CVE-2013-0337, bug #458726):" ewarn "" - ewarn " ${EPREFIX%/}/var/log/nginx" - ewarn " ${EPREFIX%/}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}" + ewarn " ${EPREFIX}/var/log/nginx" + ewarn " ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}" ewarn "" ewarn "Check if this is correct for your setup before restarting nginx!" ewarn "This is a one-time change and will not happen on subsequent updates." - ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX%/}${NGINX_HOME_TMP}'" + ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX}${NGINX_HOME_TMP}'" chmod o-rwx \ - "${EPREFIX%/}"/var/log/nginx \ - "${EPREFIX%/}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \ + "${EPREFIX}"/var/log/nginx \ + "${EPREFIX}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \ _has_to_show_permission_warning=1 fi @@ -1013,15 +1013,15 @@ pkg_postinst() { ewarn "The permissions on the following directory have been reset in" ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):" ewarn "" - ewarn " ${EPREFIX%/}/var/log/nginx" + ewarn " ${EPREFIX}/var/log/nginx" ewarn "" ewarn "Check if this is correct for your setup before restarting nginx!" ewarn "Also ensure that no other log directory used by any of your" ewarn "vhost(s) is not writeable for nginx user. Any of your log files" ewarn "used by nginx can be abused to escalate privileges!" ewarn "This is a one-time change and will not happen on subsequent updates." - chown 0:nginx "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1 - chmod 710 "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1 + chown 0:nginx "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1 + chmod 710 "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1 fi if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then @@ -1046,7 +1046,7 @@ pkg_postinst() { # unmerged a affected installation on purpose in the past leaving # /var/log/nginx on their system due to keepdir/non-empty folder # and are now installing the package again. - local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX%/}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX) + local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX) su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null if [ $? -eq 0 ] ; then # Cleanup -- no reason to die here! @@ -1059,7 +1059,7 @@ pkg_postinst() { ewarn "Looks like your installation is vulnerable to CVE-2016-1247" ewarn "(bug #605008) because nginx user is able to create files in" ewarn "" - ewarn " ${EPREFIX%/}/var/log/nginx" + ewarn " ${EPREFIX}/var/log/nginx" ewarn "" ewarn "Also ensure that no other log directory used by any of your" ewarn "vhost(s) is not writeable for nginx user. Any of your log files" diff --git a/www-servers/nginx/nginx-1.17.7.ebuild b/www-servers/nginx/nginx-1.17.7.ebuild index 9b7d6b814dba..266794ff8ded 100644 --- a/www-servers/nginx/nginx-1.17.7.ebuild +++ b/www-servers/nginx/nginx-1.17.7.ebuild @@ -996,15 +996,15 @@ pkg_postinst() { ewarn "following directories to mitigate a security bug" ewarn "(CVE-2013-0337, bug #458726):" ewarn "" - ewarn " ${EPREFIX%/}/var/log/nginx" - ewarn " ${EPREFIX%/}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}" + ewarn " ${EPREFIX}/var/log/nginx" + ewarn " ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}" ewarn "" ewarn "Check if this is correct for your setup before restarting nginx!" ewarn "This is a one-time change and will not happen on subsequent updates." - ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX%/}${NGINX_HOME_TMP}'" + ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX}${NGINX_HOME_TMP}'" chmod o-rwx \ - "${EPREFIX%/}"/var/log/nginx \ - "${EPREFIX%/}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \ + "${EPREFIX}"/var/log/nginx \ + "${EPREFIX}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \ _has_to_show_permission_warning=1 fi @@ -1013,15 +1013,15 @@ pkg_postinst() { ewarn "The permissions on the following directory have been reset in" ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):" ewarn "" - ewarn " ${EPREFIX%/}/var/log/nginx" + ewarn " ${EPREFIX}/var/log/nginx" ewarn "" ewarn "Check if this is correct for your setup before restarting nginx!" ewarn "Also ensure that no other log directory used by any of your" ewarn "vhost(s) is not writeable for nginx user. Any of your log files" ewarn "used by nginx can be abused to escalate privileges!" ewarn "This is a one-time change and will not happen on subsequent updates." - chown 0:nginx "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1 - chmod 710 "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1 + chown 0:nginx "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1 + chmod 710 "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1 fi if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then @@ -1046,7 +1046,7 @@ pkg_postinst() { # unmerged a affected installation on purpose in the past leaving # /var/log/nginx on their system due to keepdir/non-empty folder # and are now installing the package again. - local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX%/}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX) + local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX) su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null if [ $? -eq 0 ] ; then # Cleanup -- no reason to die here! @@ -1059,7 +1059,7 @@ pkg_postinst() { ewarn "Looks like your installation is vulnerable to CVE-2016-1247" ewarn "(bug #605008) because nginx user is able to create files in" ewarn "" - ewarn " ${EPREFIX%/}/var/log/nginx" + ewarn " ${EPREFIX}/var/log/nginx" ewarn "" ewarn "Also ensure that no other log directory used by any of your" ewarn "vhost(s) is not writeable for nginx user. Any of your log files" diff --git a/www-servers/nginx/nginx-1.17.8.ebuild b/www-servers/nginx/nginx-1.17.8.ebuild index fe0559cad19b..e950633e242e 100644 --- a/www-servers/nginx/nginx-1.17.8.ebuild +++ b/www-servers/nginx/nginx-1.17.8.ebuild @@ -996,15 +996,15 @@ pkg_postinst() { ewarn "following directories to mitigate a security bug" ewarn "(CVE-2013-0337, bug #458726):" ewarn "" - ewarn " ${EPREFIX%/}/var/log/nginx" - ewarn " ${EPREFIX%/}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}" + ewarn " ${EPREFIX}/var/log/nginx" + ewarn " ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}" ewarn "" ewarn "Check if this is correct for your setup before restarting nginx!" ewarn "This is a one-time change and will not happen on subsequent updates." - ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX%/}${NGINX_HOME_TMP}'" + ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX}${NGINX_HOME_TMP}'" chmod o-rwx \ - "${EPREFIX%/}"/var/log/nginx \ - "${EPREFIX%/}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \ + "${EPREFIX}"/var/log/nginx \ + "${EPREFIX}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \ _has_to_show_permission_warning=1 fi @@ -1013,15 +1013,15 @@ pkg_postinst() { ewarn "The permissions on the following directory have been reset in" ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):" ewarn "" - ewarn " ${EPREFIX%/}/var/log/nginx" + ewarn " ${EPREFIX}/var/log/nginx" ewarn "" ewarn "Check if this is correct for your setup before restarting nginx!" ewarn "Also ensure that no other log directory used by any of your" ewarn "vhost(s) is not writeable for nginx user. Any of your log files" ewarn "used by nginx can be abused to escalate privileges!" ewarn "This is a one-time change and will not happen on subsequent updates." - chown 0:nginx "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1 - chmod 710 "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1 + chown 0:nginx "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1 + chmod 710 "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1 fi if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then @@ -1046,7 +1046,7 @@ pkg_postinst() { # unmerged a affected installation on purpose in the past leaving # /var/log/nginx on their system due to keepdir/non-empty folder # and are now installing the package again. - local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX%/}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX) + local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX) su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null if [ $? -eq 0 ] ; then # Cleanup -- no reason to die here! @@ -1059,7 +1059,7 @@ pkg_postinst() { ewarn "Looks like your installation is vulnerable to CVE-2016-1247" ewarn "(bug #605008) because nginx user is able to create files in" ewarn "" - ewarn " ${EPREFIX%/}/var/log/nginx" + ewarn " ${EPREFIX}/var/log/nginx" ewarn "" ewarn "Also ensure that no other log directory used by any of your" ewarn "vhost(s) is not writeable for nginx user. Any of your log files" diff --git a/x11-libs/libyui/libyui-3.3.3.ebuild b/x11-libs/libyui/libyui-3.3.3.ebuild index 66ac31371916..b3e24c56ad7e 100644 --- a/x11-libs/libyui/libyui-3.3.3.ebuild +++ b/x11-libs/libyui/libyui-3.3.3.ebuild @@ -36,7 +36,7 @@ src_prepare() { src_configure() { local mycmakeargs=( - -DDOC_DIR="${EPREFIX%/}/usr/share/doc/${PF}" + -DDOC_DIR="${EPREFIX}/usr/share/doc/${PF}" -DENABLE_STATIC=$(usex static-libs) -DENABLE_WERROR=OFF -DRESPECT_FLAGS=ON |