diff --git a/app-admin/system-config-printer/system-config-printer-1.4.8.ebuild b/app-admin/system-config-printer/system-config-printer-1.4.8.ebuild index ad6c8e046ae6c..e523d5796b371 100644 --- a/app-admin/system-config-printer/system-config-printer-1.4.8.ebuild +++ b/app-admin/system-config-printer/system-config-printer-1.4.8.ebuild @@ -84,7 +84,7 @@ src_configure() { fi gnome2_src_configure \ - --with-desktop-vendor=Gentoo \ + --with-desktop-vendor=${DISTRO} \ --with-udev-rules \ $(systemd_with_unitdir) \ ${myconf} diff --git a/app-admin/webmin/webmin-1.791.ebuild b/app-admin/webmin/webmin-1.791.ebuild index 8e25d1b8e6c7a..498b7d56a7b96 100644 --- a/app-admin/webmin/webmin-1.791.ebuild +++ b/app-admin/webmin/webmin-1.791.ebuild @@ -285,7 +285,7 @@ pkg_config(){ export perl="$( which perl )" export os_type='gentoo-linux' export os_version='*' - export real_os_type='Gentoo Linux' + export real_os_type="${DISTRO} Linux" export real_os_version='Any version' # Forcing 'ssl', 'no_ssl2', 'no_ssl3', 'ssl_redirect', 'no_sslcompression', # 'ssl_honorcipherorder', 'no_tls1' and 'no_tls1_1' for tightening security diff --git a/app-editors/gvim/gvim-7.4.2102.ebuild b/app-editors/gvim/gvim-7.4.2102.ebuild index 3b11e6a147f25..7cf624d92c1a0 100644 --- a/app-editors/gvim/gvim-7.4.2102.ebuild +++ b/app-editors/gvim/gvim-7.4.2102.ebuild @@ -263,7 +263,7 @@ src_configure() { fi econf \ - --with-modified-by=Gentoo-${PVR} \ + --with-modified-by=${DISTRO}-${PVR} \ --with-vim-name=gvim \ --with-x \ "${myconf[@]}" diff --git a/app-editors/gvim/gvim-7.4.769.ebuild b/app-editors/gvim/gvim-7.4.769.ebuild index 9cd936cef76d9..82397579ff455 100644 --- a/app-editors/gvim/gvim-7.4.769.ebuild +++ b/app-editors/gvim/gvim-7.4.769.ebuild @@ -266,7 +266,7 @@ src_configure() { fi econf \ - --with-modified-by=Gentoo-${PVR} \ + --with-modified-by=${DISTRO}-${PVR} \ --with-vim-name=gvim \ --with-x \ "${myconf[@]}" diff --git a/app-editors/gvim/gvim-8.0.0005.ebuild b/app-editors/gvim/gvim-8.0.0005.ebuild index 8dd474d3fde84..16f3c2b4999c2 100644 --- a/app-editors/gvim/gvim-8.0.0005.ebuild +++ b/app-editors/gvim/gvim-8.0.0005.ebuild @@ -276,7 +276,7 @@ src_configure() { fi econf \ - --with-modified-by=Gentoo-${PVR} \ + --with-modified-by=${DISTRO}-${PVR} \ --with-vim-name=gvim \ --with-x \ "${myconf[@]}" diff --git a/app-editors/gvim/gvim-8.0.0106.ebuild b/app-editors/gvim/gvim-8.0.0106.ebuild index f2918010a1867..d5aa260488fee 100644 --- a/app-editors/gvim/gvim-8.0.0106.ebuild +++ b/app-editors/gvim/gvim-8.0.0106.ebuild @@ -276,7 +276,7 @@ src_configure() { fi econf \ - --with-modified-by=Gentoo-${PVR} \ + --with-modified-by=${DISTRO}-${PVR} \ --with-vim-name=gvim \ --with-x \ "${myconf[@]}" diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild index 02afc20784150..bdcf600845fad 100644 --- a/app-editors/gvim/gvim-9999.ebuild +++ b/app-editors/gvim/gvim-9999.ebuild @@ -276,7 +276,7 @@ src_configure() { fi econf \ - --with-modified-by=Gentoo-${PVR} \ + --with-modified-by=${DISTRO}-${PVR} \ --with-vim-name=gvim \ --with-x \ "${myconf[@]}" diff --git a/app-editors/vim-core/vim-core-7.4.2102.ebuild b/app-editors/vim-core/vim-core-7.4.2102.ebuild index a3e437e529ce7..ffaf7ae935476 100644 --- a/app-editors/vim-core/vim-core-7.4.2102.ebuild +++ b/app-editors/vim-core/vim-core-7.4.2102.ebuild @@ -127,7 +127,7 @@ src_configure() { use prefix && myconf+=" --without-local-dir" econf \ - --with-modified-by=Gentoo-${PVR} \ + --with-modified-by=${DISTRO}-${PVR} \ --enable-gui=no \ --without-x \ --disable-darwin \ diff --git a/app-editors/vim-core/vim-core-7.4.769.ebuild b/app-editors/vim-core/vim-core-7.4.769.ebuild index fabffa511c344..45123099277e4 100644 --- a/app-editors/vim-core/vim-core-7.4.769.ebuild +++ b/app-editors/vim-core/vim-core-7.4.769.ebuild @@ -130,7 +130,7 @@ src_configure() { use prefix && myconf+=" --without-local-dir" econf \ - --with-modified-by=Gentoo-${PVR} \ + --with-modified-by=${DISTRO}-${PVR} \ --enable-gui=no \ --without-x \ --disable-darwin \ diff --git a/app-editors/vim-core/vim-core-8.0.0005-r1.ebuild b/app-editors/vim-core/vim-core-8.0.0005-r1.ebuild index b270bddd9feba..2fe2ad2418187 100644 --- a/app-editors/vim-core/vim-core-8.0.0005-r1.ebuild +++ b/app-editors/vim-core/vim-core-8.0.0005-r1.ebuild @@ -127,7 +127,7 @@ src_configure() { use prefix && myconf+=" --without-local-dir" econf \ - --with-modified-by=Gentoo-${PVR} \ + --with-modified-by=${DISTRO}-${PVR} \ --enable-gui=no \ --without-x \ --disable-darwin \ diff --git a/app-editors/vim-core/vim-core-8.0.0005.ebuild b/app-editors/vim-core/vim-core-8.0.0005.ebuild index f4f2539f21ae2..2be4d4a32a252 100644 --- a/app-editors/vim-core/vim-core-8.0.0005.ebuild +++ b/app-editors/vim-core/vim-core-8.0.0005.ebuild @@ -127,7 +127,7 @@ src_configure() { use prefix && myconf+=" --without-local-dir" econf \ - --with-modified-by=Gentoo-${PVR} \ + --with-modified-by=${DISTRO}-${PVR} \ --enable-gui=no \ --without-x \ --disable-darwin \ diff --git a/app-editors/vim-core/vim-core-8.0.0106.ebuild b/app-editors/vim-core/vim-core-8.0.0106.ebuild index 6a50bf3065ebf..9268a3d240bcc 100644 --- a/app-editors/vim-core/vim-core-8.0.0106.ebuild +++ b/app-editors/vim-core/vim-core-8.0.0106.ebuild @@ -127,7 +127,7 @@ src_configure() { use prefix && myconf+=" --without-local-dir" econf \ - --with-modified-by=Gentoo-${PVR} \ + --with-modified-by=${DISTRO}-${PVR} \ --enable-gui=no \ --without-x \ --disable-darwin \ diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild index cbf617ae3c3e0..0d87b4ee8b7b0 100644 --- a/app-editors/vim-core/vim-core-9999.ebuild +++ b/app-editors/vim-core/vim-core-9999.ebuild @@ -127,7 +127,7 @@ src_configure() { use prefix && myconf+=" --without-local-dir" econf \ - --with-modified-by=Gentoo-${PVR} \ + --with-modified-by=${DISTRO}-${PVR} \ --enable-gui=no \ --without-x \ --disable-darwin \ diff --git a/app-editors/vim-qt/vim-qt-20150102-r1.ebuild b/app-editors/vim-qt/vim-qt-20150102-r1.ebuild index d3a675770eebf..6ae2f0a3462a7 100644 --- a/app-editors/vim-qt/vim-qt-20150102-r1.ebuild +++ b/app-editors/vim-qt/vim-qt-20150102-r1.ebuild @@ -99,7 +99,7 @@ src_configure() { myconf+=" --disable-pythoninterp --disable-python3interp" fi - econf ${myconf} --enable-gui=qt --with-vim-name=qvim --with-modified-by=Gentoo-${PVR} + econf ${myconf} --enable-gui=qt --with-vim-name=qvim --with-modified-by=${DISTRO}-${PVR} if use lto ; then LDFLAGS="${LDFLAGS_OLD}" diff --git a/app-editors/vim/vim-7.4.2102.ebuild b/app-editors/vim/vim-7.4.2102.ebuild index 3defc6f4bc62b..dfde1f15854d1 100644 --- a/app-editors/vim/vim-7.4.2102.ebuild +++ b/app-editors/vim/vim-7.4.2102.ebuild @@ -244,7 +244,7 @@ src_configure() { use prefix && myconf+=( --without-local-dir ) econf \ - --with-modified-by=Gentoo-${PVR} \ + --with-modified-by=${DISTRO}-${PVR} \ "${myconf[@]}" } diff --git a/app-editors/vim/vim-7.4.769.ebuild b/app-editors/vim/vim-7.4.769.ebuild index 829553f78a91b..763f4c437c95b 100644 --- a/app-editors/vim/vim-7.4.769.ebuild +++ b/app-editors/vim/vim-7.4.769.ebuild @@ -247,7 +247,7 @@ src_configure() { use prefix && myconf+=( --without-local-dir ) econf \ - --with-modified-by=Gentoo-${PVR} \ + --with-modified-by=${DISTRO}-${PVR} \ "${myconf[@]}" } diff --git a/app-editors/vim/vim-8.0.0005.ebuild b/app-editors/vim/vim-8.0.0005.ebuild index bc0ca8d5b8249..311e9aa737bb1 100644 --- a/app-editors/vim/vim-8.0.0005.ebuild +++ b/app-editors/vim/vim-8.0.0005.ebuild @@ -244,7 +244,7 @@ src_configure() { use prefix && myconf+=( --without-local-dir ) econf \ - --with-modified-by=Gentoo-${PVR} \ + --with-modified-by=${DISTRO}-${PVR} \ "${myconf[@]}" } diff --git a/app-editors/vim/vim-8.0.0106.ebuild b/app-editors/vim/vim-8.0.0106.ebuild index 3434c9460769f..b0d29ee654dad 100644 --- a/app-editors/vim/vim-8.0.0106.ebuild +++ b/app-editors/vim/vim-8.0.0106.ebuild @@ -244,7 +244,7 @@ src_configure() { use prefix && myconf+=( --without-local-dir ) econf \ - --with-modified-by=Gentoo-${PVR} \ + --with-modified-by=${DISTRO}-${PVR} \ "${myconf[@]}" } diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild index 8ae35c4b90e53..d4a82b190c2eb 100644 --- a/app-editors/vim/vim-9999.ebuild +++ b/app-editors/vim/vim-9999.ebuild @@ -244,7 +244,7 @@ src_configure() { use prefix && myconf+=( --without-local-dir ) econf \ - --with-modified-by=Gentoo-${PVR} \ + --with-modified-by=${DISTRO}-${PVR} \ "${myconf[@]}" } diff --git a/app-emulation/hercules/hercules-3.10.ebuild b/app-emulation/hercules/hercules-3.10.ebuild index 7187cc4c409e2..ae92ddc41586a 100644 --- a/app-emulation/hercules/hercules-3.10.ebuild +++ b/app-emulation/hercules/hercules-3.10.ebuild @@ -35,7 +35,7 @@ src_configure() { $(use_enable bzip2 cckd-bzip2) \ $(use_enable bzip2 het-bzip2) \ $(use_enable suid setuid-hercifc) \ - --enable-custom="Gentoo ${PF}.ebuild" \ + --enable-custom="${DISTRO} ${PF}.ebuild" \ --disable-optimization } diff --git a/app-emulation/hercules/hercules-3.12.ebuild b/app-emulation/hercules/hercules-3.12.ebuild index 14e2e8a5fe405..66c86201c6954 100644 --- a/app-emulation/hercules/hercules-3.12.ebuild +++ b/app-emulation/hercules/hercules-3.12.ebuild @@ -34,7 +34,7 @@ src_configure() { $(use_enable bzip2 cckd-bzip2) \ $(use_enable bzip2 het-bzip2) \ $(use_enable suid setuid-hercifc) \ - --enable-custom="Gentoo ${PF}.ebuild" \ + --enable-custom="${DISTRO} ${PF}.ebuild" \ --disable-optimization } diff --git a/app-emulation/virtualbox/virtualbox-4.3.38.ebuild b/app-emulation/virtualbox/virtualbox-4.3.38.ebuild index e6d9597b850f5..3543682b9bcb9 100644 --- a/app-emulation/virtualbox/virtualbox-4.3.38.ebuild +++ b/app-emulation/virtualbox/virtualbox-4.3.38.ebuild @@ -232,7 +232,7 @@ src_compile() { MAKELOAD=$(echo ${MAKEOPTS} | egrep -o '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+') MAKEOPTS="${MAKEJOBS} ${MAKELOAD}" MAKE="kmk" emake \ - VBOX_BUILD_PUBLISHER=_Gentoo \ + VBOX_BUILD_PUBLISHER=_${DISTRO} \ TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \ TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \ TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \ diff --git a/app-emulation/virtualbox/virtualbox-4.3.40.ebuild b/app-emulation/virtualbox/virtualbox-4.3.40.ebuild index 3932926c17a19..84b9175f7a790 100644 --- a/app-emulation/virtualbox/virtualbox-4.3.40.ebuild +++ b/app-emulation/virtualbox/virtualbox-4.3.40.ebuild @@ -232,7 +232,7 @@ src_compile() { MAKELOAD=$(echo ${MAKEOPTS} | egrep -o '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+') MAKEOPTS="${MAKEJOBS} ${MAKELOAD}" MAKE="kmk" emake \ - VBOX_BUILD_PUBLISHER=_Gentoo \ + VBOX_BUILD_PUBLISHER=_${DISTRO} \ TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \ TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \ TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \ diff --git a/app-emulation/virtualbox/virtualbox-5.0.16-r1.ebuild b/app-emulation/virtualbox/virtualbox-5.0.16-r1.ebuild index 3d25bf925c822..a8f4a5eec232a 100644 --- a/app-emulation/virtualbox/virtualbox-5.0.16-r1.ebuild +++ b/app-emulation/virtualbox/virtualbox-5.0.16-r1.ebuild @@ -223,7 +223,7 @@ src_compile() { MAKELOAD=$(echo ${MAKEOPTS} | egrep -o '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+') #' MAKEOPTS="${MAKEJOBS} ${MAKELOAD}" MAKE="kmk" emake \ - VBOX_BUILD_PUBLISHER=_Gentoo \ + VBOX_BUILD_PUBLISHER=_${DISTRO} \ TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \ TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \ TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \ diff --git a/app-emulation/virtualbox/virtualbox-5.0.26.ebuild b/app-emulation/virtualbox/virtualbox-5.0.26.ebuild index 7f3c4a361ecc8..2164ca617ed4f 100644 --- a/app-emulation/virtualbox/virtualbox-5.0.26.ebuild +++ b/app-emulation/virtualbox/virtualbox-5.0.26.ebuild @@ -224,7 +224,7 @@ src_compile() { MAKELOAD=$(echo ${MAKEOPTS} | egrep -o '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+') #' MAKEOPTS="${MAKEJOBS} ${MAKELOAD}" MAKE="kmk" emake \ - VBOX_BUILD_PUBLISHER=_Gentoo \ + VBOX_BUILD_PUBLISHER=_${DISTRO} \ TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \ TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \ TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \ diff --git a/app-emulation/virtualbox/virtualbox-5.0.28.ebuild b/app-emulation/virtualbox/virtualbox-5.0.28.ebuild index 7f3c4a361ecc8..2164ca617ed4f 100644 --- a/app-emulation/virtualbox/virtualbox-5.0.28.ebuild +++ b/app-emulation/virtualbox/virtualbox-5.0.28.ebuild @@ -224,7 +224,7 @@ src_compile() { MAKELOAD=$(echo ${MAKEOPTS} | egrep -o '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+') #' MAKEOPTS="${MAKEJOBS} ${MAKELOAD}" MAKE="kmk" emake \ - VBOX_BUILD_PUBLISHER=_Gentoo \ + VBOX_BUILD_PUBLISHER=_${DISTRO} \ TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \ TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \ TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \ diff --git a/app-emulation/virtualbox/virtualbox-5.0.30.ebuild b/app-emulation/virtualbox/virtualbox-5.0.30.ebuild index 7f3c4a361ecc8..2164ca617ed4f 100644 --- a/app-emulation/virtualbox/virtualbox-5.0.30.ebuild +++ b/app-emulation/virtualbox/virtualbox-5.0.30.ebuild @@ -224,7 +224,7 @@ src_compile() { MAKELOAD=$(echo ${MAKEOPTS} | egrep -o '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+') #' MAKEOPTS="${MAKEJOBS} ${MAKELOAD}" MAKE="kmk" emake \ - VBOX_BUILD_PUBLISHER=_Gentoo \ + VBOX_BUILD_PUBLISHER=_${DISTRO} \ TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \ TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \ TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \ diff --git a/app-emulation/virtualbox/virtualbox-5.1.10-r1.ebuild b/app-emulation/virtualbox/virtualbox-5.1.10-r1.ebuild index 40c2eb33a9aa3..ee9c1ff4572a3 100644 --- a/app-emulation/virtualbox/virtualbox-5.1.10-r1.ebuild +++ b/app-emulation/virtualbox/virtualbox-5.1.10-r1.ebuild @@ -226,7 +226,7 @@ src_compile() { MAKELOAD=$(echo ${MAKEOPTS} | egrep -o '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+') #' MAKEOPTS="${MAKEJOBS} ${MAKELOAD}" MAKE="kmk" emake \ - VBOX_BUILD_PUBLISHER=_Gentoo \ + VBOX_BUILD_PUBLISHER=_${DISTRO} \ TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \ TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \ TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \ diff --git a/app-emulation/virtualbox/virtualbox-5.1.6.ebuild b/app-emulation/virtualbox/virtualbox-5.1.6.ebuild index cd60f3e4fbcd0..12e702876df1a 100644 --- a/app-emulation/virtualbox/virtualbox-5.1.6.ebuild +++ b/app-emulation/virtualbox/virtualbox-5.1.6.ebuild @@ -225,7 +225,7 @@ src_compile() { MAKELOAD=$(echo ${MAKEOPTS} | egrep -o '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+') #' MAKEOPTS="${MAKEJOBS} ${MAKELOAD}" MAKE="kmk" emake \ - VBOX_BUILD_PUBLISHER=_Gentoo \ + VBOX_BUILD_PUBLISHER=_${DISTRO} \ TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \ TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \ TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \ diff --git a/app-emulation/virtualbox/virtualbox-5.1.8.ebuild b/app-emulation/virtualbox/virtualbox-5.1.8.ebuild index cd60f3e4fbcd0..12e702876df1a 100644 --- a/app-emulation/virtualbox/virtualbox-5.1.8.ebuild +++ b/app-emulation/virtualbox/virtualbox-5.1.8.ebuild @@ -225,7 +225,7 @@ src_compile() { MAKELOAD=$(echo ${MAKEOPTS} | egrep -o '(\-l|\-\-load-average)(=?|[[:space:]]*)[[:digit:]]+') #' MAKEOPTS="${MAKEJOBS} ${MAKELOAD}" MAKE="kmk" emake \ - VBOX_BUILD_PUBLISHER=_Gentoo \ + VBOX_BUILD_PUBLISHER=_${DISTRO} \ TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \ TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \ TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \ diff --git a/app-office/libreoffice/libreoffice-5.2.3.3-r1.ebuild b/app-office/libreoffice/libreoffice-5.2.3.3-r1.ebuild index b39d3e36ff73e..4babcc545e3cc 100644 --- a/app-office/libreoffice/libreoffice-5.2.3.3-r1.ebuild +++ b/app-office/libreoffice/libreoffice-5.2.3.3-r1.ebuild @@ -447,7 +447,7 @@ src_configure() { --disable-online-update \ --disable-report-builder \ --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \ - --with-build-version="Gentoo official package" \ + --with-build-version="${DISTRO} official package" \ --enable-extension-integration \ --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \ @@ -456,7 +456,7 @@ src_configure() { --with-lang="" \ --with-parallelism=$(makeopts_jobs) \ --with-system-ucpp \ - --with-vendor="Gentoo Foundation" \ + --with-vendor="${DISTRO} Linux" \ --with-x \ --without-fonts \ --without-myspell-dicts \ diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild index 1202118d53ce3..2759e896e7bcb 100644 --- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild +++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild @@ -447,7 +447,7 @@ src_configure() { --disable-online-update \ --disable-report-builder \ --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \ - --with-build-version="Gentoo official package" \ + --with-build-version="${DISTRO} official package" \ --enable-extension-integration \ --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \ @@ -456,7 +456,7 @@ src_configure() { --with-lang="" \ --with-parallelism=$(makeopts_jobs) \ --with-system-ucpp \ - --with-vendor="Gentoo Foundation" \ + --with-vendor="${DISTRO} Linux" \ --with-x \ --without-fonts \ --without-myspell-dicts \ diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 6dcbd215560e2..1623f3216db4f 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -446,7 +446,7 @@ src_configure() { --disable-online-update \ --disable-report-builder \ --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \ - --with-build-version="Gentoo official package" \ + --with-build-version="${DISTRO} official package" \ --enable-extension-integration \ --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \ @@ -455,7 +455,7 @@ src_configure() { --with-lang="" \ --with-parallelism=$(makeopts_jobs) \ --with-system-ucpp \ - --with-vendor="Gentoo Foundation" \ + --with-vendor="${DISTRO} Linux" \ --with-x \ --without-fonts \ --without-myspell-dicts \ diff --git a/dev-java/icedtea/icedtea-3.2.0.ebuild b/dev-java/icedtea/icedtea-3.2.0.ebuild index b6afe60e5dad5..957f3ddd28009 100644 --- a/dev-java/icedtea/icedtea-3.2.0.ebuild +++ b/dev-java/icedtea/icedtea-3.2.0.ebuild @@ -302,7 +302,7 @@ src_configure() { --mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \ --docdir="${EPREFIX}/usr/share/doc/${PF}" \ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ - --with-pkgversion="Gentoo ${PF}" \ + --with-pkgversion="${DISTRO} ${PF}" \ --disable-downloading --disable-Werror --disable-tests \ --enable-system-lcms --enable-system-jpeg \ --enable-system-zlib --disable-systemtap-tests \ diff --git a/dev-java/icedtea/icedtea-7.2.6.8.ebuild b/dev-java/icedtea/icedtea-7.2.6.8.ebuild index db17d9d0e3c7c..d77d4c0b88f7f 100644 --- a/dev-java/icedtea/icedtea-7.2.6.8.ebuild +++ b/dev-java/icedtea/icedtea-7.2.6.8.ebuild @@ -290,7 +290,7 @@ src_configure() { --mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \ --docdir="${EPREFIX}/usr/share/doc/${PF}" \ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \ - --with-pkgversion="Gentoo ${PF}" \ + --with-pkgversion="${DISTRO} ${PF}" \ --disable-downloading --disable-Werror --disable-tests \ --enable-system-lcms --enable-system-jpeg \ --enable-system-zlib --disable-systemtap-tests \ diff --git a/dev-lang/perl/perl-5.22.3_rc4.ebuild b/dev-lang/perl/perl-5.22.3_rc4.ebuild index 77f3fffffc03b..11c6fd35af68d 100644 --- a/dev-lang/perl/perl-5.22.3_rc4.ebuild +++ b/dev-lang/perl/perl-5.22.3_rc4.ebuild @@ -435,7 +435,7 @@ src_configure() { -Dglibpth="${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir)"' ' \ -Duselargefiles \ -Dd_semctl_semun \ - -Dcf_by='Gentoo' \ + -Dcf_by="${DISTRO}" \ -Dmyhostname='localhost' \ -Dperladmin='root@localhost' \ -Ud_csh \ diff --git a/dev-lang/perl/perl-5.24.0-r1.ebuild b/dev-lang/perl/perl-5.24.0-r1.ebuild index 8b84e6e0d246f..fa5af16ee6248 100644 --- a/dev-lang/perl/perl-5.24.0-r1.ebuild +++ b/dev-lang/perl/perl-5.24.0-r1.ebuild @@ -415,7 +415,7 @@ src_configure() { -Dglibpth="${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir)"' ' \ -Duselargefiles \ -Dd_semctl_semun \ - -Dcf_by='Gentoo' \ + -Dcf_by="${DISTRO}" \ -Dmyhostname='localhost' \ -Dperladmin='root@localhost' \ -Dinstallusrbinperl='n' \ diff --git a/dev-lang/perl/perl-5.24.0-r2.ebuild b/dev-lang/perl/perl-5.24.0-r2.ebuild index 094f88d7c1842..bcd1f24c03369 100644 --- a/dev-lang/perl/perl-5.24.0-r2.ebuild +++ b/dev-lang/perl/perl-5.24.0-r2.ebuild @@ -434,7 +434,7 @@ src_configure() { -Dglibpth="${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir)"' ' \ -Duselargefiles \ -Dd_semctl_semun \ - -Dcf_by='Gentoo' \ + -Dcf_by="${DISTRO}" \ -Dmyhostname='localhost' \ -Dperladmin='root@localhost' \ -Ud_csh \ diff --git a/dev-lang/perl/perl-5.24.1_rc4.ebuild b/dev-lang/perl/perl-5.24.1_rc4.ebuild index fced739c65c6e..d90c39debf9e0 100644 --- a/dev-lang/perl/perl-5.24.1_rc4.ebuild +++ b/dev-lang/perl/perl-5.24.1_rc4.ebuild @@ -435,7 +435,7 @@ src_configure() { -Dglibpth="${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir)"' ' \ -Duselargefiles \ -Dd_semctl_semun \ - -Dcf_by='Gentoo' \ + -Dcf_by="${DISTRO}" \ -Dmyhostname='localhost' \ -Dperladmin='root@localhost' \ -Ud_csh \ diff --git a/dev-lisp/sbcl/sbcl-1.1.18.ebuild b/dev-lisp/sbcl/sbcl-1.1.18.ebuild index 162b400a56f1f..9cec90ca932f7 100644 --- a/dev-lisp/sbcl/sbcl-1.1.18.ebuild +++ b/dev-lisp/sbcl/sbcl-1.1.18.ebuild @@ -118,7 +118,7 @@ src_prepare() { src_configure() { # customizing SBCL version as per # http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup - echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr + echo -e ";;; Auto-generated by ${DISTRO}\n\"${DISTRO}-${PR}\"" > branch-version.lisp-expr # applying customizations sbcl_apply_features diff --git a/dev-lisp/sbcl/sbcl-1.3.0.ebuild b/dev-lisp/sbcl/sbcl-1.3.0.ebuild index c1b1a164f1f72..cdadfcb832c47 100644 --- a/dev-lisp/sbcl/sbcl-1.3.0.ebuild +++ b/dev-lisp/sbcl/sbcl-1.3.0.ebuild @@ -140,7 +140,7 @@ src_prepare() { src_configure() { # customizing SBCL version as per # http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup - echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr + echo -e ";;; Auto-generated by ${DISTRO}\n\"${DISTRO}-${PR}\"" > branch-version.lisp-expr # applying customizations sbcl_apply_features diff --git a/dev-lisp/sbcl/sbcl-1.3.11.ebuild b/dev-lisp/sbcl/sbcl-1.3.11.ebuild index 334669e1ad691..989e99d9e7b65 100644 --- a/dev-lisp/sbcl/sbcl-1.3.11.ebuild +++ b/dev-lisp/sbcl/sbcl-1.3.11.ebuild @@ -142,7 +142,7 @@ src_prepare() { src_configure() { # customizing SBCL version as per # http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup - echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr + echo -e ";;; Auto-generated by ${DISTRO}\n\"${DISTRO}-${PR}\"" > branch-version.lisp-expr # applying customizations sbcl_apply_features diff --git a/dev-lisp/sbcl/sbcl-1.3.12.ebuild b/dev-lisp/sbcl/sbcl-1.3.12.ebuild index 6c5a124957712..aa0f0ea59ab21 100644 --- a/dev-lisp/sbcl/sbcl-1.3.12.ebuild +++ b/dev-lisp/sbcl/sbcl-1.3.12.ebuild @@ -142,7 +142,7 @@ src_prepare() { src_configure() { # customizing SBCL version as per # http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup - echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr + echo -e ";;; Auto-generated by ${DISTRO}\n\"${DISTRO}-${PR}\"" > branch-version.lisp-expr # applying customizations sbcl_apply_features diff --git a/eclass/gst-plugins10.eclass b/eclass/gst-plugins10.eclass index 6c0c9124f4b0c..fac698b891c46 100644 --- a/eclass/gst-plugins10.eclass +++ b/eclass/gst-plugins10.eclass @@ -253,8 +253,8 @@ gst-plugins10_src_configure() { einfo "Configuring to build ${GST_PLUGINS_BUILD} plugin(s) ..." econf \ - --with-package-name="Gentoo GStreamer ebuild" \ - --with-package-origin="https://www.gentoo.org" \ + --with-package-name="${DISTRO} GStreamer ebuild" \ + --with-package-origin="${DISTRO_BUG_URL}" \ ${gst_conf} $@ } diff --git a/eclass/gstreamer.eclass b/eclass/gstreamer.eclass index dd5bf2c89fa5d..3f2bf060e709c 100644 --- a/eclass/gstreamer.eclass +++ b/eclass/gstreamer.eclass @@ -231,8 +231,8 @@ gstreamer_multilib_src_configure() { einfo "Configuring to build ${GST_PLUGINS_BUILD} plugin(s) ..." econf \ - --with-package-name="Gentoo GStreamer ebuild" \ - --with-package-origin="https://www.gentoo.org" \ + --with-package-name="${DISTRO} GStreamer ebuild" \ + --with-package-origin="${DISTRO_BUG_URL}" \ "${gst_conf[@]}" "${@}" } diff --git a/eclass/java-osgi.eclass b/eclass/java-osgi.eclass index 62f3046445a84..5298203a275dc 100644 --- a/eclass/java-osgi.eclass +++ b/eclass/java-osgi.eclass @@ -48,11 +48,11 @@ _canonicalise() { # # @param $1 - bundle name _java-osgi_plugin() { - # We hardcode Gentoo as the vendor name + # We hardcode the vendor name cat > "${_OSGI_T}/tmp_jar/plugin.properties" <<-EOF bundleName="${1}" - vendorName="Gentoo" + vendorName="${DISTRO}" EOF } diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 0754d7abf6d0a..02de9c7bfb5cd 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -766,7 +766,7 @@ kde4-base_src_configure() { fi # Set distribution name - [[ ${PN} = kdelibs ]] && cmakeargs+=(-DKDE_DISTRIBUTION_TEXT=Gentoo) + [[ ${PN} = kdelibs ]] && cmakeargs+=(-DKDE_DISTRIBUTION_TEXT=${DISTRO}) # Here we set the install prefix tc-is-cross-compiler || cmakeargs+=(-DCMAKE_INSTALL_PREFIX="${EPREFIX}${PREFIX}") diff --git a/eclass/mysql-cmake.eclass b/eclass/mysql-cmake.eclass index f14c9a7cf67b7..2cca5d776cf8a 100644 --- a/eclass/mysql-cmake.eclass +++ b/eclass/mysql-cmake.eclass @@ -374,7 +374,7 @@ mysql-cmake_src_configure() { -DINSTALL_SCRIPTDIR=share/mysql/scripts -DINSTALL_SQLBENCHDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=${EPREFIX}/usr/share/mysql - -DWITH_COMMENT="Gentoo Linux ${PF}" + -DWITH_COMMENT="${DISTRO} Linux ${PF}" $(cmake-utils_use_with test UNIT_TESTS) -DWITH_LIBEDIT=0 -DWITH_ZLIB=system diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass index ebf89f28f94f6..f42db43944680 100644 --- a/eclass/mysql-multilib-r1.eclass +++ b/eclass/mysql-multilib-r1.eclass @@ -389,7 +389,7 @@ multilib_src_configure() { -DINSTALL_SCRIPTDIR=share/mysql/scripts -DINSTALL_SQLBENCHDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=${EPREFIX}/usr/share/mysql - -DWITH_COMMENT="Gentoo Linux ${PF}" + -DWITH_COMMENT="${DISTRO} Linux ${PF}" -DWITH_UNIT_TESTS=$(usex test) -DWITH_LIBEDIT=0 -DWITH_ZLIB=system diff --git a/eclass/mysql-multilib.eclass b/eclass/mysql-multilib.eclass index b2e7dffa09ad9..7fa696f4c0f85 100644 --- a/eclass/mysql-multilib.eclass +++ b/eclass/mysql-multilib.eclass @@ -643,7 +643,7 @@ multilib_src_configure() { -DINSTALL_SCRIPTDIR=share/mysql/scripts -DINSTALL_SQLBENCHDIR=share/mysql -DINSTALL_SUPPORTFILESDIR=${EPREFIX}/usr/share/mysql - -DWITH_COMMENT="Gentoo Linux ${PF}" + -DWITH_COMMENT="${DISTRO} Linux ${PF}" $(cmake-utils_use_with test UNIT_TESTS) -DWITH_LIBEDIT=0 -DWITH_ZLIB=system diff --git a/eclass/toolchain-binutils.eclass b/eclass/toolchain-binutils.eclass index 94659c50253e2..3d0256a984446 100644 --- a/eclass/toolchain-binutils.eclass +++ b/eclass/toolchain-binutils.eclass @@ -226,7 +226,7 @@ toolchain-binutils_bugurl() { printf "https://bugs.gentoo.org/" } toolchain-binutils_pkgversion() { - printf "Gentoo ${BVER}" + printf "${DISTRO} ${BVER}" [[ -n ${PATCHVER} ]] && printf " p${PATCHVER}" } diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 55249b00249ba..b3f3f26275d57 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -466,7 +466,7 @@ gcc_quick_unpack() { #---->> src_prepare <<---- toolchain_src_prepare() { - export BRANDING_GCC_PKGVERSION="Gentoo ${GCC_PVR}" + export BRANDING_GCC_PKGVERSION="${DISTRO} ${GCC_PVR}" cd "${S}" if ! use vanilla ; then @@ -640,12 +640,12 @@ make_gcc_hard() { # Will add some optimatizion as default. gcc_hard_flags+=" -DEXTRA_OPTIONS" # rebrand to make bug reports easier - BRANDING_GCC_PKGVERSION=${BRANDING_GCC_PKGVERSION/Gentoo/Gentoo Hardened} + BRANDING_GCC_PKGVERSION=${BRANDING_GCC_PKGVERSION/${DISTRO}/${DISTRO} Hardened} fi else if use hardened ; then # rebrand to make bug reports easier - BRANDING_GCC_PKGVERSION=${BRANDING_GCC_PKGVERSION/Gentoo/Gentoo Hardened} + BRANDING_GCC_PKGVERSION=${BRANDING_GCC_PKGVERSION/${DISTRO}/${DISTRO} Hardened} if hardened_gcc_works ; then einfo "Updating gcc to use automatic PIE + SSP building ..." gcc_hard_flags+=" -DEFAULT_PIE_SSP" diff --git a/games-server/mtavc/mtavc-0.5-r1.ebuild b/games-server/mtavc/mtavc-0.5-r1.ebuild index 20433224e0b20..3d4cdd82f6cba 100644 --- a/games-server/mtavc/mtavc-0.5-r1.ebuild +++ b/games-server/mtavc/mtavc-0.5-r1.ebuild @@ -25,7 +25,7 @@ QA_EXECSTACK="/opt/${PN}/MTAServer" src_prepare() { default - sed -i 's:NoName:Gentoo:' mtaserver.conf || die + sed -i "s:NoName:${DISTRO}:" mtaserver.conf || die } src_install() { diff --git a/games-server/mtavc/mtavc-0.5.ebuild b/games-server/mtavc/mtavc-0.5.ebuild index d3ad615f523e7..2c925bc669a5b 100644 --- a/games-server/mtavc/mtavc-0.5.ebuild +++ b/games-server/mtavc/mtavc-0.5.ebuild @@ -23,7 +23,7 @@ QA_PREBUILT="${GAMES_PREFIX_OPT:1}/${PN}/MTAServer" QA_EXECSTACK="${GAMES_PREFIX_OPT:1}/${PN}/MTAServer" src_prepare() { - sed -i 's:NoName:Gentoo:' mtaserver.conf || die + sed -i "s:NoName:${DISTRO}:" mtaserver.conf || die } src_install() { diff --git a/games-strategy/warzone2100/warzone2100-3.1.5-r1.ebuild b/games-strategy/warzone2100/warzone2100-3.1.5-r1.ebuild index e1829ce08023c..87254990978d9 100644 --- a/games-strategy/warzone2100/warzone2100-3.1.5-r1.ebuild +++ b/games-strategy/warzone2100/warzone2100-3.1.5-r1.ebuild @@ -61,7 +61,7 @@ src_configure() { econf \ --docdir=/usr/share/doc/${PF} \ --localedir=/usr/share/locale \ - --with-distributor="Gentoo ${PF}" \ + --with-distributor="${DISTRO} ${PF}" \ --with-icondir=/usr/share/icons/hicolor/128x128/apps \ --with-applicationdir=/usr/share/applications \ $(use_enable debug debug relaxed) \ diff --git a/games-strategy/warzone2100/warzone2100-3.1.5.ebuild b/games-strategy/warzone2100/warzone2100-3.1.5.ebuild index 60d7327c1c54a..cf73271899bb6 100644 --- a/games-strategy/warzone2100/warzone2100-3.1.5.ebuild +++ b/games-strategy/warzone2100/warzone2100-3.1.5.ebuild @@ -59,7 +59,7 @@ src_configure() { egamesconf \ --docdir=/usr/share/doc/${PF} \ --localedir=/usr/share/locale \ - --with-distributor="Gentoo ${PF}" \ + --with-distributor="${DISTRO} ${PF}" \ --with-icondir=/usr/share/icons/hicolor/128x128/apps \ --with-applicationdir=/usr/share/applications \ $(use_enable debug debug relaxed) \ diff --git a/games-strategy/warzone2100/warzone2100-3.2.1.ebuild b/games-strategy/warzone2100/warzone2100-3.2.1.ebuild index 89d5ca155d5ca..e0b9c9f7d9c91 100644 --- a/games-strategy/warzone2100/warzone2100-3.2.1.ebuild +++ b/games-strategy/warzone2100/warzone2100-3.2.1.ebuild @@ -75,7 +75,7 @@ src_configure() { econf \ --docdir=/usr/share/doc/${PF} \ --localedir=/usr/share/locale \ - --with-distributor="Gentoo ${PF}" \ + --with-distributor="${DISTRO} ${PF}" \ --with-icondir=/usr/share/icons/hicolor/128x128/apps \ --with-applicationdir=/usr/share/applications \ $(use_enable debug debug relaxed) \ diff --git a/games-strategy/warzone2100/warzone2100-3.2.2.ebuild b/games-strategy/warzone2100/warzone2100-3.2.2.ebuild index 57a8b990b0f0b..88c2bf4184a1d 100644 --- a/games-strategy/warzone2100/warzone2100-3.2.2.ebuild +++ b/games-strategy/warzone2100/warzone2100-3.2.2.ebuild @@ -65,7 +65,7 @@ src_configure() { econf \ --docdir=/usr/share/doc/${PF} \ --localedir=/usr/share/locale \ - --with-distributor="Gentoo ${PF}" \ + --with-distributor="${DISTRO} ${PF}" \ --with-icondir=/usr/share/icons/hicolor/128x128/apps \ --with-applicationdir=/usr/share/applications \ $(use_enable debug debug relaxed) \ diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild index 468fb545b0f79..a8e390b0f91d9 100644 --- a/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild +++ b/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild @@ -58,7 +58,7 @@ src_prepare() { src_configure() { python_export_best gnome2_src_configure \ - --with-gnome-distributor=Gentoo \ + --with-gnome-distributor="${DISTRO}" \ --disable-scrollkeeper \ --disable-static \ --disable-deprecations \ diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.20.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.20.2.ebuild index 80fa20da59a6e..d00d7fe51ebb1 100644 --- a/gnome-base/gnome-desktop/gnome-desktop-3.20.2.ebuild +++ b/gnome-base/gnome-desktop/gnome-desktop-3.20.2.ebuild @@ -52,7 +52,7 @@ src_configure() { # will not get installed in ${pnpdatadir} (/usr/share/libgnome-desktop-3.0). gnome2_src_configure \ --disable-static \ - --with-gnome-distributor=Gentoo \ + --with-gnome-distributor="${DISTRO}" \ --enable-desktop-docs \ $(usex debug --enable-debug=yes ' ') \ $(use_enable debug debug-tools) \ diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.22.1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.22.1.ebuild index eb3fd42b8e4e9..e708b5a0947ff 100644 --- a/gnome-base/gnome-desktop/gnome-desktop-3.22.1.ebuild +++ b/gnome-base/gnome-desktop/gnome-desktop-3.22.1.ebuild @@ -47,7 +47,7 @@ DEPEND="${COMMON_DEPEND} src_configure() { gnome2_src_configure \ --disable-static \ - --with-gnome-distributor=Gentoo \ + --with-gnome-distributor="${DISTRO}" \ --enable-desktop-docs \ $(usex debug --enable-debug=yes ' ') \ $(use_enable debug debug-tools) \ diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.22.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.22.2.ebuild index eb3fd42b8e4e9..e708b5a0947ff 100644 --- a/gnome-base/gnome-desktop/gnome-desktop-3.22.2.ebuild +++ b/gnome-base/gnome-desktop/gnome-desktop-3.22.2.ebuild @@ -47,7 +47,7 @@ DEPEND="${COMMON_DEPEND} src_configure() { gnome2_src_configure \ --disable-static \ - --with-gnome-distributor=Gentoo \ + --with-gnome-distributor="${DISTRO}" \ --enable-desktop-docs \ $(usex debug --enable-debug=yes ' ') \ $(use_enable debug debug-tools) \ diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.8.3.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.8.3.ebuild index f0bb1bb18d437..428d560fe2b42 100644 --- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.8.3.ebuild +++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.8.3.ebuild @@ -19,7 +19,7 @@ DEPEND="${RDEPEND} src_configure() { local mycmakeargs=( - -DDISTRO_NAME="Gentoo Linux" + -DDISTRO_NAME="${DISTRO} Linux" -DDISTRO_VERSION= ) diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.8.4.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.8.4.ebuild index cbc38054f2a45..50c9064617c23 100644 --- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.8.4.ebuild +++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.8.4.ebuild @@ -19,7 +19,7 @@ DEPEND="${RDEPEND} src_configure() { local mycmakeargs=( - -DDISTRO_NAME="Gentoo Linux" + -DDISTRO_NAME="${DISTRO} Linux" -DDISTRO_VERSION= ) diff --git a/mail-client/mutt/mutt-1.5.23-r7.ebuild b/mail-client/mutt/mutt-1.5.23-r7.ebuild index 1e388bb56e72f..e09a012b03a1f 100644 --- a/mail-client/mutt/mutt-1.5.23-r7.ebuild +++ b/mail-client/mutt/mutt-1.5.23-r7.ebuild @@ -110,8 +110,8 @@ src_prepare() { epatch_user && upatches=" with user patches" # patch version string for bug reports - sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}${upatches}"')"/' \ - muttlib.c || die "failed patching in Gentoo version" + sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, '"${DISTRO}"' '"${PVR}${upatches}"')"/' \ + muttlib.c || die "failed patching in ${DISTRO} version" # many patches touch the buildsystem, we always need this AT_M4DIR="m4" eautoreconf diff --git a/mail-client/mutt/mutt-1.5.24-r2.ebuild b/mail-client/mutt/mutt-1.5.24-r2.ebuild index ac1116bced791..4c1c6e7d5a40a 100644 --- a/mail-client/mutt/mutt-1.5.24-r2.ebuild +++ b/mail-client/mutt/mutt-1.5.24-r2.ebuild @@ -128,8 +128,8 @@ src_prepare() { epatch_user && upatches=" with user patches" # patch version string for bug reports - sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}${upatches}"')"/' \ - muttlib.c || die "failed patching in Gentoo version" + sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, '"${DISTRO}"' '"${PVR}${upatches}"')"/' \ + muttlib.c || die "failed patching in ${DISTRO} version" # many patches touch the buildsystem, we always need this AT_M4DIR="m4" eautoreconf diff --git a/mail-client/mutt/mutt-1.7.2.ebuild b/mail-client/mutt/mutt-1.7.2.ebuild index 06cd0b2dfa3e3..08336ca159c9f 100644 --- a/mail-client/mutt/mutt-1.7.2.ebuild +++ b/mail-client/mutt/mutt-1.7.2.ebuild @@ -105,7 +105,7 @@ src_prepare() { done # add some explanation as to why not to go upstream sed -i \ - -e '/ReachingUs = N_(/aThis release of Mutt is heavily enriched with patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor re-emerge with USE=vanilla and try to reproduce your problem.\\n\\' \ + -e '/ReachingUs = N_(/aThis release of Mutt is heavily enriched with patches.\\nFor this reason, any bugs are better reported at '"${DISTRO_BUG_URL}"'\\nor re-emerge with USE=vanilla and try to reproduce your problem.\\n\\' \ main.c || die "Failed to add bug instructions" fi @@ -116,8 +116,8 @@ src_prepare() { # patch version string for bug reports local patchset= use vanilla || patchset=", ${PATCHSET}" - sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${patchset}${upatches}"')"|' \ - muttlib.c || die "failed patching in Gentoo version" + sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s'"${DISTRO} ${patchset}${upatches}"')"|' \ + muttlib.c || die "failed patching in ${DISTRO} version" # many patches touch the buildsystem, we always need this AT_M4DIR="m4" eautoreconf diff --git a/mail-filter/dcc/dcc-1.3.140-r1.ebuild b/mail-filter/dcc/dcc-1.3.140-r1.ebuild index 740cc7728de3e..390d460fff208 100644 --- a/mail-filter/dcc/dcc-1.3.140-r1.ebuild +++ b/mail-filter/dcc/dcc-1.3.140-r1.ebuild @@ -102,7 +102,7 @@ src_install() { emake install || die "emake install failed" # branding and setting reasonable defaults - sed -e "s/BRAND=\$/BRAND='Gentoo ${PF}'/;" \ + sed -e "s/BRAND=\$/BRAND='${DISTRO} ${PF}'/;" \ -e "s/GREY_ENABLE=\$/GREY_ENABLE=off/;" \ -e "s/DCCM_LOG_AT=5\$/DCCM_LOG_AT=50/;" \ -e "s,DCCM_LOGDIR=\"log\"\$,DCCM_LOGDIR=\"/var/log/dcc\",;" \ diff --git a/mail-filter/dcc/dcc-1.3.154.ebuild b/mail-filter/dcc/dcc-1.3.154.ebuild index 35796acc3086e..b3e72a8d5dcaa 100644 --- a/mail-filter/dcc/dcc-1.3.154.ebuild +++ b/mail-filter/dcc/dcc-1.3.154.ebuild @@ -88,7 +88,7 @@ src_install() { emake install # branding and setting reasonable defaults - sed -e "s/BRAND=\$/BRAND='Gentoo ${PF}'/;" \ + sed -e "s/BRAND=\$/BRAND='${DISTRO} ${PF}'/;" \ -e "s/GREY_ENABLE=\$/GREY_ENABLE=off/;" \ -e "s/DCCM_LOG_AT=5\$/DCCM_LOG_AT=50/;" \ -e "s,DCCM_LOGDIR=\"log\"\$,DCCM_LOGDIR=\"/var/log/dcc\",;" \ diff --git a/mail-filter/dcc/dcc-1.3.158.ebuild b/mail-filter/dcc/dcc-1.3.158.ebuild index 77193bea12361..14e257655a3eb 100644 --- a/mail-filter/dcc/dcc-1.3.158.ebuild +++ b/mail-filter/dcc/dcc-1.3.158.ebuild @@ -88,7 +88,7 @@ src_install() { emake install # branding and setting reasonable defaults - sed -e "s/BRAND=\$/BRAND='Gentoo ${PF}'/;" \ + sed -e "s/BRAND=\$/BRAND='${DISTRO} ${PF}'/;" \ -e "s/GREY_ENABLE=\$/GREY_ENABLE=off/;" \ -e "s/DCCM_LOG_AT=5\$/DCCM_LOG_AT=50/;" \ -e "s,DCCM_LOGDIR=\"log\"\$,DCCM_LOGDIR=\"/var/log/dcc\",;" \ diff --git a/mail-filter/dspam/dspam-3.10.2-r1.ebuild b/mail-filter/dspam/dspam-3.10.2-r1.ebuild index 9bb6a703bbad4..75969d786f6ca 100644 --- a/mail-filter/dspam/dspam-3.10.2-r1.ebuild +++ b/mail-filter/dspam/dspam-3.10.2-r1.ebuild @@ -174,7 +174,7 @@ src_install() { insinto "${DSPAM_HOME}/txt" doins txt/*.txt for i in spam nonspam; do - echo "Scanned and tagged with DSPAM ${PV} on Gentoo Linux as ${i} by ISP" > "${T}/msgtag.${i}" + echo "Scanned and tagged with DSPAM ${PV} on ${DISTRO} Linux as ${i} by ISP" > "${T}/msgtag.${i}" doins "${T}/msgtag.${i}" done diff --git a/media-gfx/povray/povray-3.7.0.0-r1.ebuild b/media-gfx/povray/povray-3.7.0.0-r1.ebuild index cee0d06be2919..1e4f63a8f36ba 100644 --- a/media-gfx/povray/povray-3.7.0.0-r1.ebuild +++ b/media-gfx/povray/povray-3.7.0.0-r1.ebuild @@ -103,7 +103,7 @@ src_configure() { append-cppflags -DPOVLIBDIR=\\\"${EROOT}usr/share/${PN}\\\" -DPOVCONFDIR=\\\"${EROOT}etc/${PN}\\\" econf \ - COMPILED_BY="Portage (Gentoo $(uname)) on $(hostname -f)" \ + COMPILED_BY="Portage (${DISTRO} $(uname)) on $(hostname -f)" \ $(use_enable debug) \ $(use_enable io-restrictions) \ $(use_with openexr openexr "${EPREFIX}/usr/$(get_libdir)") \ diff --git a/media-gfx/povray/povray-3.7.0.0.ebuild b/media-gfx/povray/povray-3.7.0.0.ebuild index 5a0537a30d18d..4ceb467408994 100644 --- a/media-gfx/povray/povray-3.7.0.0.ebuild +++ b/media-gfx/povray/povray-3.7.0.0.ebuild @@ -107,7 +107,7 @@ src_configure() { local myeconfargs=( ${non_redist_conf} - COMPILED_BY="Portage (Gentoo `uname`) on `hostname -f`" + COMPILED_BY="Portage (${DISTRO} `uname`) on `hostname -f`" $(use_enable debug) $(use_enable io-restrictions) $(use_with openexr openexr "${EPREFIX}/usr/$(get_libdir)") diff --git a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.6.2.ebuild b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.6.2.ebuild index 19978a2170ce9..f3fcae1bfb0db 100644 --- a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.6.2.ebuild +++ b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.6.2.ebuild @@ -43,7 +43,7 @@ src_configure() { --disable-examples \ --without-gtk \ --with-bash-completion-dir="$(get_bashcompdir)" \ - --with-package-name="GStreamer editing services ebuild for Gentoo" \ + --with-package-name="GStreamer editing services ebuild for ${DISTRO}" \ --with-package-origin="https://packages.gentoo.org/package/media-libs/gstreamer-editing-services" } diff --git a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.8.2.ebuild b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.8.2.ebuild index 5ed7c10b640a9..9d40d41e64fc8 100644 --- a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.8.2.ebuild +++ b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.8.2.ebuild @@ -45,7 +45,7 @@ src_configure() { --disable-examples \ --without-gtk \ --with-bash-completion-dir="$(get_bashcompdir)" \ - --with-package-name="GStreamer editing services ebuild for Gentoo" \ + --with-package-name="GStreamer editing services ebuild for ${DISTRO}" \ --with-package-origin="https://packages.gentoo.org/package/media-libs/gstreamer-editing-services" } diff --git a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.8.3.ebuild b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.8.3.ebuild index 242e056c1e217..f3cda56544260 100644 --- a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.8.3.ebuild +++ b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.8.3.ebuild @@ -45,7 +45,7 @@ src_configure() { --disable-examples \ --without-gtk \ --with-bash-completion-dir="$(get_bashcompdir)" \ - --with-package-name="GStreamer editing services ebuild for Gentoo" \ + --with-package-name="GStreamer editing services ebuild for ${DISTRO}" \ --with-package-origin="https://packages.gentoo.org/package/media-libs/gstreamer-editing-services" } diff --git a/media-libs/gstreamer/gstreamer-0.10.36-r2.ebuild b/media-libs/gstreamer/gstreamer-0.10.36-r2.ebuild index d76a5268bfc6f..f5614990264a1 100644 --- a/media-libs/gstreamer/gstreamer-0.10.36-r2.ebuild +++ b/media-libs/gstreamer/gstreamer-0.10.36-r2.ebuild @@ -80,7 +80,7 @@ multilib_src_configure() { --enable-check \ $(multilib_native_use_enable introspection) \ $(use_enable test tests) \ - --with-package-name="GStreamer ebuild for Gentoo" \ + --with-package-name="GStreamer ebuild for ${DISTRO}" \ --with-package-origin="https://packages.gentoo.org/package/media-libs/gstreamer" if multilib_is_native_abi; then diff --git a/media-libs/gstreamer/gstreamer-1.4.5.ebuild b/media-libs/gstreamer/gstreamer-1.4.5.ebuild index 2ad0025d2b84b..73a689802bf44 100644 --- a/media-libs/gstreamer/gstreamer-1.4.5.ebuild +++ b/media-libs/gstreamer/gstreamer-1.4.5.ebuild @@ -61,7 +61,7 @@ multilib_src_configure() { $(multilib_native_use_enable introspection) \ $(use_enable nls) \ $(use_enable test tests) \ - --with-package-name="GStreamer ebuild for Gentoo" \ + --with-package-name="GStreamer ebuild for ${DISTRO}" \ --with-package-origin="https://packages.gentoo.org/package/media-libs/gstreamer" if multilib_is_native_abi; then diff --git a/media-libs/gstreamer/gstreamer-1.6.3.ebuild b/media-libs/gstreamer/gstreamer-1.6.3.ebuild index fd465eda82523..126969a0fbd93 100644 --- a/media-libs/gstreamer/gstreamer-1.6.3.ebuild +++ b/media-libs/gstreamer/gstreamer-1.6.3.ebuild @@ -68,7 +68,7 @@ multilib_src_configure() { $(use_enable nls) $(use_enable test tests) --with-bash-completion-dir="$(get_bashcompdir)" - --with-package-name="GStreamer ebuild for Gentoo" + --with-package-name="GStreamer ebuild for ${DISTRO}" --with-package-origin="https://packages.gentoo.org/package/media-libs/gstreamer" ) diff --git a/media-libs/gstreamer/gstreamer-1.8.2.ebuild b/media-libs/gstreamer/gstreamer-1.8.2.ebuild index ac376ece7ba9f..9a62cfe353639 100644 --- a/media-libs/gstreamer/gstreamer-1.8.2.ebuild +++ b/media-libs/gstreamer/gstreamer-1.8.2.ebuild @@ -59,7 +59,7 @@ multilib_src_configure() { $(use_enable nls) $(use_enable test tests) --with-bash-completion-dir="$(get_bashcompdir)" - --with-package-name="GStreamer ebuild for Gentoo" + --with-package-name="GStreamer ebuild for ${DISTRO}" --with-package-origin="https://packages.gentoo.org/package/media-libs/gstreamer" ) diff --git a/media-libs/gstreamer/gstreamer-1.8.3.ebuild b/media-libs/gstreamer/gstreamer-1.8.3.ebuild index 7e80ca0f42722..95ef57d8a3989 100644 --- a/media-libs/gstreamer/gstreamer-1.8.3.ebuild +++ b/media-libs/gstreamer/gstreamer-1.8.3.ebuild @@ -60,7 +60,7 @@ multilib_src_configure() { $(use_enable nls) $(use_enable test tests) --with-bash-completion-dir="$(get_bashcompdir)" - --with-package-name="GStreamer ebuild for Gentoo" + --with-package-name="GStreamer ebuild for ${DISTRO}" --with-package-origin="https://packages.gentoo.org/package/media-libs/gstreamer" ) diff --git a/media-plugins/banshee-community-extensions/banshee-community-extensions-2.4.0-r2.ebuild b/media-plugins/banshee-community-extensions/banshee-community-extensions-2.4.0-r2.ebuild index 17a42bbf8d082..5ee6dee4d5859 100644 --- a/media-plugins/banshee-community-extensions/banshee-community-extensions-2.4.0-r2.ebuild +++ b/media-plugins/banshee-community-extensions/banshee-community-extensions-2.4.0-r2.ebuild @@ -59,7 +59,7 @@ src_configure() { --enable-release --disable-maintainer-mode --with-gconf-schema-file-dir=/etc/gconf/schemas - --with-vendor-build-id=Gentoo/${PN}/${PVR} + --with-vendor-build-id=${DISTRO}/${PN}/${PVR} --disable-scrollkeeper --disable-clutterflow --disable-appindicator --disable-openvp --enable-ampache --disable-karaoke --disable-jamendo diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5-r1.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5-r1.ebuild index d9fb41eb01e09..7fade7ada92e4 100644 --- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5-r1.ebuild +++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5-r1.ebuild @@ -41,7 +41,7 @@ multilib_src_configure() { ECONF_SOURCE=${S} \ econf \ --disable-maintainer-mode \ - --with-package-name="Gentoo GStreamer ebuild" \ + --with-package-name="${DISTRO} GStreamer ebuild" \ --with-package-origin="https://www.gentoo.org" \ --disable-fatal-warnings \ --with-system-libav \ diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5-r2.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5-r2.ebuild index f678f3c224561..9c3d95f2c5a57 100644 --- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5-r2.ebuild +++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.4.5-r2.ebuild @@ -51,7 +51,7 @@ multilib_src_configure() { ECONF_SOURCE=${S} \ econf \ --disable-maintainer-mode \ - --with-package-name="Gentoo GStreamer ebuild" \ + --with-package-name="${DISTRO} GStreamer ebuild" \ --with-package-origin="https://www.gentoo.org" \ --disable-fatal-warnings \ --with-system-libav \ diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.6.3.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.6.3.ebuild index a55f64fdde957..bf9dec5a5bf95 100644 --- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.6.3.ebuild +++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.6.3.ebuild @@ -63,7 +63,7 @@ multilib_src_configure() { ECONF_SOURCE=${S} \ econf \ --disable-maintainer-mode \ - --with-package-name="Gentoo GStreamer ebuild" \ + --with-package-name="${DISTRO} GStreamer ebuild" \ --with-package-origin="https://www.gentoo.org" \ --disable-fatal-warnings \ $(use_enable orc) \ diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.8.2.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.8.2.ebuild index 546a3b8a80fe9..9a8bf1ffb76a5 100644 --- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.8.2.ebuild +++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.8.2.ebuild @@ -53,7 +53,7 @@ multilib_src_configure() { ECONF_SOURCE=${S} \ econf \ --disable-maintainer-mode \ - --with-package-name="Gentoo GStreamer ebuild" \ + --with-package-name="${DISTRO} GStreamer ebuild" \ --with-package-origin="https://www.gentoo.org" \ --disable-fatal-warnings \ $(use_enable orc) \ diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.8.3.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.8.3.ebuild index 64d3b61a724ef..97972482decfe 100644 --- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.8.3.ebuild +++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.8.3.ebuild @@ -59,7 +59,7 @@ multilib_src_configure() { ECONF_SOURCE=${S} \ econf \ --disable-maintainer-mode \ - --with-package-name="Gentoo GStreamer ebuild" \ + --with-package-name="${DISTRO} GStreamer ebuild" \ --with-package-origin="https://www.gentoo.org" \ --disable-fatal-warnings \ $(use_enable orc) \ diff --git a/media-sound/banshee/banshee-2.6.2-r1.ebuild b/media-sound/banshee/banshee-2.6.2-r1.ebuild index f34db3cac13e0..8d3be13aa4f9b 100644 --- a/media-sound/banshee/banshee-2.6.2-r1.ebuild +++ b/media-sound/banshee/banshee-2.6.2-r1.ebuild @@ -89,7 +89,7 @@ src_configure() { --enable-gnome --enable-schemas-install --with-gconf-schema-file-dir=/etc/gconf/schemas - --with-vendor-build-id=Gentoo/${PN}/${PVR} + --with-vendor-build-id=${DISTRO}/${PN}/${PVR} --enable-gapless-playback --disable-boo --disable-gst-sharp diff --git a/media-sound/sox/sox-14.4.2.ebuild b/media-sound/sox/sox-14.4.2.ebuild index 7dc1a267eb8d0..5917810d95396 100644 --- a/media-sound/sox/sox-14.4.2.ebuild +++ b/media-sound/sox/sox-14.4.2.ebuild @@ -66,7 +66,7 @@ src_configure() { $(use_enable static-libs static) \ $(use_with twolame) \ $(use_with wavpack) \ - --with-distro="Gentoo" + --with-distro="${DISTRO}" } src_install() { diff --git a/media-video/cinelerra/cinelerra-20120707.ebuild b/media-video/cinelerra/cinelerra-20120707.ebuild index eaee626918c6a..ff57a2ebf81e7 100644 --- a/media-video/cinelerra/cinelerra-20120707.ebuild +++ b/media-video/cinelerra/cinelerra-20120707.ebuild @@ -85,7 +85,7 @@ src_configure() { $(use_enable altivec) \ $(use_enable opengl) \ --with-plugindir=/usr/$(get_libdir)/${PN} \ - --with-buildinfo=cust/"Gentoo - ${PV}" \ + --with-buildinfo=cust/"${DISTRO} - ${PV}" \ --with-external-ffmpeg } diff --git a/media-video/cinelerra/cinelerra-20140710.ebuild b/media-video/cinelerra/cinelerra-20140710.ebuild index 48f96efcf20e9..2cf172182d539 100644 --- a/media-video/cinelerra/cinelerra-20140710.ebuild +++ b/media-video/cinelerra/cinelerra-20140710.ebuild @@ -95,7 +95,7 @@ src_configure() { $(use_enable altivec) \ $(use_enable opengl) \ --with-plugindir=/usr/$(get_libdir)/${PN} \ - --with-buildinfo=cust/"Gentoo - ${PV}" \ + --with-buildinfo=cust/"${DISTRO} - ${PV}" \ --with-external-ffmpeg \ ${myconf} } diff --git a/media-video/mplayer/mplayer-1.2-r2.ebuild b/media-video/mplayer/mplayer-1.2-r2.ebuild index 2e7b8e57d206e..bc1e276f9be5a 100644 --- a/media-video/mplayer/mplayer-1.2-r2.ebuild +++ b/media-video/mplayer/mplayer-1.2-r2.ebuild @@ -254,7 +254,7 @@ src_prepare() { if [ ! -f VERSION ] ; then [ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?" local sv=$(<$svf) - printf "SVN-r${sv} (Gentoo)" > VERSION + printf "SVN-r${sv} (${DISTRO})" > VERSION fi # fix path to bash executable in configure scripts diff --git a/media-video/mplayer/mplayer-1.2.1.ebuild b/media-video/mplayer/mplayer-1.2.1.ebuild index c3cd5bfd82ff4..dcf59a1481619 100644 --- a/media-video/mplayer/mplayer-1.2.1.ebuild +++ b/media-video/mplayer/mplayer-1.2.1.ebuild @@ -249,7 +249,7 @@ src_prepare() { if [ ! -f VERSION ] ; then [ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?" local sv=$(<$svf) - printf "SVN-r${sv} (Gentoo)" > VERSION + printf "SVN-r${sv} (${DISTRO})" > VERSION fi # fix path to bash executable in configure scripts diff --git a/media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild b/media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild index 1dae7c9cff9ea..02ce044cccc29 100644 --- a/media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild +++ b/media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild @@ -254,7 +254,7 @@ src_prepare() { if [ ! -f VERSION ] ; then [ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?" local sv=$(<$svf) - printf "SVN-r${sv} (Gentoo)" > VERSION + printf "SVN-r${sv} (${DISTRO})" > VERSION fi # fix path to bash executable in configure scripts diff --git a/media-video/mplayer/mplayer-1.3.0.ebuild b/media-video/mplayer/mplayer-1.3.0.ebuild index 00942900677be..3718a4dae6fde 100644 --- a/media-video/mplayer/mplayer-1.3.0.ebuild +++ b/media-video/mplayer/mplayer-1.3.0.ebuild @@ -249,7 +249,7 @@ src_prepare() { if [ ! -f VERSION ] ; then [ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?" local sv=$(<$svf) - printf "SVN-r${sv} (Gentoo)" > VERSION + printf "SVN-r${sv} (${DISTRO})" > VERSION fi # fix path to bash executable in configure scripts diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild index a898de86200c7..d426ebee51ff2 100644 --- a/media-video/mplayer/mplayer-9999.ebuild +++ b/media-video/mplayer/mplayer-9999.ebuild @@ -249,7 +249,7 @@ src_prepare() { if [ ! -f VERSION ] ; then [ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?" local sv=$(<$svf) - printf "SVN-r${sv} (Gentoo)" > VERSION + printf "SVN-r${sv} (${DISTRO})" > VERSION fi # fix path to bash executable in configure scripts diff --git a/media-video/smplayer/smplayer-14.9.0-r1.ebuild b/media-video/smplayer/smplayer-14.9.0-r1.ebuild index c7f02ef9423bd..4e1631e86f1a3 100644 --- a/media-video/smplayer/smplayer-14.9.0-r1.ebuild +++ b/media-video/smplayer/smplayer-14.9.0-r1.ebuild @@ -59,7 +59,7 @@ src_prepare() { src_configure() { cd "${S}"/src - echo "#define SVN_REVISION \"SVN-${MY_PV} (Gentoo)\"" > svn_revision.h + echo "#define SVN_REVISION \"SVN-${MY_PV} (${DISTRO})\"" > svn_revision.h eqmake4 } diff --git a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.1.ebuild b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.1.ebuild index 5be42c233ce31..5f909e000b162 100644 --- a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.1.ebuild +++ b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.1.ebuild @@ -42,6 +42,6 @@ python_test() { python_install() { distutils-r1_python_install - echo "RIPE Atlas Tools (Magellan) [Gentoo Linux] ${PVR}" > \ + echo "RIPE Atlas Tools (Magellan) [${DISTRO} Linux] ${PVR}" > \ ${D}$(python_get_sitedir)/ripe/atlas/tools/user-agent } diff --git a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.2.ebuild b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.2.ebuild index 8c0928c760500..42979d1cf44f0 100644 --- a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.2.ebuild +++ b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.2.ebuild @@ -42,6 +42,6 @@ python_test() { python_install() { distutils-r1_python_install - echo "RIPE Atlas Tools (Magellan) [Gentoo Linux] ${PVR}" > \ + echo "RIPE Atlas Tools (Magellan) [${DISTRO} Linux] ${PVR}" > \ ${D}$(python_get_sitedir)/ripe/atlas/tools/user-agent } diff --git a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3-r1.ebuild b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3-r1.ebuild index 3a226ce01b818..c377a39e078eb 100644 --- a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3-r1.ebuild +++ b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3-r1.ebuild @@ -44,6 +44,6 @@ python_test() { python_install() { distutils-r1_python_install - echo "RIPE Atlas Tools (Magellan) [Gentoo Linux] ${PVR}" > \ + echo "RIPE Atlas Tools (Magellan) [${DISTRO} Linux] ${PVR}" > \ ${D}$(python_get_sitedir)/ripe/atlas/tools/user-agent } diff --git a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3.ebuild b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3.ebuild index aa6355e7af842..f1cd0f72b3206 100644 --- a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3.ebuild +++ b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3.ebuild @@ -44,6 +44,6 @@ python_test() { python_install() { distutils-r1_python_install - echo "RIPE Atlas Tools (Magellan) [Gentoo Linux] ${PVR}" > \ + echo "RIPE Atlas Tools (Magellan) [${DISTRO} Linux] ${PVR}" > \ ${D}$(python_get_sitedir)/ripe/atlas/tools/user-agent } diff --git a/net-dns/libidn/libidn-1.33.ebuild b/net-dns/libidn/libidn-1.33.ebuild index 5c0725c91bd1b..826949c6f34fe 100644 --- a/net-dns/libidn/libidn-1.33.ebuild +++ b/net-dns/libidn/libidn-1.33.ebuild @@ -64,9 +64,9 @@ multilib_src_configure() { --disable-silent-rules \ --disable-valgrind-tests \ --with-lispdir="${EPREFIX}${SITELISP}/${PN}" \ - --with-packager-bug-reports="https://bugs.gentoo.org" \ + --with-packager-bug-reports="${DISTRO_BUG_URL}" \ --with-packager-version="r${PR}" \ - --with-packager="Gentoo" + --with-packager="${DISTRO}" } multilib_src_compile() { diff --git a/net-im/kadu/kadu-0.12.3.ebuild b/net-im/kadu/kadu-0.12.3.ebuild index dda9889938f03..855d7728ce293 100644 --- a/net-im/kadu/kadu-0.12.3.ebuild +++ b/net-im/kadu/kadu-0.12.3.ebuild @@ -84,7 +84,7 @@ src_configure() { # Configure package local mycmakeargs=( - -DBUILD_DESCRIPTION='Gentoo Linux' + -DBUILD_DESCRIPTION="${DISTRO} Linux" -DCOMPILE_PLUGINS="${PLUGINS}" -DNETWORK_IMPLEMENTATION="Qt" -DSIG_HANDLING_ENABLED=TRUE diff --git a/net-im/kadu/kadu-2.1-r1.ebuild b/net-im/kadu/kadu-2.1-r1.ebuild index 98fa5943e879d..b16b931f843bf 100644 --- a/net-im/kadu/kadu-2.1-r1.ebuild +++ b/net-im/kadu/kadu-2.1-r1.ebuild @@ -134,7 +134,7 @@ src_configure() { # Configure package local mycmakeargs=( - -DBUILD_DESCRIPTION='Gentoo Linux' + -DBUILD_DESCRIPTION="${DISTRO} Linux" -DCOMPILE_PLUGINS="${PLUGINS}" -DNETWORK_IMPLEMENTATION="Qt" -DINSTALL_SDK=$(usex sdk) diff --git a/net-im/kadu/kadu-3.0.ebuild b/net-im/kadu/kadu-3.0.ebuild index d1fcd8d65334a..9bdf1cabd5e71 100644 --- a/net-im/kadu/kadu-3.0.ebuild +++ b/net-im/kadu/kadu-3.0.ebuild @@ -128,7 +128,7 @@ src_configure() { # Configure package local mycmakeargs=( - -DBUILD_DESCRIPTION='Gentoo Linux' + -DBUILD_DESCRIPTION="${DISTRO} Linux" -DCOMPILE_PLUGINS="${PLUGINS}" -DNETWORK_IMPLEMENTATION="Qt" -DINSTALL_SDK=$(usex sdk) diff --git a/net-irc/smuxi/smuxi-0.11.1.ebuild b/net-irc/smuxi/smuxi-0.11.1.ebuild index 9d3954fadf8ad..8794ca0f33ac8 100644 --- a/net-irc/smuxi/smuxi-0.11.1.ebuild +++ b/net-irc/smuxi/smuxi-0.11.1.ebuild @@ -43,7 +43,7 @@ src_configure() { econf \ --enable-engine-irc \ --without-indicate \ - --with-vendor-package-version="Gentoo ${PV}" \ + --with-vendor-package-version="${DISTRO} ${PV}" \ --with-db4o=included \ --with-messaging-menu=no \ --with-indicate=no \ diff --git a/net-irc/smuxi/smuxi-0.8.10.1.ebuild b/net-irc/smuxi/smuxi-0.8.10.1.ebuild index 886d9b0f9f05c..48e0a1d9dd4e0 100644 --- a/net-irc/smuxi/smuxi-0.8.10.1.ebuild +++ b/net-irc/smuxi/smuxi-0.8.10.1.ebuild @@ -38,7 +38,7 @@ src_configure() { # Our dev-dotnet/db4o is completely unmaintained econf --enable-engine-irc \ --without-indicate \ - --with-vendor-package-version="Gentoo ${PV}" \ + --with-vendor-package-version="${DISTRO} ${PV}" \ --with-db4o=included \ $(use_enable debug) \ $(use_enable gnome frontend-gnome) \ diff --git a/net-irc/smuxi/smuxi-0.8.11.ebuild b/net-irc/smuxi/smuxi-0.8.11.ebuild index def82e67851cf..26401e097c557 100644 --- a/net-irc/smuxi/smuxi-0.8.11.ebuild +++ b/net-irc/smuxi/smuxi-0.8.11.ebuild @@ -43,7 +43,7 @@ src_configure() { econf \ --enable-engine-irc \ --without-indicate \ - --with-vendor-package-version="Gentoo ${PV}" \ + --with-vendor-package-version="${DISTRO} ${PV}" \ --with-db4o=included \ --with-messaging-menu=no \ --with-indicate=no \ diff --git a/net-misc/dhcp/dhcp-4.3.3_p1.ebuild b/net-misc/dhcp/dhcp-4.3.3_p1.ebuild index 60860e60f6d4d..c6c81cb4fa69d 100644 --- a/net-misc/dhcp/dhcp-4.3.3_p1.ebuild +++ b/net-misc/dhcp/dhcp-4.3.3_p1.ebuild @@ -69,7 +69,7 @@ src_prepare() { # Brand the version with Gentoo sed -i \ - -e "/VERSION=/s:'$: Gentoo-${PR}':" \ + -e "/VERSION=/s:'$: ${DISTRO}-${PR}':" \ configure || die # Change the hook script locations of the scripts diff --git a/net-misc/dhcp/dhcp-4.3.4.ebuild b/net-misc/dhcp/dhcp-4.3.4.ebuild index c95c5c1a059b8..4a23969e14353 100644 --- a/net-misc/dhcp/dhcp-4.3.4.ebuild +++ b/net-misc/dhcp/dhcp-4.3.4.ebuild @@ -76,7 +76,7 @@ src_prepare() { # Brand the version with Gentoo sed -i \ - -e "/VERSION=/s:'$: Gentoo-${PR}':" \ + -e "/VERSION=/s:'$: ${DISTRO}-${PR}':" \ configure || die # Change the hook script locations of the scripts diff --git a/net-misc/dhcp/dhcp-4.3.5.ebuild b/net-misc/dhcp/dhcp-4.3.5.ebuild index f58ee47f963fe..10824808ef111 100644 --- a/net-misc/dhcp/dhcp-4.3.5.ebuild +++ b/net-misc/dhcp/dhcp-4.3.5.ebuild @@ -76,7 +76,7 @@ src_prepare() { # Brand the version with Gentoo sed -i \ - -e "/VERSION=/s:'$: Gentoo-${PR}':" \ + -e "/VERSION=/s:'$: ${DISTRO}-${PR}':" \ configure || die # Change the hook script locations of the scripts diff --git a/net-misc/kea/kea-1.1.0.ebuild b/net-misc/kea/kea-1.1.0.ebuild index 374b0aa13f14f..3968c22f9b166 100644 --- a/net-misc/kea/kea-1.1.0.ebuild +++ b/net-misc/kea/kea-1.1.0.ebuild @@ -34,7 +34,7 @@ S="${WORKDIR}/${MY_P}" src_prepare() { # Brand the version with Gentoo sed -i \ - -e "/VERSION=/s:'$: Gentoo-${PR}':" \ + -e "/VERSION=/s:'$: ${DISTRO}-${PR}':" \ configure || die } diff --git a/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.2.ebuild b/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.2.ebuild index c3a27d78abec3..e5a45bc9969a5 100644 --- a/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.2.ebuild +++ b/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.2.ebuild @@ -46,7 +46,7 @@ src_prepare() { src_configure() { gnome2_src_configure \ --disable-static \ - --with-dist-version=Gentoo \ + --with-dist-version="${DISTRO}" \ --localstatedir=/var \ $(use_with gtk gnome) } diff --git a/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.6.ebuild b/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.6.ebuild index 46804201191f3..e4b55079042f5 100644 --- a/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.6.ebuild +++ b/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.6.ebuild @@ -38,6 +38,6 @@ src_configure() { gnome2_src_configure \ --disable-more-warnings \ --disable-static \ - --with-dist-version=Gentoo \ + --with-dist-version="${DISTRO}" \ $(use_with gtk gnome) } diff --git a/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.8.ebuild b/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.8.ebuild index 46804201191f3..e4b55079042f5 100644 --- a/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.8.ebuild +++ b/net-misc/networkmanager-openswan/networkmanager-openswan-1.0.8.ebuild @@ -38,6 +38,6 @@ src_configure() { gnome2_src_configure \ --disable-more-warnings \ --disable-static \ - --with-dist-version=Gentoo \ + --with-dist-version="${DISTRO}" \ $(use_with gtk gnome) } diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.0.8.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.0.8.ebuild index 77619159ca673..9736afb085f20 100644 --- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.0.8.ebuild +++ b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.0.8.ebuild @@ -53,7 +53,7 @@ src_configure() { --localstatedir=/var \ --disable-more-warnings \ --disable-static \ - --with-dist-version=Gentoo \ + --with-dist-version="${DISTRO}" \ $(use_with gtk gnome) \ $(use_with test tests) } diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.2.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.2.ebuild index 1d45d46346d11..185c3a99633c6 100644 --- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.2.ebuild +++ b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.2.ebuild @@ -52,7 +52,7 @@ src_configure() { --localstatedir=/var \ --disable-more-warnings \ --disable-static \ - --with-dist-version=Gentoo \ + --with-dist-version="${DISTRO}" \ $(use_with gtk gnome) \ $(use_with test tests) } diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.4.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.4.ebuild index cc05a49638b80..c7aadaf1b127f 100644 --- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.4.ebuild +++ b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.4.ebuild @@ -55,6 +55,6 @@ src_configure() { --localstatedir=/var \ --disable-more-warnings \ --disable-static \ - --with-dist-version=Gentoo \ + --with-dist-version="${DISTRO}" \ $(use_with gtk gnome) } diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.6.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.6.ebuild index f28e33dce1603..d066fac861832 100644 --- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.6.ebuild +++ b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.6.ebuild @@ -51,6 +51,6 @@ src_configure() { --localstatedir=/var \ --disable-more-warnings \ --disable-static \ - --with-dist-version=Gentoo \ + --with-dist-version="${DISTRO}" \ $(use_with gtk gnome) } diff --git a/net-misc/networkmanager-pptp/networkmanager-pptp-1.0.8.ebuild b/net-misc/networkmanager-pptp/networkmanager-pptp-1.0.8.ebuild index de60e57acafa4..d578aaa96ba03 100644 --- a/net-misc/networkmanager-pptp/networkmanager-pptp-1.0.8.ebuild +++ b/net-misc/networkmanager-pptp/networkmanager-pptp-1.0.8.ebuild @@ -45,7 +45,7 @@ src_configure() { gnome2_src_configure \ --disable-more-warnings \ --disable-static \ - --with-dist-version=Gentoo \ + --with-dist-version="${DISTRO}" \ $(use_with gtk gnome) \ ${myconf} } diff --git a/net-misc/networkmanager-pptp/networkmanager-pptp-1.2.2.ebuild b/net-misc/networkmanager-pptp/networkmanager-pptp-1.2.2.ebuild index 32078bc81de4a..c4e546d48dc4b 100644 --- a/net-misc/networkmanager-pptp/networkmanager-pptp-1.2.2.ebuild +++ b/net-misc/networkmanager-pptp/networkmanager-pptp-1.2.2.ebuild @@ -44,7 +44,7 @@ src_configure() { gnome2_src_configure \ --disable-more-warnings \ --disable-static \ - --with-dist-version=Gentoo \ + --with-dist-version="${DISTRO}" \ $(use_with gtk gnome) \ ${myconf} } diff --git a/net-misc/networkmanager-pptp/networkmanager-pptp-1.2.4.ebuild b/net-misc/networkmanager-pptp/networkmanager-pptp-1.2.4.ebuild index 305d2a57643b6..0f92d93d60287 100644 --- a/net-misc/networkmanager-pptp/networkmanager-pptp-1.2.4.ebuild +++ b/net-misc/networkmanager-pptp/networkmanager-pptp-1.2.4.ebuild @@ -44,7 +44,7 @@ src_configure() { gnome2_src_configure \ --disable-more-warnings \ --disable-static \ - --with-dist-version=Gentoo \ + --with-dist-version="${DISTRO}" \ $(use_with gtk gnome) \ ${myconf} } diff --git a/net-misc/networkmanager-sstp/networkmanager-sstp-1.2.0.ebuild b/net-misc/networkmanager-sstp/networkmanager-sstp-1.2.0.ebuild index 4298fbd8a7b34..17c803254fa5b 100644 --- a/net-misc/networkmanager-sstp/networkmanager-sstp-1.2.0.ebuild +++ b/net-misc/networkmanager-sstp/networkmanager-sstp-1.2.0.ebuild @@ -42,7 +42,7 @@ src_configure() { econf \ --disable-more-warnings \ --disable-static \ - --with-dist-version=Gentoo \ + --with-dist-version="${DISTRO}" \ --with-pppd-plugin-dir="${EPREFIX}/usr/$(get_libdir)/pppd/${PPPD_VERSION}" \ $(use_with gtk gnome) } diff --git a/net-misc/networkmanager-vpnc/networkmanager-vpnc-1.0.8.ebuild b/net-misc/networkmanager-vpnc/networkmanager-vpnc-1.0.8.ebuild index b978ac365e61c..4afaceb931f16 100644 --- a/net-misc/networkmanager-vpnc/networkmanager-vpnc-1.0.8.ebuild +++ b/net-misc/networkmanager-vpnc/networkmanager-vpnc-1.0.8.ebuild @@ -46,7 +46,7 @@ src_configure() { gnome2_src_configure \ --disable-more-warnings \ --disable-static \ - --with-dist-version=Gentoo \ + --with-dist-version="${DISTRO}" \ $(use_with gtk gnome) \ $(use_with test tests) } diff --git a/net-misc/networkmanager-vpnc/networkmanager-vpnc-1.2.2.ebuild b/net-misc/networkmanager-vpnc/networkmanager-vpnc-1.2.2.ebuild index c35bf300c5841..f2bdd28b4c433 100644 --- a/net-misc/networkmanager-vpnc/networkmanager-vpnc-1.2.2.ebuild +++ b/net-misc/networkmanager-vpnc/networkmanager-vpnc-1.2.2.ebuild @@ -45,7 +45,7 @@ src_configure() { gnome2_src_configure \ --disable-more-warnings \ --disable-static \ - --with-dist-version=Gentoo \ + --with-dist-version="${DISTRO}" \ $(use_with gtk gnome) \ $(use_with test tests) } diff --git a/net-misc/networkmanager-vpnc/networkmanager-vpnc-1.2.4.ebuild b/net-misc/networkmanager-vpnc/networkmanager-vpnc-1.2.4.ebuild index 67bdfcc60cf41..821ad57a7e945 100644 --- a/net-misc/networkmanager-vpnc/networkmanager-vpnc-1.2.4.ebuild +++ b/net-misc/networkmanager-vpnc/networkmanager-vpnc-1.2.4.ebuild @@ -45,6 +45,6 @@ src_configure() { gnome2_src_configure \ --disable-more-warnings \ --disable-static \ - --with-dist-version=Gentoo \ + --with-dist-version="${DISTRO}" \ $(use_with gtk gnome) } diff --git a/net-misc/x11rdp/x11rdp-0.8.0.1.9.5.ebuild b/net-misc/x11rdp/x11rdp-0.8.0.1.9.5.ebuild index 236a60db7dc1e..219a32309e573 100644 --- a/net-misc/x11rdp/x11rdp-0.8.0.1.9.5.ebuild +++ b/net-misc/x11rdp/x11rdp-0.8.0.1.9.5.ebuild @@ -163,7 +163,7 @@ src_configure() { --disable-config-hal --without-dtrace --without-fop - --with-os-vendor=Gentoo + --with-os-vendor="${DISTRO}" --with-sha1=libcrypto ) diff --git a/net-nntp/xrn/xrn-9.02.ebuild b/net-nntp/xrn/xrn-9.02.ebuild index 4dd68e2039482..ff09f57b81acc 100644 --- a/net-nntp/xrn/xrn-9.02.ebuild +++ b/net-nntp/xrn/xrn-9.02.ebuild @@ -47,7 +47,7 @@ src_compile() { # Bugs to Gentoo bugzilla: sed -i \ - -e "s,bug-xrn@kamens.brookline.ma.us,https://bugs.gentoo.org/," \ + -e "s,bug-xrn@kamens.brookline.ma.us,${DISTRO_BUG_URL}," \ -e "s,\(#ifndef CONFIG_H_IS_OK\),#define CONFIG_H_IS_OK\n\1," \ config.h diff --git a/net-print/hplip/hplip-3.16.11-r1.ebuild b/net-print/hplip/hplip-3.16.11-r1.ebuild index fbf935c215148..e0d4b4e14c45c 100644 --- a/net-print/hplip/hplip-3.16.11-r1.ebuild +++ b/net-print/hplip/hplip-3.16.11-r1.ebuild @@ -135,7 +135,7 @@ src_prepare() { # Force recognition of Gentoo distro by hp-check sed -i \ - -e "s:file('/etc/issue', 'r').read():'Gentoo':" \ + -e "s:file('/etc/issue', 'r').read():'${DISTRO}':" \ installer/core_install.py || die # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip diff --git a/net-print/hplip/hplip-3.16.11.ebuild b/net-print/hplip/hplip-3.16.11.ebuild index 886dd15e827b6..adc1d21230d23 100644 --- a/net-print/hplip/hplip-3.16.11.ebuild +++ b/net-print/hplip/hplip-3.16.11.ebuild @@ -133,7 +133,7 @@ src_prepare() { # Force recognition of Gentoo distro by hp-check sed -i \ - -e "s:file('/etc/issue', 'r').read():'Gentoo':" \ + -e "s:file('/etc/issue', 'r').read():'${DISTRO}':" \ installer/core_install.py || die # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip diff --git a/net-print/hplip/hplip-3.16.3.ebuild b/net-print/hplip/hplip-3.16.3.ebuild index e39bbe8c3ff75..88a5e1d77da41 100644 --- a/net-print/hplip/hplip-3.16.3.ebuild +++ b/net-print/hplip/hplip-3.16.3.ebuild @@ -125,7 +125,7 @@ src_prepare() { # Force recognition of Gentoo distro by hp-check sed -i \ - -e "s:file('/etc/issue', 'r').read():'Gentoo':" \ + -e "s:file('/etc/issue', 'r').read():'${DISTRO}':" \ installer/core_install.py || die # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults index 005d81e302e30..082044fbd71ae 100644 --- a/profiles/base/make.defaults +++ b/profiles/base/make.defaults @@ -143,3 +143,8 @@ UNINSTALL_IGNORE="/lib/modules/* /var/run /var/lock" # Andreas K. Hüttel (23 Aug 2013) # Make emerge messages default to English as per Council decision LC_MESSAGES="C" + +# A. Wilcox (13 Dec 2016) +# Default distribution name for ebuilds that have --with-packager etc. (GLEP 70) +DISTRO="Gentoo" +DISTRO_BUG_URL="https://bugs.gentoo.org/" diff --git a/sci-astronomy/esomidas/esomidas-15.09.ebuild b/sci-astronomy/esomidas/esomidas-15.09.ebuild index 17aeea82fd4d4..99ea40b43c111 100644 --- a/sci-astronomy/esomidas/esomidas-15.09.ebuild +++ b/sci-astronomy/esomidas/esomidas-15.09.ebuild @@ -84,7 +84,7 @@ src_prepare() { sed -e "s|gcc|$(tc-getCC) \${LDFLAGS}|" \ ${MID_INSTALL}/systems/Linux/make_shared \ > ${MID_INSTALL}/systems/Gentoo/make_shared || die - sed -e 's|PC/Linux|Gentoo|' \ + sed -e "s|PC/Linux|${DISTRO}|" \ ${MID_INSTALL}/systems/Linux/setup \ > ${MID_INSTALL}/systems/Gentoo/setup || die diff --git a/sci-chemistry/coot/coot-0.8.2-r1.ebuild b/sci-chemistry/coot/coot-0.8.2-r1.ebuild index 420edbbf65cda..fd093a59cd9e9 100644 --- a/sci-chemistry/coot/coot-0.8.2-r1.ebuild +++ b/sci-chemistry/coot/coot-0.8.2-r1.ebuild @@ -112,7 +112,7 @@ src_prepare() { -i src/coot.in || die sed \ - -e "s:AM_COOT_SYS_BUILD_TYPE:COOT_SYS_BUILD_TYPE=Gentoo-Linux-${EPYTHON}-gtk2 ; AC_MSG_RESULT([\$COOT_SYS_BUILD_TYPE]); AC_SUBST(COOT_SYS_BUILD_TYPE):g" \ + -e "s:AM_COOT_SYS_BUILD_TYPE:COOT_SYS_BUILD_TYPE=${DISTRO}-Linux-${EPYTHON}-gtk2 ; AC_MSG_RESULT([\$COOT_SYS_BUILD_TYPE]); AC_SUBST(COOT_SYS_BUILD_TYPE):g" \ -i configure.ac || die autotools-utils_src_prepare diff --git a/sci-geosciences/bt747/bt747-2.1.7-r1.ebuild b/sci-geosciences/bt747/bt747-2.1.7-r1.ebuild index e3f74e56b3fc6..dbca173f29eb3 100644 --- a/sci-geosciences/bt747/bt747-2.1.7-r1.ebuild +++ b/sci-geosciences/bt747/bt747-2.1.7-r1.ebuild @@ -39,7 +39,7 @@ DEPEND=" " EANT_BUILD_TARGET="dist.j2se" -EANT_EXTRA_ARGS="-Dskip.proguard=yes -Dsvn=true -Dsvnversion=true -Dbuild.current.revision=Gentoo" +EANT_EXTRA_ARGS="-Dskip.proguard=yes -Dsvn=true -Dsvnversion=true -Dbuild.current.revision=${DISTRO}" EANT_GENTOO_CLASSPATH="commons-imaging,jcalendar-1.2,jchart2d,jopt-simple-4.4,rxtx-2,swing-layout-1,swingx-1.6,swingx-ws-bt747" JAVA_ANT_REWRITE_CLASSPATH="yes" diff --git a/sci-mathematics/Macaulay2/Macaulay2-1.7_pre.ebuild b/sci-mathematics/Macaulay2/Macaulay2-1.7_pre.ebuild index 172f102aa73b4..231ad226205f9 100644 --- a/sci-mathematics/Macaulay2/Macaulay2-1.7_pre.ebuild +++ b/sci-mathematics/Macaulay2/Macaulay2-1.7_pre.ebuild @@ -102,7 +102,7 @@ src_configure (){ --prefix="${D}/usr" \ --disable-encap \ --disable-strip \ - --with-issue=Gentoo \ + --with-issue="${DISTRO}" \ $(use_enable optimization optimize) \ $(use_enable debug) \ --enable-build-libraries="factory" \ diff --git a/sci-mathematics/Macaulay2/Macaulay2-1.8.2.1-r1.ebuild b/sci-mathematics/Macaulay2/Macaulay2-1.8.2.1-r1.ebuild index 0bf2c295350f1..c926dc69e0261 100644 --- a/sci-mathematics/Macaulay2/Macaulay2-1.8.2.1-r1.ebuild +++ b/sci-mathematics/Macaulay2/Macaulay2-1.8.2.1-r1.ebuild @@ -85,7 +85,7 @@ src_configure (){ --libdir='${exec_prefix}'/$(get_libdir)/ \ --disable-encap \ --disable-strip \ - --with-issue=Gentoo \ + --with-issue="${DISTRO}" \ $(use_enable optimization optimize) \ $(use_enable debug) \ --enable-build-libraries="factory" \ diff --git a/sci-visualization/gnuplot/gnuplot-4.6.5.ebuild b/sci-visualization/gnuplot/gnuplot-4.6.5.ebuild index d95a56467b241..999c93f190d65 100644 --- a/sci-visualization/gnuplot/gnuplot-4.6.5.ebuild +++ b/sci-visualization/gnuplot/gnuplot-4.6.5.ebuild @@ -81,7 +81,7 @@ src_prepare() { # Add special version identification as required by provision 2 # of the gnuplot license - sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die + sed -i -e "1s/.*/& (${DISTRO} revision ${PR})/" PATCHLEVEL || die # hacky workaround # Please hack the buildsystem if you like @@ -146,7 +146,7 @@ src_configure() { $(use_enable qt4 qt) \ $(use_enable thin-splines) \ $(use_enable wxwidgets) \ - DIST_CONTACT="https://bugs.gentoo.org/" \ + DIST_CONTACT="${DISTRO_BUG_URL}" \ EMACS=no } diff --git a/sci-visualization/gnuplot/gnuplot-5.0.1-r1.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.1-r1.ebuild index 8c771b8bc20c8..78ebe483a6518 100644 --- a/sci-visualization/gnuplot/gnuplot-5.0.1-r1.ebuild +++ b/sci-visualization/gnuplot/gnuplot-5.0.1-r1.ebuild @@ -82,7 +82,7 @@ src_prepare() { # Add special version identification as required by provision 2 # of the gnuplot license - sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die + sed -i -e "1s/.*/& (${DISTRO} revision ${PR})/" PATCHLEVEL || die # hacky workaround # Please hack the buildsystem if you like @@ -147,7 +147,7 @@ src_configure() { --enable-stats \ $(use_with qt4 qt qt4) \ $(use_enable wxwidgets) \ - DIST_CONTACT="https://bugs.gentoo.org/" \ + DIST_CONTACT="${DISTRO_BUG_URL}" \ EMACS=no } diff --git a/sci-visualization/gnuplot/gnuplot-5.0.4.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.4.ebuild index e5c3c8243ae19..76b0fcea55080 100644 --- a/sci-visualization/gnuplot/gnuplot-5.0.4.ebuild +++ b/sci-visualization/gnuplot/gnuplot-5.0.4.ebuild @@ -82,7 +82,7 @@ src_prepare() { # Add special version identification as required by provision 2 # of the gnuplot license - sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die + sed -i -e "1s/.*/& (${DISTRO} revision ${PR})/" PATCHLEVEL || die # hacky workaround # Please hack the buildsystem if you like @@ -147,7 +147,7 @@ src_configure() { --enable-stats \ $(use_with qt4 qt qt4) \ $(use_enable wxwidgets) \ - DIST_CONTACT="https://bugs.gentoo.org/" \ + DIST_CONTACT="${DISTRO_BUG_URL}" \ EMACS=no } diff --git a/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild index 0fa06f2b6d5a0..b1cdda0ec1369 100644 --- a/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild +++ b/sci-visualization/gnuplot/gnuplot-5.0.9999.ebuild @@ -80,7 +80,7 @@ src_prepare() { # Add special version identification as required by provision 2 # of the gnuplot license - sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die + sed -i -e "1s/.*/& (${DISTRO} revision ${PR})/" PATCHLEVEL || die # hacky workaround # Please hack the buildsystem if you like @@ -145,7 +145,7 @@ src_configure() { --enable-stats \ $(use_with qt4 qt qt4) \ $(use_enable wxwidgets) \ - DIST_CONTACT="https://bugs.gentoo.org/" \ + DIST_CONTACT="${DISTRO_BUG_URL}" \ EMACS=no } diff --git a/sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild b/sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild index bb9c3a160fc59..a85f2c369d2a1 100644 --- a/sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild +++ b/sci-visualization/gnuplot/gnuplot-5.1.9999.ebuild @@ -79,7 +79,7 @@ src_prepare() { # Add special version identification as required by provision 2 # of the gnuplot license - sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die + sed -i -e "1s/.*/& (${DISTRO} revision ${PR})/" PATCHLEVEL || die # hacky workaround # Please hack the buildsystem if you like @@ -143,7 +143,7 @@ src_configure() { --enable-stats \ $(use_with qt4 qt qt4) \ $(use_enable wxwidgets) \ - DIST_CONTACT="https://bugs.gentoo.org/" \ + DIST_CONTACT="${DISTRO_BUG_URL}" \ EMACS=no } diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-1.12.14-r1.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-1.12.14-r1.ebuild index c5a88f70cec8a..abc04343a2259 100644 --- a/sys-apps/baselayout-prefix/baselayout-prefix-1.12.14-r1.ebuild +++ b/sys-apps/baselayout-prefix/baselayout-prefix-1.12.14-r1.ebuild @@ -102,7 +102,7 @@ src_install() { dosym /var/tmp /usr/tmp # rc-scripts version for testing of features that *should* be present - echo "Gentoo Prefix Base System version ${PV}" > ${ED}/etc/gentoo-release + echo "${DISTRO} Prefix Base System version ${PV}" > ${ED}/etc/gentoo-release # get the basic stuff in there doenvd "${S}"/etc/env.d/* || die "doenvd" @@ -136,7 +136,7 @@ pkg_postinst() { # write it here so that the new version is immediately in the file # (without waiting for the user to do etc-update) rm -f "${EROOT}"/etc/._cfg????_gentoo-release - echo "Gentoo Prefix Base System version ${PV}" > "${EROOT}"/etc/gentoo-release + echo "${DISTRO} Prefix Base System version ${PV}" > "${EROOT}"/etc/gentoo-release echo einfo "Please be sure to update all pending '._cfg*' files in /etc," diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-1.12.14.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-1.12.14.ebuild index c61f68999b0a4..320bd951cf9a4 100644 --- a/sys-apps/baselayout-prefix/baselayout-prefix-1.12.14.ebuild +++ b/sys-apps/baselayout-prefix/baselayout-prefix-1.12.14.ebuild @@ -117,7 +117,7 @@ src_install() { dosym /var/tmp /usr/tmp # rc-scripts version for testing of features that *should* be present - echo "Gentoo Prefix Base System version ${PV}" > ${ED}/etc/gentoo-release + echo "${DISTRO} Prefix Base System version ${PV}" > ${ED}/etc/gentoo-release # get the basic stuff in there doenvd "${S}"/etc/env.d/* || die "doenvd" @@ -170,7 +170,7 @@ pkg_postinst() { # write it here so that the new version is immediately in the file # (without waiting for the user to do etc-update) rm -f "${EROOT}"/etc/._cfg????_gentoo-release - echo "Gentoo Prefix Base System version ${PV}" > "${EROOT}"/etc/gentoo-release + echo "${DISTRO} Prefix Base System version ${PV}" > "${EROOT}"/etc/gentoo-release echo einfo "Please be sure to update all pending '._cfg*' files in /etc," diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-1.12.5-r11.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-1.12.5-r11.ebuild index 9f6a2f44fd0b2..009fb0fe6d824 100644 --- a/sys-apps/baselayout-prefix/baselayout-prefix-1.12.5-r11.ebuild +++ b/sys-apps/baselayout-prefix/baselayout-prefix-1.12.5-r11.ebuild @@ -114,7 +114,7 @@ src_install() { dosym /var/tmp /usr/tmp # rc-scripts version for testing of features that *should* be present - echo "Gentoo Prefix Base System version ${PV}" > ${ED}/etc/gentoo-release + echo "${DISTRO} Prefix Base System version ${PV}" > ${ED}/etc/gentoo-release # get the basic stuff in there doenvd "${S}"/etc/env.d/* || die "doenvd" @@ -168,7 +168,7 @@ pkg_postinst() { # write it here so that the new version is immediately in the file # (without waiting for the user to do etc-update) rm -f "${EROOT}"/etc/._cfg????_gentoo-release - echo "Gentoo Prefix Base System version ${PV}" > "${EROOT}"/etc/gentoo-release + echo "${DISTRO} Prefix Base System version ${PV}" > "${EROOT}"/etc/gentoo-release echo einfo "Please be sure to update all pending '._cfg*' files in /etc," diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r3.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r3.ebuild index a905ee37622d5..845b6f47d017e 100644 --- a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r3.ebuild +++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r3.ebuild @@ -68,7 +68,7 @@ src_install() { fi # rc-scripts version for testing of features that *should* be present - echo "Gentoo Prefix Base System release ${PV}" > "${ED}"/etc/gentoo-release + echo "${DISTRO} Prefix Base System release ${PV}" > "${ED}"/etc/gentoo-release # FHS compatibility symlinks stuff dosym /var/tmp /usr/tmp @@ -78,7 +78,7 @@ src_install() { cat > "${ED}"/sbin/runscript <<- EOF #!/bin/sh - echo "runscript not supported by Gentoo Prefix Base System release ${PV}" 1>&2 + echo "runscript not supported by ${DISTRO} Prefix Base System release ${PV}" 1>&2 exit 1 EOF chmod 755 "${ED}"/sbin/runscript || die diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r4.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r4.ebuild index f3c52d699543b..975d343ab6423 100644 --- a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r4.ebuild +++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r4.ebuild @@ -55,7 +55,7 @@ src_install() { fi # rc-scripts version for testing of features that *should* be present - echo "Gentoo Prefix Base System release ${PV}" > "${ED}"/etc/gentoo-release + echo "${DISTRO} Prefix Base System release ${PV}" > "${ED}"/etc/gentoo-release # FHS compatibility symlinks stuff dosym /var/tmp /usr/tmp @@ -66,7 +66,7 @@ src_install() { #!/usr/bin/env sh source "${EPREFIX}/lib/gentoo/functions.sh" - eerror "runscript not supported by Gentoo Prefix Base System release ${PV}" 1>&2 + eerror "runscript not supported by ${DISTRO} Prefix Base System release ${PV}" 1>&2 exit 1 EOF chmod 755 "${ED}"/sbin/runscript || die diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild index e4ea35730a01b..8a2190e694a97 100644 --- a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild +++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild @@ -55,7 +55,7 @@ src_install() { fi # rc-scripts version for testing of features that *should* be present - echo "Gentoo Prefix Base System release ${PV}" > "${ED}"/etc/gentoo-release + echo "${DISTRO} Prefix Base System release ${PV}" > "${ED}"/etc/gentoo-release # FHS compatibility symlinks stuff dosym /var/tmp /usr/tmp @@ -66,7 +66,7 @@ src_install() { #!/usr/bin/env sh source "${EPREFIX}/lib/gentoo/functions.sh" - eerror "runscript/openrc-run not supported by Gentoo Prefix Base System release ${PV}" 1>&2 + eerror "runscript/openrc-run not supported by ${DISTRO} Prefix Base System release ${PV}" 1>&2 exit 1 EOF chmod 755 "${ED}"/sbin/runscript || die diff --git a/sys-apps/baselayout/baselayout-2.2-r1.ebuild b/sys-apps/baselayout/baselayout-2.2-r1.ebuild index 11326dc3305c1..f8a2ef62a1b10 100644 --- a/sys-apps/baselayout/baselayout-2.2-r1.ebuild +++ b/sys-apps/baselayout/baselayout-2.2-r1.ebuild @@ -181,7 +181,7 @@ src_prepare() { echo "LDPATH='${ldpaths#:}'" >> etc/env.d/00basic # rc-scripts version for testing of features that *should* be present - echo "Gentoo Base System release ${PV}" > etc/gentoo-release + echo "${DISTRO} Base System release ${PV}" > etc/gentoo-release } src_install() { diff --git a/sys-apps/baselayout/baselayout-2.2.ebuild b/sys-apps/baselayout/baselayout-2.2.ebuild index 44077db0849b6..dec6b2244153e 100644 --- a/sys-apps/baselayout/baselayout-2.2.ebuild +++ b/sys-apps/baselayout/baselayout-2.2.ebuild @@ -171,7 +171,7 @@ src_install() { echo "LDPATH='${ldpaths#:}'" >> "${D}"/etc/env.d/00basic # rc-scripts version for testing of features that *should* be present - echo "Gentoo Base System release ${PV}" > "${D}"/etc/gentoo-release + echo "${DISTRO} Base System release ${PV}" > "${D}"/etc/gentoo-release } pkg_postinst() { diff --git a/sys-apps/baselayout/baselayout-2.3.ebuild b/sys-apps/baselayout/baselayout-2.3.ebuild index 9deac6327d0a9..fa43c2c706432 100644 --- a/sys-apps/baselayout/baselayout-2.3.ebuild +++ b/sys-apps/baselayout/baselayout-2.3.ebuild @@ -167,7 +167,7 @@ src_prepare() { echo "LDPATH='${ldpaths#:}'" >> etc/env.d/00basic # rc-scripts version for testing of features that *should* be present - echo "Gentoo Base System release ${PV}" > etc/gentoo-release + echo "${DISTRO} Base System release ${PV}" > etc/gentoo-release } src_install() { diff --git a/sys-apps/coreutils/coreutils-8.23.ebuild b/sys-apps/coreutils/coreutils-8.23.ebuild index f0df003fb7601..0498e92449ee0 100644 --- a/sys-apps/coreutils/coreutils-8.23.ebuild +++ b/sys-apps/coreutils/coreutils-8.23.ebuild @@ -84,9 +84,9 @@ src_configure() { # groups/su - shadow # hostname - net-tools econf \ - --with-packager="Gentoo" \ + --with-packager="${DISTRO}" \ --with-packager-version="${PVR} (p${PATCH_VER:-0})" \ - --with-packager-bug-reports="https://bugs.gentoo.org/" \ + --with-packager-bug-reports="${DISTRO_BUG_URL}" \ --enable-install-program="arch" \ --enable-no-install-program="groups,hostname,kill,su,uptime" \ --enable-largefile \ diff --git a/sys-apps/coreutils/coreutils-8.25.ebuild b/sys-apps/coreutils/coreutils-8.25.ebuild index e7f64e9651b75..bdd31c55e47d1 100644 --- a/sys-apps/coreutils/coreutils-8.25.ebuild +++ b/sys-apps/coreutils/coreutils-8.25.ebuild @@ -89,9 +89,9 @@ src_configure() { # groups/su - shadow # hostname - net-tools econf \ - --with-packager="Gentoo" \ + --with-packager="${DISTRO}" \ --with-packager-version="${PVR} (p${PATCH_VER:-0})" \ - --with-packager-bug-reports="https://bugs.gentoo.org/" \ + --with-packager-bug-reports="${DISTRO_BUG_URL}" \ --enable-install-program="arch,$(usev hostname),$(usev kill)" \ --enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime" \ --enable-largefile \ diff --git a/sys-apps/coreutils/coreutils-8.26.ebuild b/sys-apps/coreutils/coreutils-8.26.ebuild index b19472ac4cd25..c3cee50a38db1 100644 --- a/sys-apps/coreutils/coreutils-8.26.ebuild +++ b/sys-apps/coreutils/coreutils-8.26.ebuild @@ -89,9 +89,9 @@ src_configure() { # groups/su - shadow # hostname - net-tools econf \ - --with-packager="Gentoo" \ + --with-packager="${DISTRO}" \ --with-packager-version="${PVR} (p${PATCH_VER:-0})" \ - --with-packager-bug-reports="https://bugs.gentoo.org/" \ + --with-packager-bug-reports="${DISTRO_BUG_URL}" \ --enable-install-program="arch,$(usev hostname),$(usev kill)" \ --enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime" \ --enable-largefile \ diff --git a/sys-apps/diffutils/diffutils-3.3.ebuild b/sys-apps/diffutils/diffutils-3.3.ebuild index d2a2763d2d346..7bc058e35d618 100644 --- a/sys-apps/diffutils/diffutils-3.3.ebuild +++ b/sys-apps/diffutils/diffutils-3.3.ebuild @@ -37,9 +37,9 @@ src_configure() { export ac_cv_libsigsegv=no econf \ - --with-packager="Gentoo" \ + --with-packager="${DISTRO}" \ --with-packager-version="${PVR}" \ - --with-packager-bug-reports="https://bugs.gentoo.org/" \ + --with-packager-bug-reports="${DISTRO_BUG_URL}" \ $(use_enable nls) } diff --git a/sys-apps/diffutils/diffutils-3.4-r1.ebuild b/sys-apps/diffutils/diffutils-3.4-r1.ebuild index bdf1bb1a5efae..70c91d2b1ac06 100644 --- a/sys-apps/diffutils/diffutils-3.4-r1.ebuild +++ b/sys-apps/diffutils/diffutils-3.4-r1.ebuild @@ -38,9 +38,9 @@ src_configure() { export ac_cv_libsigsegv=no econf \ - --with-packager="Gentoo" \ + --with-packager="${DISTRO}" \ --with-packager-version="${PVR}" \ - --with-packager-bug-reports="https://bugs.gentoo.org/" \ + --with-packager-bug-reports="${DISTRO_BUG_URL}" \ $(use_enable nls) } diff --git a/sys-apps/diffutils/diffutils-3.5.ebuild b/sys-apps/diffutils/diffutils-3.5.ebuild index 94ca67dd815e3..7a862b5fffaed 100644 --- a/sys-apps/diffutils/diffutils-3.5.ebuild +++ b/sys-apps/diffutils/diffutils-3.5.ebuild @@ -28,9 +28,9 @@ src_configure() { export ac_cv_libsigsegv=no econf \ - --with-packager="Gentoo" \ + --with-packager="${DISTRO}" \ --with-packager-version="${PVR}" \ - --with-packager-bug-reports="https://bugs.gentoo.org/" \ + --with-packager-bug-reports="${DISTRO_BUG_URL}" \ $(use_enable nls) } diff --git a/sys-apps/findutils/findutils-4.5.18.ebuild b/sys-apps/findutils/findutils-4.5.18.ebuild index d5bd591a3d57f..4805a9e929eea 100644 --- a/sys-apps/findutils/findutils-4.5.18.ebuild +++ b/sys-apps/findutils/findutils-4.5.18.ebuild @@ -38,9 +38,9 @@ src_configure() { program_prefix=$(usex userland_GNU '' g) econf \ - --with-packager="Gentoo" \ + --with-packager="${DISTRO}" \ --with-packager-version="${PVR}" \ - --with-packager-bug-reports="https://bugs.gentoo.org/" \ + --with-packager-bug-reports="${DISTRO_BUG_URL}" \ --program-prefix=${program_prefix} \ $(use_enable debug) \ $(use_enable nls) \ diff --git a/sys-apps/findutils/findutils-4.6.0-r1.ebuild b/sys-apps/findutils/findutils-4.6.0-r1.ebuild index 8676cd4685171..b89c997c760dd 100644 --- a/sys-apps/findutils/findutils-4.6.0-r1.ebuild +++ b/sys-apps/findutils/findutils-4.6.0-r1.ebuild @@ -47,9 +47,9 @@ src_configure() { program_prefix=$(usex userland_GNU '' g) econf \ - --with-packager="Gentoo" \ + --with-packager="${DISTRO}" \ --with-packager-version="${PVR}" \ - --with-packager-bug-reports="https://bugs.gentoo.org/" \ + --with-packager-bug-reports="${DISTRO_BUG_URL}" \ --program-prefix=${program_prefix} \ $(use_enable nls) \ $(use_with selinux) \ diff --git a/sys-apps/groff/groff-1.22.2.ebuild b/sys-apps/groff/groff-1.22.2.ebuild index de668f3835381..d02e0f73b1452 100644 --- a/sys-apps/groff/groff-1.22.2.ebuild +++ b/sys-apps/groff/groff-1.22.2.ebuild @@ -48,9 +48,9 @@ src_prepare() { local pfx=$(usex prefix ' Prefix' '') cat <<-EOF >> tmac/mdoc.local - .ds volume-operating-system Gentoo${pfx} - .ds operating-system Gentoo${pfx}/${KERNEL} - .ds default-operating-system Gentoo${pfx}/${KERNEL} + .ds volume-operating-system ${DISTRO}${pfx} + .ds operating-system ${DISTRO}${pfx}/${KERNEL} + .ds default-operating-system ${DISTRO}${pfx}/${KERNEL} EOF if use l10n_ja ; then diff --git a/sys-apps/groff/groff-1.22.3.ebuild b/sys-apps/groff/groff-1.22.3.ebuild index 4007d84cf4589..93f6d77d5c218 100644 --- a/sys-apps/groff/groff-1.22.3.ebuild +++ b/sys-apps/groff/groff-1.22.3.ebuild @@ -46,9 +46,9 @@ src_prepare() { local pfx=$(usex prefix ' Prefix' '') cat <<-EOF >> tmac/mdoc.local - .ds volume-operating-system Gentoo${pfx} - .ds operating-system Gentoo${pfx}/${KERNEL} - .ds default-operating-system Gentoo${pfx}/${KERNEL} + .ds volume-operating-system ${DISTRO}${pfx} + .ds operating-system ${DISTRO}${pfx}/${KERNEL} + .ds default-operating-system ${DISTRO}${pfx}/${KERNEL} EOF # make sure we don't get a crappy `g' nameprefix on UNIX systems with real diff --git a/sys-apps/lsb-release/lsb-release-1.4-r1.ebuild b/sys-apps/lsb-release/lsb-release-1.4-r1.ebuild index 3d708c384ac12..fec18d97a9e6e 100644 --- a/sys-apps/lsb-release/lsb-release-1.4-r1.ebuild +++ b/sys-apps/lsb-release/lsb-release-1.4-r1.ebuild @@ -28,6 +28,6 @@ src_install() { dodir /etc cat > "${D}/etc/lsb-release" <<- EOF - DISTRIB_ID="Gentoo" + DISTRIB_ID="${DISTRO}" EOF } diff --git a/sys-apps/lsb-release/lsb-release-1.4-r2.ebuild b/sys-apps/lsb-release/lsb-release-1.4-r2.ebuild index b3394b9856950..006ca7ff717b1 100644 --- a/sys-apps/lsb-release/lsb-release-1.4-r2.ebuild +++ b/sys-apps/lsb-release/lsb-release-1.4-r2.ebuild @@ -31,6 +31,6 @@ src_install() { dodir /etc cat > "${D}/etc/lsb-release" <<- EOF - DISTRIB_ID="Gentoo" + DISTRIB_ID="${DISTRO}" EOF } diff --git a/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild b/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild index 58bda7ba79b56..cd97291d35251 100644 --- a/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild +++ b/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild @@ -34,6 +34,6 @@ src_install() { dodir /etc cat > "${D}/etc/lsb-release" <<- EOF - DISTRIB_ID="Gentoo" + DISTRIB_ID="${DISTRO}" EOF } diff --git a/sys-apps/lsb-release/lsb-release-1.4.ebuild b/sys-apps/lsb-release/lsb-release-1.4.ebuild index ebe8a330253f2..dc631a4a1caff 100644 --- a/sys-apps/lsb-release/lsb-release-1.4.ebuild +++ b/sys-apps/lsb-release/lsb-release-1.4.ebuild @@ -24,6 +24,6 @@ src_install() { mkdir -p "${D}/etc" cat > "${D}/etc/lsb-release" <<- EOF - DISTRIB_ID="Gentoo" + DISTRIB_ID="${DISTRO}" EOF } diff --git a/sys-apps/openrc/openrc-0.17.ebuild b/sys-apps/openrc/openrc-0.17.ebuild index 28d9548389735..8b432de819952 100644 --- a/sys-apps/openrc/openrc-0.17.ebuild +++ b/sys-apps/openrc/openrc-0.17.ebuild @@ -89,7 +89,7 @@ src_compile() { MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD" brand="FreeBSD" fi - export BRANDING="Gentoo ${brand}" + export BRANDING="${DISTRO} ${brand}" use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}" export DEBUG=$(usev debug) export MKTERMCAP=$(usev ncurses) diff --git a/sys-apps/openrc/openrc-0.18.4.ebuild b/sys-apps/openrc/openrc-0.18.4.ebuild index f13551780fba3..1dce2be6b356a 100644 --- a/sys-apps/openrc/openrc-0.18.4.ebuild +++ b/sys-apps/openrc/openrc-0.18.4.ebuild @@ -89,7 +89,7 @@ src_compile() { MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD" brand="FreeBSD" fi - export BRANDING="Gentoo ${brand}" + export BRANDING="${DISTRO} ${brand}" use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}" export DEBUG=$(usev debug) export MKTERMCAP=$(usev ncurses) diff --git a/sys-apps/openrc/openrc-0.19.1.ebuild b/sys-apps/openrc/openrc-0.19.1.ebuild index 886098d2b4443..30298b8f2988c 100644 --- a/sys-apps/openrc/openrc-0.19.1.ebuild +++ b/sys-apps/openrc/openrc-0.19.1.ebuild @@ -89,7 +89,7 @@ src_compile() { MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD" brand="FreeBSD" fi - export BRANDING="Gentoo ${brand}" + export BRANDING="${DISTRO} ${brand}" use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}" export DEBUG=$(usev debug) export MKTERMCAP=$(usev ncurses) diff --git a/sys-apps/openrc/openrc-0.21.7.ebuild b/sys-apps/openrc/openrc-0.21.7.ebuild index 0eaaf74b35bc1..516dc43502479 100644 --- a/sys-apps/openrc/openrc-0.21.7.ebuild +++ b/sys-apps/openrc/openrc-0.21.7.ebuild @@ -89,7 +89,7 @@ src_compile() { MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD" brand="FreeBSD" fi - export BRANDING="Gentoo ${brand}" + export BRANDING="${DISTRO} ${brand}" use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}" export DEBUG=$(usev debug) export MKTERMCAP=$(usev ncurses) diff --git a/sys-apps/openrc/openrc-0.22.4.ebuild b/sys-apps/openrc/openrc-0.22.4.ebuild index ac0b27a8bdeda..c353fa1235a52 100644 --- a/sys-apps/openrc/openrc-0.22.4.ebuild +++ b/sys-apps/openrc/openrc-0.22.4.ebuild @@ -89,7 +89,7 @@ src_compile() { MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD" brand="FreeBSD" fi - export BRANDING="Gentoo ${brand}" + export BRANDING="${DISTRO} ${brand}" use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}" export DEBUG=$(usev debug) export MKTERMCAP=$(usev ncurses) diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild index cabbebbce8b6d..3dac601fc8f40 100644 --- a/sys-apps/openrc/openrc-9999.ebuild +++ b/sys-apps/openrc/openrc-9999.ebuild @@ -92,7 +92,7 @@ src_compile() { MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD" brand="FreeBSD" fi - export BRANDING="Gentoo ${brand}" + export BRANDING="${DISTRO} ${brand}" use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}" export DEBUG=$(usev debug) export MKTERMCAP=$(usev ncurses) diff --git a/sys-block/tw_cli/tw_cli-10.1.ebuild b/sys-block/tw_cli/tw_cli-10.1.ebuild index b3135df112123..87bfc91eff9aa 100644 --- a/sys-block/tw_cli/tw_cli-10.1.ebuild +++ b/sys-block/tw_cli/tw_cli-10.1.ebuild @@ -39,7 +39,7 @@ MY_P="cli_${PN_KERNEL}_${PV}" #HW_VARIANT="Escalade7000Series" - for versions 9.3.0.* #HW_VARIANT="Escalade9650SE-Series" # for versions 9.4.0* #HW_VARIANT="Escalade9690SA-Series" # for versions 9.5.0* -HW_VARIANT="3ware%20SAS%209750-8i%20Gentoo" +HW_VARIANT="3ware%20SAS%209750-8i%20${DISTRO}" # package has different tarballs for x86 and amd64 SRC_URI_BASE="http://www.lsi.com/DistributionSystem/AssetDocument" SRC_URI_linux="${SRC_URI_BASE}/cli_linux_${PV}.zip" diff --git a/sys-block/tw_cli/tw_cli-10.2.ebuild b/sys-block/tw_cli/tw_cli-10.2.ebuild index fe850379a8da7..9ba0cc7d527c1 100644 --- a/sys-block/tw_cli/tw_cli-10.2.ebuild +++ b/sys-block/tw_cli/tw_cli-10.2.ebuild @@ -39,7 +39,7 @@ MY_P="cli_${PN_KERNEL}_${PV}" #HW_VARIANT="Escalade7000Series" - for versions 9.3.0.* #HW_VARIANT="Escalade9650SE-Series" # for versions 9.4.0* #HW_VARIANT="Escalade9690SA-Series" # for versions 9.5.0* -HW_VARIANT="3ware%20SAS%209750-8i%20Gentoo" +HW_VARIANT="3ware%20SAS%209750-8i%20${DISTRO}" # package has different tarballs for x86 and amd64 SRC_URI_BASE="http://www.lsi.com/DistributionSystem/AssetDocument" SRC_URI_SUFFIX="?prodName=${HW_VARIANT}" diff --git a/sys-boot/elilo/elilo-3.10.ebuild b/sys-boot/elilo/elilo-3.10.ebuild index 06485c29c45b8..041b369d752bf 100644 --- a/sys-boot/elilo/elilo-3.10.ebuild +++ b/sys-boot/elilo/elilo-3.10.ebuild @@ -35,9 +35,9 @@ src_unpack() { sed -i " 1s:/bin/sh:/bin/bash:; s/##VERSION##/$PV/; - s/Debian GNU\//Gentoo /g; - s/Debian/Gentoo/g; - s/debian/gentoo/g; + s/Debian GNU\//${DISTRO} /g; + s/Debian/${DISTRO}/g; + s/debian/${DISTRO}/g; s/dpkg --print-installation-architecture/uname -m/" debian/elilo.sh } diff --git a/sys-boot/elilo/elilo-3.12.ebuild b/sys-boot/elilo/elilo-3.12.ebuild index d56f2d60422e6..02215e5d1e7ce 100644 --- a/sys-boot/elilo/elilo-3.12.ebuild +++ b/sys-boot/elilo/elilo-3.12.ebuild @@ -35,9 +35,9 @@ src_unpack() { sed -i " 1s:/bin/sh:/bin/bash:; s/##VERSION##/$PV/; - s/Debian GNU\//Gentoo /g; - s/Debian/Gentoo/g; - s/debian/gentoo/g; + s/Debian GNU\//${DISTRO} /g; + s/Debian/${DISTRO}/g; + s/debian/${DISTRO}/g; s/dpkg --print-architecture/uname -m/" debian/elilo.sh } diff --git a/sys-boot/elilo/elilo-3.16.ebuild b/sys-boot/elilo/elilo-3.16.ebuild index 472488d9ce125..f42327c7896c7 100644 --- a/sys-boot/elilo/elilo-3.16.ebuild +++ b/sys-boot/elilo/elilo-3.16.ebuild @@ -46,9 +46,9 @@ src_prepare() { sed -i \ -e '1s:/bin/sh:/bin/bash:' \ -e "s:##VERSION##:${PV}:" \ - -e 's:Debian GNU/:Gentoo :g' \ - -e 's:Debian:Gentoo:g' \ - -e 's:debian:gentoo:g' \ + -e "s:Debian GNU/:${DISTRO} :g" \ + -e "s:Debian:${DISTRO}:g" \ + -e "s:debian:${DISTRO}:g" \ -e "s:dpkg --print-architecture:echo ${iarch}:" \ debian/elilo.sh || die } diff --git a/sys-boot/elilo/elilo-3.6_p20060314.ebuild b/sys-boot/elilo/elilo-3.6_p20060314.ebuild index ea7593c0ce03d..6a83ef72264fb 100644 --- a/sys-boot/elilo/elilo-3.6_p20060314.ebuild +++ b/sys-boot/elilo/elilo-3.6_p20060314.ebuild @@ -52,9 +52,9 @@ src_unpack() { sed -i " 1s/sh/bash/; s/##VERSION##/$PV/; - s/Debian GNU\//Gentoo /g; - s/Debian/Gentoo/g; - s/debian/gentoo/g; + s/Debian GNU\//${DISTRO} /g; + s/Debian/${DISTRO}/g; + s/debian/${DISTRO}/g; s/dpkg --print-installation-architecture/uname -m/" debian/elilo.sh } diff --git a/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild b/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild index a03dbc3f0644c..4adba4de3ec8c 100644 --- a/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild @@ -91,7 +91,7 @@ src_prepare() { [[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] && \ echo "#define __OSX_AVAILABLE_STARTING(x,y) " > include/Availability.h - local VER_STR="\"@(#)PROGRAM:ld PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\"" + local VER_STR="\"@(#)PROGRAM:ld PROJECT:${LD64} (${DISTRO} ${PN}-${PVR})\\n\"" echo "char ldVersionString[] = ${VER_STR};" > version.cpp epatch "${S}"/ld64-123.2-debug-backtrace.patch @@ -126,7 +126,7 @@ src_prepare() { # RC_ProjectSourceVersion is also used as library version, we can't # just append our local version info. So we hack the libstuff Makefile # to include our Gentoo version. - sed -i -e "/cctools-.*(RC_ProjectSourceVersion).*OFILE_DIR/s,Version),Version) (Gentoo ${PN}-${PVR})," \ + sed -i -e "/cctools-.*(RC_ProjectSourceVersion).*OFILE_DIR/s,Version),Version) (${DISTRO} ${PN}-${PVR})," \ libstuff/Makefile # clean up test suite diff --git a/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild index 682f644fc851c..7de5c2e64e5fa 100644 --- a/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild @@ -101,7 +101,7 @@ src_prepare() { [[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] && \ echo "#define __OSX_AVAILABLE_STARTING(x,y) " > include/Availability.h - local VER_STR="\"@(#)PROGRAM:ld PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\"" + local VER_STR="\"@(#)PROGRAM:ld PROJECT:${LD64} (${DISTRO} ${PN}-${PVR})\\n\"" echo "char ldVersionString[] = ${VER_STR};" > version.cpp epatch "${S}"/ld64-123.2-debug-backtrace.patch @@ -138,7 +138,7 @@ src_prepare() { # RC_ProjectSourceVersion is also used as library version, we can't # just append our local version info. So we hack the libstuff Makefile # to include our Gentoo version. - sed -i -e "/cctools-.*(RC_ProjectSourceVersion).*OFILE_DIR/s,Version),Version) (Gentoo ${PN}-${PVR})," \ + sed -i -e "/cctools-.*(RC_ProjectSourceVersion).*OFILE_DIR/s,Version),Version) (${DISTRO} ${PN}-${PVR})," \ libstuff/Makefile # clean up test suite diff --git a/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild index 9743fd4485546..f17f09779c89e 100644 --- a/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild @@ -102,7 +102,7 @@ src_prepare() { [[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] && \ echo "#define __OSX_AVAILABLE_STARTING(x,y) " > include/Availability.h - local VER_STR="\"@(#)PROGRAM:ld PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\"" + local VER_STR="\"@(#)PROGRAM:ld PROJECT:${LD64} (${DISTRO} ${PN}-${PVR})\\n\"" echo "char ldVersionString[] = ${VER_STR};" > version.cpp epatch "${S}"/ld64-123.2-debug-backtrace.patch @@ -139,7 +139,7 @@ src_prepare() { # RC_ProjectSourceVersion is also used as library version, we can't # just append our local version info. So we hack the libstuff Makefile # to include our Gentoo version. - sed -i -e "/cctools-.*(RC_ProjectSourceVersion).*OFILE_DIR/s,Version),Version) (Gentoo ${PN}-${PVR})," \ + sed -i -e "/cctools-.*(RC_ProjectSourceVersion).*OFILE_DIR/s,Version),Version) (${DISTRO} ${PN}-${PVR})," \ libstuff/Makefile # clean up test suite diff --git a/sys-devel/binutils-apple/binutils-apple-6.3-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-6.3-r1.ebuild index e3022aab1b745..131691423f872 100644 --- a/sys-devel/binutils-apple/binutils-apple-6.3-r1.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-6.3-r1.ebuild @@ -96,7 +96,7 @@ src_prepare() { [[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] && \ echo "#define __OSX_AVAILABLE_STARTING(x,y) " > include/Availability.h - local VER_STR="\"@(#)PROGRAM:ld PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\"" + local VER_STR="\"@(#)PROGRAM:ld PROJECT:${LD64} (${DISTRO} ${PN}-${PVR})\\n\"" echo "char ldVersionString[] = ${VER_STR};" > version.cpp epatch "${S}"/ld64-123.2-debug-backtrace.patch @@ -132,7 +132,7 @@ src_prepare() { # RC_ProjectSourceVersion is also used as library version, we can't # just append our local version info. So we hack the libstuff Makefile # to include our Gentoo version. - sed -i -e "/cctools-.*(RC_ProjectSourceVersion).*OFILE_DIR/s,Version),Version) (Gentoo ${PN}-${PVR})," \ + sed -i -e "/cctools-.*(RC_ProjectSourceVersion).*OFILE_DIR/s,Version),Version) (${DISTRO} ${PN}-${PVR})," \ libstuff/Makefile # clean up test suite diff --git a/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild index b6ea3cdb633ef..fbef76e17df33 100644 --- a/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild @@ -100,7 +100,7 @@ src_prepare() { [[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] && \ echo "#define __OSX_AVAILABLE_STARTING(x,y) " > include/Availability.h - local VER_STR="\"@(#)PROGRAM:ld PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\"" + local VER_STR="\"@(#)PROGRAM:ld PROJECT:${LD64} (${DISTRO} ${PN}-${PVR})\\n\"" echo "char ldVersionString[] = ${VER_STR};" > version.cpp epatch "${S}"/ld64-123.2-debug-backtrace.patch @@ -139,7 +139,7 @@ src_prepare() { # RC_ProjectSourceVersion is also used as library version, we can't # just append our local version info. So we hack the libstuff Makefile # to include our Gentoo version. - sed -i -e "/cctools-.*(RC_ProjectSourceVersion).*OFILE_DIR/s,Version),Version) (Gentoo ${PN}-${PVR})," \ + sed -i -e "/cctools-.*(RC_ProjectSourceVersion).*OFILE_DIR/s,Version),Version) (${DISTRO} ${PN}-${PVR})," \ libstuff/Makefile # clean up test suite diff --git a/sys-devel/binutils-apple/binutils-apple-7.0.ebuild b/sys-devel/binutils-apple/binutils-apple-7.0.ebuild index 91916054da8a8..e17b63806ee8c 100644 --- a/sys-devel/binutils-apple/binutils-apple-7.0.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-7.0.ebuild @@ -104,7 +104,7 @@ src_prepare() { [[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] && \ echo "#define __OSX_AVAILABLE_STARTING(x,y) " > include/Availability.h - local VER_STR="\"@(#)PROGRAM:ld PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\"" + local VER_STR="\"@(#)PROGRAM:ld PROJECT:${LD64} (${DISTRO} ${PN}-${PVR})\\n\"" echo "char ldVersionString[] = ${VER_STR};" > version.cpp epatch "${S}"/ld64-123.2-debug-backtrace.patch @@ -141,7 +141,7 @@ src_prepare() { # RC_ProjectSourceVersion is also used as library version, we can't # just append our local version info. So we hack the libstuff Makefile # to include our Gentoo version. - sed -i -e "/cctools-.*(RC_ProjectSourceVersion).*OFILE_DIR/s,Version),Version) (Gentoo ${PN}-${PVR})," \ + sed -i -e "/cctools-.*(RC_ProjectSourceVersion).*OFILE_DIR/s,Version),Version) (${DISTRO} ${PN}-${PVR})," \ libstuff/Makefile # clean up test suite diff --git a/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild index 66a832957ed8b..92c549898722f 100644 --- a/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild @@ -100,7 +100,7 @@ src_prepare() { [[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] && \ echo "#define __OSX_AVAILABLE_STARTING(x,y) " > include/Availability.h - local VER_STR="\"@(#)PROGRAM:ld PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\"" + local VER_STR="\"@(#)PROGRAM:ld PROJECT:${LD64} (${DISTRO} ${PN}-${PVR})\\n\"" echo "char ldVersionString[] = ${VER_STR};" > version.cpp epatch "${S}"/ld64-123.2-debug-backtrace.patch @@ -139,7 +139,7 @@ src_prepare() { # RC_ProjectSourceVersion is also used as library version, we can't # just append our local version info. So we hack the libstuff Makefile # to include our Gentoo version. - sed -i -e "/cctools-.*(RC_ProjectSourceVersion).*OFILE_DIR/s,Version),Version) (Gentoo ${PN}-${PVR})," \ + sed -i -e "/cctools-.*(RC_ProjectSourceVersion).*OFILE_DIR/s,Version),Version) (${DISTRO} ${PN}-${PVR})," \ libstuff/Makefile # clean up test suite diff --git a/sys-devel/binutils-apple/binutils-apple-7.1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.1.ebuild index 60ef905d77b81..f176188cd7252 100644 --- a/sys-devel/binutils-apple/binutils-apple-7.1.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-7.1.ebuild @@ -104,7 +104,7 @@ src_prepare() { [[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] && \ echo "#define __OSX_AVAILABLE_STARTING(x,y) " > include/Availability.h - local VER_STR="\"@(#)PROGRAM:ld PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\"" + local VER_STR="\"@(#)PROGRAM:ld PROJECT:${LD64} (${DISTRO} ${PN}-${PVR})\\n\"" echo "char ldVersionString[] = ${VER_STR};" > version.cpp epatch "${S}"/ld64-123.2-debug-backtrace.patch @@ -141,7 +141,7 @@ src_prepare() { # RC_ProjectSourceVersion is also used as library version, we can't # just append our local version info. So we hack the libstuff Makefile # to include our Gentoo version. - sed -i -e "/cctools-.*(RC_ProjectSourceVersion).*OFILE_DIR/s,Version),Version) (Gentoo ${PN}-${PVR})," \ + sed -i -e "/cctools-.*(RC_ProjectSourceVersion).*OFILE_DIR/s,Version),Version) (${DISTRO} ${PN}-${PVR})," \ libstuff/Makefile # clean up test suite diff --git a/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild index 0cdd4846c9db7..5cd1b11374442 100644 --- a/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild @@ -101,7 +101,7 @@ src_prepare() { [[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] && \ echo "#define __OSX_AVAILABLE_STARTING(x,y) " > include/Availability.h - local VER_STR="\"@(#)PROGRAM:ld PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\"" + local VER_STR="\"@(#)PROGRAM:ld PROJECT:${LD64} (${DISTRO} ${PN}-${PVR})\\n\"" echo "char ldVersionString[] = ${VER_STR};" > version.cpp epatch "${S}"/ld64-123.2-debug-backtrace.patch @@ -140,7 +140,7 @@ src_prepare() { # RC_ProjectSourceVersion is also used as library version, we can't # just append our local version info. So we hack the libstuff Makefile # to include our Gentoo version. - sed -i -e "/cctools-.*(RC_ProjectSourceVersion).*OFILE_DIR/s,Version),Version) (Gentoo ${PN}-${PVR})," \ + sed -i -e "/cctools-.*(RC_ProjectSourceVersion).*OFILE_DIR/s,Version),Version) (${DISTRO} ${PN}-${PVR})," \ libstuff/Makefile # clean up test suite diff --git a/sys-devel/binutils-apple/binutils-apple-7.2.ebuild b/sys-devel/binutils-apple/binutils-apple-7.2.ebuild index 9973a8be5f57b..82d397e5d3cc9 100644 --- a/sys-devel/binutils-apple/binutils-apple-7.2.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-7.2.ebuild @@ -104,7 +104,7 @@ src_prepare() { [[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] && \ echo "#define __OSX_AVAILABLE_STARTING(x,y) " > include/Availability.h - local VER_STR="\"@(#)PROGRAM:ld PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\"" + local VER_STR="\"@(#)PROGRAM:ld PROJECT:${LD64} (${DISTRO} ${PN}-${PVR})\\n\"" echo "char ldVersionString[] = ${VER_STR};" > version.cpp epatch "${S}"/ld64-123.2-debug-backtrace.patch @@ -141,7 +141,7 @@ src_prepare() { # RC_ProjectSourceVersion is also used as library version, we can't # just append our local version info. So we hack the libstuff Makefile # to include our Gentoo version. - sed -i -e "/cctools-.*(RC_ProjectSourceVersion).*OFILE_DIR/s,Version),Version) (Gentoo ${PN}-${PVR})," \ + sed -i -e "/cctools-.*(RC_ProjectSourceVersion).*OFILE_DIR/s,Version),Version) (${DISTRO} ${PN}-${PVR})," \ libstuff/Makefile # clean up test suite diff --git a/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild index 55be11280a7bc..95481383f50c1 100644 --- a/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild @@ -100,7 +100,7 @@ src_prepare() { [[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] && \ echo "#define __OSX_AVAILABLE_STARTING(x,y) " > include/Availability.h - local VER_STR="\"@(#)PROGRAM:ld PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\"" + local VER_STR="\"@(#)PROGRAM:ld PROJECT:${LD64} (${DISTRO} ${PN}-${PVR})\\n\"" echo "char ldVersionString[] = ${VER_STR};" > version.cpp epatch "${S}"/ld64-123.2-debug-backtrace.patch @@ -140,7 +140,7 @@ src_prepare() { # RC_ProjectSourceVersion is also used as library version, we can't # just append our local version info. So we hack the libstuff Makefile # to include our Gentoo version. - sed -i -e "/cctools-.*(RC_ProjectSourceVersion).*OFILE_DIR/s,Version),Version) (Gentoo ${PN}-${PVR})," \ + sed -i -e "/cctools-.*(RC_ProjectSourceVersion).*OFILE_DIR/s,Version),Version) (${DISTRO} ${PN}-${PVR})," \ libstuff/Makefile # clean up test suite diff --git a/sys-devel/binutils-apple/binutils-apple-7.3.ebuild b/sys-devel/binutils-apple/binutils-apple-7.3.ebuild index db27567896918..9798a858005c0 100644 --- a/sys-devel/binutils-apple/binutils-apple-7.3.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-7.3.ebuild @@ -100,7 +100,7 @@ src_prepare() { [[ ${CHOST} == *darwin* && ${CHOST#*-darwin} -le 8 ]] && \ echo "#define __OSX_AVAILABLE_STARTING(x,y) " > include/Availability.h - local VER_STR="\"@(#)PROGRAM:ld PROJECT:${LD64} (Gentoo ${PN}-${PVR})\\n\"" + local VER_STR="\"@(#)PROGRAM:ld PROJECT:${LD64} (${DISTRO} ${PN}-${PVR})\\n\"" echo "char ldVersionString[] = ${VER_STR};" > version.cpp epatch "${S}"/ld64-123.2-debug-backtrace.patch @@ -140,7 +140,7 @@ src_prepare() { # RC_ProjectSourceVersion is also used as library version, we can't # just append our local version info. So we hack the libstuff Makefile # to include our Gentoo version. - sed -i -e "/cctools-.*(RC_ProjectSourceVersion).*OFILE_DIR/s,Version),Version) (Gentoo ${PN}-${PVR})," \ + sed -i -e "/cctools-.*(RC_ProjectSourceVersion).*OFILE_DIR/s,Version),Version) (${DISTRO} ${PN}-${PVR})," \ libstuff/Makefile # clean up test suite diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5664.ebuild b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5664.ebuild index aaf9307382ed0..f52735c554e29 100644 --- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5664.ebuild +++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5664.ebuild @@ -115,7 +115,7 @@ src_prepare() { fi local BRANDING_GCC_PKGVERSION="$(sed -n -e '/^#define VERSUFFIX/s/^[^"]*"\([^"]\+\)".*$/\1/p' "${S}"/gcc/version.c)" - BRANDING_GCC_PKGVERSION=${BRANDING_GCC_PKGVERSION/(/(Gentoo ${PVR}, } + BRANDING_GCC_PKGVERSION=${BRANDING_GCC_PKGVERSION/(/(${DISTRO} ${PVR}, } einfo "patching gcc version: ${GCC_VERS}${BRANDING_GCC_PKGVERSION}" sed -i -e "s~VERSUFFIX \"[^\"]*~VERSUFFIX \"${BRANDING_GCC_PKGVERSION}~" \ diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r1.ebuild b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r1.ebuild index a180a2df21b50..f2232cc71d3af 100644 --- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r1.ebuild +++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r1.ebuild @@ -127,7 +127,7 @@ src_prepare() { fi local BRANDING_GCC_PKGVERSION="$(sed -n -e '/^#define VERSUFFIX/s/^[^"]*"\([^"]\+\)".*$/\1/p' "${S}"/gcc/version.c)" - BRANDING_GCC_PKGVERSION=${BRANDING_GCC_PKGVERSION/(/(Gentoo ${PVR}, } + BRANDING_GCC_PKGVERSION=${BRANDING_GCC_PKGVERSION/(/(${DISTRO} ${PVR}, } einfo "patching gcc version: ${GCC_VERS}${BRANDING_GCC_PKGVERSION}" sed -i -e "s~VERSUFFIX \"[^\"]*~VERSUFFIX \"${BRANDING_GCC_PKGVERSION}~" \ diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild index 3540664d68cc6..a56951e0c4cc0 100644 --- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild +++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild @@ -135,7 +135,7 @@ src_prepare() { fi local BRANDING_GCC_PKGVERSION="$(sed -n -e '/^#define VERSUFFIX/s/^[^"]*"\([^"]\+\)".*$/\1/p' "${S}"/gcc/version.c)" - BRANDING_GCC_PKGVERSION=${BRANDING_GCC_PKGVERSION/(/(Gentoo ${PVR}, } + BRANDING_GCC_PKGVERSION=${BRANDING_GCC_PKGVERSION/(/(${DISTRO} ${PVR}, } einfo "patching gcc version: ${GCC_VERS}${BRANDING_GCC_PKGVERSION}" sed -i -e "s~VERSUFFIX \"[^\"]*~VERSUFFIX \"${BRANDING_GCC_PKGVERSION}~" \ diff --git a/sys-devel/gdb/gdb-7.10.1.ebuild b/sys-devel/gdb/gdb-7.10.1.ebuild index 066fb61dbcd6e..ca4c34c937182 100644 --- a/sys-devel/gdb/gdb-7.10.1.ebuild +++ b/sys-devel/gdb/gdb-7.10.1.ebuild @@ -97,7 +97,7 @@ src_prepare() { } gdb_branding() { - printf "Gentoo ${PV} " + printf "${DISTRO} ${PV} " if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then printf "p${PATCH_VER}" else @@ -111,7 +111,7 @@ src_configure() { local myconf=( --with-pkgversion="$(gdb_branding)" - --with-bugurl='https://bugs.gentoo.org/' + --with-bugurl="${DISTRO_BUG_URL}" --disable-werror # Disable modules that are in a combined binutils/gdb tree. #490566 --disable-{binutils,etc,gas,gold,gprof,ld} diff --git a/sys-devel/gdb/gdb-7.11.1.ebuild b/sys-devel/gdb/gdb-7.11.1.ebuild index 7d9e072a39e48..62ea3cc227d85 100644 --- a/sys-devel/gdb/gdb-7.11.1.ebuild +++ b/sys-devel/gdb/gdb-7.11.1.ebuild @@ -96,7 +96,7 @@ src_prepare() { } gdb_branding() { - printf "Gentoo ${PV} " + printf "${DISTRO} ${PV} " if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then printf "p${PATCH_VER}" else @@ -110,7 +110,7 @@ src_configure() { local myconf=( --with-pkgversion="$(gdb_branding)" - --with-bugurl='https://bugs.gentoo.org/' + --with-bugurl="${DISTRO_BUG_URL}" --disable-werror # Disable modules that are in a combined binutils/gdb tree. #490566 --disable-{binutils,etc,gas,gold,gprof,ld} diff --git a/sys-devel/gdb/gdb-7.11.ebuild b/sys-devel/gdb/gdb-7.11.ebuild index 3487030b1978e..33b27251128cb 100644 --- a/sys-devel/gdb/gdb-7.11.ebuild +++ b/sys-devel/gdb/gdb-7.11.ebuild @@ -97,7 +97,7 @@ src_prepare() { } gdb_branding() { - printf "Gentoo ${PV} " + printf "${DISTRO} ${PV} " if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then printf "p${PATCH_VER}" else @@ -111,7 +111,7 @@ src_configure() { local myconf=( --with-pkgversion="$(gdb_branding)" - --with-bugurl='https://bugs.gentoo.org/' + --with-bugurl="${DISTRO_BUG_URL}" --disable-werror # Disable modules that are in a combined binutils/gdb tree. #490566 --disable-{binutils,etc,gas,gold,gprof,ld} diff --git a/sys-devel/gdb/gdb-7.12.ebuild b/sys-devel/gdb/gdb-7.12.ebuild index c99e14e02ef7e..8ea1db3626b03 100644 --- a/sys-devel/gdb/gdb-7.12.ebuild +++ b/sys-devel/gdb/gdb-7.12.ebuild @@ -96,7 +96,7 @@ src_prepare() { } gdb_branding() { - printf "Gentoo ${PV} " + printf "${DISTRO} ${PV} " if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then printf "p${PATCH_VER}" else @@ -110,7 +110,7 @@ src_configure() { local myconf=( --with-pkgversion="$(gdb_branding)" - --with-bugurl='https://bugs.gentoo.org/' + --with-bugurl="${DISTRO_BUG_URL}" --disable-werror # Disable modules that are in a combined binutils/gdb tree. #490566 --disable-{binutils,etc,gas,gold,gprof,ld} diff --git a/sys-devel/gdb/gdb-7.9.1.ebuild b/sys-devel/gdb/gdb-7.9.1.ebuild index 92cf65cd4c265..68ce9cd82991f 100644 --- a/sys-devel/gdb/gdb-7.9.1.ebuild +++ b/sys-devel/gdb/gdb-7.9.1.ebuild @@ -96,7 +96,7 @@ src_prepare() { } gdb_branding() { - printf "Gentoo ${PV} " + printf "${DISTRO} ${PV} " if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then printf "p${PATCH_VER}" else @@ -109,7 +109,7 @@ src_configure() { local myconf=( --with-pkgversion="$(gdb_branding)" - --with-bugurl='https://bugs.gentoo.org/' + --with-bugurl="${DISTRO_BUG_URL}" --disable-werror # Disable modules that are in a combined binutils/gdb tree. #490566 --disable-{binutils,etc,gas,gold,gprof,ld} diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild index d4254ad9f4b22..39cf0f23f80ee 100644 --- a/sys-devel/gdb/gdb-9999.ebuild +++ b/sys-devel/gdb/gdb-9999.ebuild @@ -95,7 +95,7 @@ src_prepare() { } gdb_branding() { - printf "Gentoo ${PV} " + printf "${DISTRO} ${PV} " if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then printf "p${PATCH_VER}" else @@ -109,7 +109,7 @@ src_configure() { local myconf=( --with-pkgversion="$(gdb_branding)" - --with-bugurl='https://bugs.gentoo.org/' + --with-bugurl="${DISTRO_BUG_URL}" --disable-werror # Disable modules that are in a combined binutils/gdb tree. #490566 --disable-{binutils,etc,gas,gold,gprof,ld} diff --git a/sys-firmware/seabios/seabios-1.8.2.ebuild b/sys-firmware/seabios/seabios-1.8.2.ebuild index 44398a9ee7ab9..c2784e8acd967 100644 --- a/sys-firmware/seabios/seabios-1.8.2.ebuild +++ b/sys-firmware/seabios/seabios-1.8.2.ebuild @@ -100,7 +100,7 @@ _emake() { RANLIB="$(tc-getRANLIB)" \ OBJDUMP="$(tc-getOBJDUMP)" \ HOST_CC="$(tc-getBUILD_CC)" \ - VERSION="Gentoo/${EGIT_COMMIT:-${PVR}}" \ + VERSION="${DISTRO}/${EGIT_COMMIT:-${PVR}}" \ "$@" } diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.3-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.3-r1.ebuild index 5f6bf88e8f878..e9eb3c34dc3f9 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-0.6.3-r1.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.3-r1.ebuild @@ -87,7 +87,7 @@ src_prepare() { # Set module revision number [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } + { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-${DISTRO}/" "${S}/META" || die "Could not set Gentoo release"; } autotools-utils_src_prepare } diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.4.2.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.4.2.ebuild index 67b57ef879677..63182485cdd68 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-0.6.4.2.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.4.2.ebuild @@ -77,7 +77,7 @@ src_prepare() { # Set module revision number [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } + { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-${DISTRO}/" "${S}/META" || die "Could not set Gentoo release"; } autotools-utils_src_prepare } diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.5-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5-r1.ebuild index 0e3665f95f844..4314c7d6943e9 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-0.6.5-r1.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.5-r1.ebuild @@ -84,7 +84,7 @@ src_prepare() { # Set module revision number [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } + { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-${DISTRO}/" "${S}/META" || die "Could not set Gentoo release"; } autotools-utils_src_prepare } diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.2.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.2.ebuild index 2876e3ba2a2c8..8a5cd7faa227b 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.2.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.2.ebuild @@ -76,7 +76,7 @@ src_prepare() { # Set module revision number [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } + { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-${DISTRO}/" "${S}/META" || die "Could not set Gentoo release"; } autotools-utils_src_prepare } diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.3-r4.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.3-r4.ebuild index 097c4be4ad2bf..654cccbbd825b 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.3-r4.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.3-r4.ebuild @@ -90,7 +90,7 @@ src_prepare() { # Set module revision number [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } + { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-${DISTRO}/" "${S}/META" || die "Could not set Gentoo release"; } autotools-utils_src_prepare } diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.3.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.3.ebuild index 0a2d9c7c8c8c1..698b2c97462fb 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.3.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.3.ebuild @@ -76,7 +76,7 @@ src_prepare() { # Set module revision number [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } + { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-${DISTRO}/" "${S}/META" || die "Could not set Gentoo release"; } autotools-utils_src_prepare } diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.4-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.4-r1.ebuild index 7799ec66e768a..a0fd9a3e37d38 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.4-r1.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.4-r1.ebuild @@ -90,7 +90,7 @@ src_prepare() { # Set module revision number [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } + { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-${DISTRO}/" "${S}/META" || die "Could not set Gentoo release"; } autotools-utils_src_prepare } diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.4.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.4.ebuild index f71c515d3ed77..8483bbfd289b4 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.4.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.4.ebuild @@ -76,7 +76,7 @@ src_prepare() { # Set module revision number [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } + { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-${DISTRO}/" "${S}/META" || die "Could not set Gentoo release"; } autotools-utils_src_prepare } diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.6.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.6.ebuild index 7c204cd4ecaaf..fb44c292d40d0 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.6.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.6.ebuild @@ -76,7 +76,7 @@ src_prepare() { # Set module revision number [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } + { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-${DISTRO}/" "${S}/META" || die "Could not set Gentoo release"; } autotools-utils_src_prepare } diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.7.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.7.ebuild index 57d7d6ddcd38f..d0ee4acbf5657 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.7.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.7.ebuild @@ -76,7 +76,7 @@ src_prepare() { # Set module revision number [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } + { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-${DISTRO}/" "${S}/META" || die "Could not set Gentoo release"; } autotools-utils_src_prepare } diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.8.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.8.ebuild index ea4a5563b30f9..299d068cd23b1 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.8.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.8.ebuild @@ -76,7 +76,7 @@ src_prepare() { # Set module revision number [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } + { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-${DISTRO}/" "${S}/META" || die "Could not set Gentoo release"; } autotools-utils_src_prepare } diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild index 47fd79f09645c..bbeb4b503d757 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild @@ -76,7 +76,7 @@ src_prepare() { # Set module revision number [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } + { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-${DISTRO}/" "${S}/META" || die "Could not set Gentoo release"; } autotools-utils_src_prepare } diff --git a/sys-kernel/spl/spl-0.6.3-r1.ebuild b/sys-kernel/spl/spl-0.6.3-r1.ebuild index dc2ebe6824ab2..99d92d7ee350f 100644 --- a/sys-kernel/spl/spl-0.6.3-r1.ebuild +++ b/sys-kernel/spl/spl-0.6.3-r1.ebuild @@ -82,7 +82,7 @@ src_prepare() { # Set module revision number [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } + { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-${DISTRO}/" "${S}/META" || die "Could not set Gentoo release"; } autotools-utils_src_prepare } diff --git a/sys-kernel/spl/spl-0.6.4.2.ebuild b/sys-kernel/spl/spl-0.6.4.2.ebuild index d00b365f5f357..caefdbe7ef268 100644 --- a/sys-kernel/spl/spl-0.6.4.2.ebuild +++ b/sys-kernel/spl/spl-0.6.4.2.ebuild @@ -73,7 +73,7 @@ src_prepare() { # Set module revision number [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } + { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-${DISTRO}/" "${S}/META" || die "Could not set Gentoo release"; } autotools-utils_src_prepare } diff --git a/sys-kernel/spl/spl-0.6.5.2.ebuild b/sys-kernel/spl/spl-0.6.5.2.ebuild index e317124cc9aa7..8f0b173038691 100644 --- a/sys-kernel/spl/spl-0.6.5.2.ebuild +++ b/sys-kernel/spl/spl-0.6.5.2.ebuild @@ -73,7 +73,7 @@ src_prepare() { # Set module revision number [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } + { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-${DISTRO}/" "${S}/META" || die "Could not set Gentoo release"; } autotools-utils_src_prepare } diff --git a/sys-kernel/spl/spl-0.6.5.3-r1.ebuild b/sys-kernel/spl/spl-0.6.5.3-r1.ebuild index c87ca95da64c8..948ccb66faa41 100644 --- a/sys-kernel/spl/spl-0.6.5.3-r1.ebuild +++ b/sys-kernel/spl/spl-0.6.5.3-r1.ebuild @@ -80,7 +80,7 @@ src_prepare() { # Set module revision number [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } + { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-${DISTRO}/" "${S}/META" || die "Could not set Gentoo release"; } autotools-utils_src_prepare } diff --git a/sys-kernel/spl/spl-0.6.5.3.ebuild b/sys-kernel/spl/spl-0.6.5.3.ebuild index 29dd053cfdcba..18de43b30610c 100644 --- a/sys-kernel/spl/spl-0.6.5.3.ebuild +++ b/sys-kernel/spl/spl-0.6.5.3.ebuild @@ -71,7 +71,7 @@ src_prepare() { # Set module revision number [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } + { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-${DISTRO}/" "${S}/META" || die "Could not set Gentoo release"; } autotools-utils_src_prepare } diff --git a/sys-kernel/spl/spl-0.6.5.4-r1.ebuild b/sys-kernel/spl/spl-0.6.5.4-r1.ebuild index d53ececc6bcf3..e0d62434aea47 100644 --- a/sys-kernel/spl/spl-0.6.5.4-r1.ebuild +++ b/sys-kernel/spl/spl-0.6.5.4-r1.ebuild @@ -80,7 +80,7 @@ src_prepare() { # Set module revision number [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } + { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-${DISTRO}/" "${S}/META" || die "Could not set Gentoo release"; } autotools-utils_src_prepare } diff --git a/sys-kernel/spl/spl-0.6.5.4.ebuild b/sys-kernel/spl/spl-0.6.5.4.ebuild index b0e1bd087f017..00faeae6c65af 100644 --- a/sys-kernel/spl/spl-0.6.5.4.ebuild +++ b/sys-kernel/spl/spl-0.6.5.4.ebuild @@ -71,7 +71,7 @@ src_prepare() { # Set module revision number [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } + { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-${DISTRO}/" "${S}/META" || die "Could not set Gentoo release"; } autotools-utils_src_prepare } diff --git a/sys-kernel/spl/spl-0.6.5.6.ebuild b/sys-kernel/spl/spl-0.6.5.6.ebuild index 86d4752bea802..087a0a49291ec 100644 --- a/sys-kernel/spl/spl-0.6.5.6.ebuild +++ b/sys-kernel/spl/spl-0.6.5.6.ebuild @@ -71,7 +71,7 @@ src_prepare() { # Set module revision number [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } + { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-${DISTRO}/" "${S}/META" || die "Could not set Gentoo release"; } autotools-utils_src_prepare } diff --git a/sys-kernel/spl/spl-0.6.5.7.ebuild b/sys-kernel/spl/spl-0.6.5.7.ebuild index c6ea4abdfc5c2..a0027a83253e6 100644 --- a/sys-kernel/spl/spl-0.6.5.7.ebuild +++ b/sys-kernel/spl/spl-0.6.5.7.ebuild @@ -71,7 +71,7 @@ src_prepare() { # Set module revision number [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } + { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-${DISTRO}/" "${S}/META" || die "Could not set Gentoo release"; } autotools-utils_src_prepare } diff --git a/sys-kernel/spl/spl-0.6.5.8.ebuild b/sys-kernel/spl/spl-0.6.5.8.ebuild index 1253bb562d69e..2ffbd564adb77 100644 --- a/sys-kernel/spl/spl-0.6.5.8.ebuild +++ b/sys-kernel/spl/spl-0.6.5.8.ebuild @@ -71,7 +71,7 @@ src_prepare() { # Set module revision number [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } + { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-${DISTRO}/" "${S}/META" || die "Could not set Gentoo release"; } autotools-utils_src_prepare } diff --git a/sys-kernel/spl/spl-9999.ebuild b/sys-kernel/spl/spl-9999.ebuild index bd16ada2b797d..7a0913fbcbc4b 100644 --- a/sys-kernel/spl/spl-9999.ebuild +++ b/sys-kernel/spl/spl-9999.ebuild @@ -71,7 +71,7 @@ src_prepare() { # Set module revision number [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } + { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-${DISTRO}/" "${S}/META" || die "Could not set Gentoo release"; } autotools-utils_src_prepare } diff --git a/sys-libs/binutils-libs/binutils-libs-2.25.1-r2.ebuild b/sys-libs/binutils-libs/binutils-libs-2.25.1-r2.ebuild index 1d0a21c0e19cc..1ef1a08d88320 100644 --- a/sys-libs/binutils-libs/binutils-libs-2.25.1-r2.ebuild +++ b/sys-libs/binutils-libs/binutils-libs-2.25.1-r2.ebuild @@ -41,7 +41,7 @@ src_prepare() { } pkgversion() { - printf "Gentoo ${PVR}" + printf "${DISTRO} ${PVR}" [[ -n ${PATCHVER} ]] && printf " p${PATCHVER}" } @@ -54,7 +54,7 @@ multilib_src_configure() { # Newer versions (>=2.24) make this an explicit option. #497268 --enable-install-libiberty --disable-werror - --with-bugurl="https://bugs.gentoo.org/" + --with-bugurl="${DISTRO_BUG_URL}" --with-pkgversion="$(pkgversion)" $(use_enable static-libs static) # The binutils eclass enables this flag for all bi-arch builds, diff --git a/sys-libs/binutils-libs/binutils-libs-2.27.ebuild b/sys-libs/binutils-libs/binutils-libs-2.27.ebuild index 015a3c901098d..bc13d839340fc 100644 --- a/sys-libs/binutils-libs/binutils-libs-2.27.ebuild +++ b/sys-libs/binutils-libs/binutils-libs-2.27.ebuild @@ -40,7 +40,7 @@ src_prepare() { } pkgversion() { - printf "Gentoo ${PVR}" + printf "${DISTRO} ${PVR}" [[ -n ${PATCHVER} ]] && printf " p${PATCHVER}" } @@ -52,7 +52,7 @@ multilib_src_configure() { # Newer versions (>=2.24) make this an explicit option. #497268 --enable-install-libiberty --disable-werror - --with-bugurl="https://bugs.gentoo.org/" + --with-bugurl="${DISTRO_BUG_URL}" --with-pkgversion="$(pkgversion)" $(use_enable static-libs static) # The binutils eclass enables this flag for all bi-arch builds, diff --git a/www-client/epiphany/epiphany-3.20.3.ebuild b/www-client/epiphany/epiphany-3.20.3.ebuild index e8bcb9eaf9681..de86731834dee 100644 --- a/www-client/epiphany/epiphany-3.20.3.ebuild +++ b/www-client/epiphany/epiphany-3.20.3.ebuild @@ -66,7 +66,7 @@ src_configure() { --disable-nss \ --enable-shared \ --disable-static \ - --with-distributor-name=Gentoo \ + --with-distributor-name="${DISTRO}" \ $(use_enable test tests) } diff --git a/www-client/epiphany/epiphany-3.22.1.ebuild b/www-client/epiphany/epiphany-3.22.1.ebuild index 5654b646db46f..46f09141a57e3 100644 --- a/www-client/epiphany/epiphany-3.22.1.ebuild +++ b/www-client/epiphany/epiphany-3.22.1.ebuild @@ -60,7 +60,7 @@ src_configure() { gnome2_src_configure \ --enable-shared \ --disable-static \ - --with-distributor-name=Gentoo \ + --with-distributor-name="${DISTRO}" \ $(use_enable test tests) } diff --git a/www-client/epiphany/epiphany-3.22.2.ebuild b/www-client/epiphany/epiphany-3.22.2.ebuild index 62c11216648ad..f3f9b3ab0902c 100644 --- a/www-client/epiphany/epiphany-3.22.2.ebuild +++ b/www-client/epiphany/epiphany-3.22.2.ebuild @@ -60,7 +60,7 @@ src_configure() { gnome2_src_configure \ --enable-shared \ --disable-static \ - --with-distributor-name=Gentoo \ + --with-distributor-name="${DISTRO}" \ $(use_enable test tests) } diff --git a/www-client/epiphany/epiphany-3.22.3.ebuild b/www-client/epiphany/epiphany-3.22.3.ebuild index 62c11216648ad..f3f9b3ab0902c 100644 --- a/www-client/epiphany/epiphany-3.22.3.ebuild +++ b/www-client/epiphany/epiphany-3.22.3.ebuild @@ -60,7 +60,7 @@ src_configure() { gnome2_src_configure \ --enable-shared \ --disable-static \ - --with-distributor-name=Gentoo \ + --with-distributor-name="${DISTRO}" \ $(use_enable test tests) } diff --git a/www-client/firefox/firefox-45.4.0.ebuild b/www-client/firefox/firefox-45.4.0.ebuild index 15abe58f39e9d..9774d6ac6fd9d 100644 --- a/www-client/firefox/firefox-45.4.0.ebuild +++ b/www-client/firefox/firefox-45.4.0.ebuild @@ -351,7 +351,7 @@ PROFILE_EOF # very ugly hack to make firefox not sigbus on sparc # FIXME: is this still needed?? - use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \ + use sparc && { sed -e "s/Firefox/Firefox${DISTRO}/g" \ -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" \ || die "sparc sed failed"; } } diff --git a/www-client/firefox/firefox-45.5.0.ebuild b/www-client/firefox/firefox-45.5.0.ebuild index aec960e0115e0..f4df3ea08752a 100644 --- a/www-client/firefox/firefox-45.5.0.ebuild +++ b/www-client/firefox/firefox-45.5.0.ebuild @@ -351,7 +351,7 @@ PROFILE_EOF # very ugly hack to make firefox not sigbus on sparc # FIXME: is this still needed?? - use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \ + use sparc && { sed -e "s/Firefox/Firefox${DISTRO}/g" \ -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" \ || die "sparc sed failed"; } } diff --git a/www-client/firefox/firefox-45.5.1.ebuild b/www-client/firefox/firefox-45.5.1.ebuild index aec960e0115e0..f4df3ea08752a 100644 --- a/www-client/firefox/firefox-45.5.1.ebuild +++ b/www-client/firefox/firefox-45.5.1.ebuild @@ -351,7 +351,7 @@ PROFILE_EOF # very ugly hack to make firefox not sigbus on sparc # FIXME: is this still needed?? - use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \ + use sparc && { sed -e "s/Firefox/Firefox${DISTRO}/g" \ -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" \ || die "sparc sed failed"; } } diff --git a/www-client/firefox/firefox-45.6.0.ebuild b/www-client/firefox/firefox-45.6.0.ebuild index aec960e0115e0..f4df3ea08752a 100644 --- a/www-client/firefox/firefox-45.6.0.ebuild +++ b/www-client/firefox/firefox-45.6.0.ebuild @@ -351,7 +351,7 @@ PROFILE_EOF # very ugly hack to make firefox not sigbus on sparc # FIXME: is this still needed?? - use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \ + use sparc && { sed -e "s/Firefox/Firefox${DISTRO}/g" \ -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" \ || die "sparc sed failed"; } } diff --git a/www-client/firefox/firefox-50.1.0.ebuild b/www-client/firefox/firefox-50.1.0.ebuild index 5306657dd64ec..7919740bf04ed 100644 --- a/www-client/firefox/firefox-50.1.0.ebuild +++ b/www-client/firefox/firefox-50.1.0.ebuild @@ -360,7 +360,7 @@ PROFILE_EOF # very ugly hack to make firefox not sigbus on sparc # FIXME: is this still needed?? - use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \ + use sparc && { sed -e "s/Firefox/Firefox${DISTRO}/g" \ -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" \ || die "sparc sed failed"; } } diff --git a/www-misc/xxv/xxv-1.6.1-r1.ebuild b/www-misc/xxv/xxv-1.6.1-r1.ebuild index b2aa5a813c8d5..523db9c748e85 100644 --- a/www-misc/xxv/xxv-1.6.1-r1.ebuild +++ b/www-misc/xxv/xxv-1.6.1-r1.ebuild @@ -115,7 +115,7 @@ pkg_setup() { src_prepare() { sed -i "${S}"/bin/xxvd \ - -e "s:debian:Gentoo:" \ + -e "s:debian:${DISTRO}:" \ -e "s:/var/log/xxvd.log:/var/log/xxv/xxvd.log:" \ -e "s:/var/run/xxvd.pid:/var/run/xxv/xxvd.pid:" \ -e "s:\$RealBin/../lib:${LIBDIR}:" \ diff --git a/www-servers/cherokee/cherokee-1.2.104.ebuild b/www-servers/cherokee/cherokee-1.2.104.ebuild index 6d4655bbea009..b41089ed8048a 100644 --- a/www-servers/cherokee/cherokee-1.2.104.ebuild +++ b/www-servers/cherokee/cherokee-1.2.104.ebuild @@ -109,7 +109,7 @@ src_configure() { $(use_with ssl libssl) \ --disable-dependency-tracking \ --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ - --enable-os-string="Gentoo ${os}" \ + --enable-os-string="${DISTRO} ${os}" \ --enable-tmpdir="${EPREFIX}/var/tmp" \ --localstatedir="${EPREFIX}/var" \ --with-wwwroot="${EPREFIX}${WEBROOT}/htdocs" \ diff --git a/x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild b/x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild index 35a77f1fe20f8..72a7843fd63c2 100644 --- a/x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild +++ b/x11-base/xorg-server/xorg-server-1.12.4-r5.ebuild @@ -166,7 +166,7 @@ src_configure() { --disable-config-hal --without-dtrace --without-fop - --with-os-vendor=Gentoo + --with-os-vendor="${DISTRO}" ) # Xorg-server requires includes from OS mesa which are not visible for diff --git a/x11-base/xorg-server/xorg-server-1.12.4-r7.ebuild b/x11-base/xorg-server/xorg-server-1.12.4-r7.ebuild index 3f1afa805a83c..7e98584a3183e 100644 --- a/x11-base/xorg-server/xorg-server-1.12.4-r7.ebuild +++ b/x11-base/xorg-server/xorg-server-1.12.4-r7.ebuild @@ -167,7 +167,7 @@ src_configure() { --disable-config-hal --without-dtrace --without-fop - --with-os-vendor=Gentoo + --with-os-vendor="${DISTRO}" ) xorg-2_src_configure diff --git a/x11-base/xorg-server/xorg-server-1.15.2-r2.ebuild b/x11-base/xorg-server/xorg-server-1.15.2-r2.ebuild index d9598b4b3e50a..3defc0c73fe53 100644 --- a/x11-base/xorg-server/xorg-server-1.15.2-r2.ebuild +++ b/x11-base/xorg-server/xorg-server-1.15.2-r2.ebuild @@ -176,7 +176,7 @@ src_configure() { --disable-linux-acpi --without-dtrace --without-fop - --with-os-vendor=Gentoo + --with-os-vendor="${DISTRO}" --with-sha1=libcrypto ) diff --git a/x11-base/xorg-server/xorg-server-1.15.2-r4.ebuild b/x11-base/xorg-server/xorg-server-1.15.2-r4.ebuild index 58313897db2df..ac304f01a8f56 100644 --- a/x11-base/xorg-server/xorg-server-1.15.2-r4.ebuild +++ b/x11-base/xorg-server/xorg-server-1.15.2-r4.ebuild @@ -176,7 +176,7 @@ src_configure() { --disable-linux-acpi --without-dtrace --without-fop - --with-os-vendor=Gentoo + --with-os-vendor="${DISTRO}" --with-sha1=libcrypto ) diff --git a/x11-base/xorg-server/xorg-server-1.16.4-r5.ebuild b/x11-base/xorg-server/xorg-server-1.16.4-r5.ebuild index 4b776aece6656..5d149755f6ee0 100644 --- a/x11-base/xorg-server/xorg-server-1.16.4-r5.ebuild +++ b/x11-base/xorg-server/xorg-server-1.16.4-r5.ebuild @@ -189,7 +189,7 @@ src_configure() { --disable-linux-acpi --without-dtrace --without-fop - --with-os-vendor=Gentoo + --with-os-vendor="${DISTRO}" --with-sha1=libcrypto ) diff --git a/x11-base/xorg-server/xorg-server-1.16.4.ebuild b/x11-base/xorg-server/xorg-server-1.16.4.ebuild index def322f9ea8f4..1ef44b09d0093 100644 --- a/x11-base/xorg-server/xorg-server-1.16.4.ebuild +++ b/x11-base/xorg-server/xorg-server-1.16.4.ebuild @@ -184,7 +184,7 @@ src_configure() { --disable-linux-acpi --without-dtrace --without-fop - --with-os-vendor=Gentoo + --with-os-vendor="${DISTRO}" --with-sha1=libcrypto ) diff --git a/x11-base/xorg-server/xorg-server-1.17.4.ebuild b/x11-base/xorg-server/xorg-server-1.17.4.ebuild index 5bafb33a58d6c..88742aac52a4f 100644 --- a/x11-base/xorg-server/xorg-server-1.17.4.ebuild +++ b/x11-base/xorg-server/xorg-server-1.17.4.ebuild @@ -197,7 +197,7 @@ src_configure() { --disable-linux-acpi --without-dtrace --without-fop - --with-os-vendor=Gentoo + --with-os-vendor="${DISTRO}" --with-sha1=libcrypto ) diff --git a/x11-base/xorg-server/xorg-server-1.18.0.ebuild b/x11-base/xorg-server/xorg-server-1.18.0.ebuild index f72243f3ebb59..5bdfd78d0bc1c 100644 --- a/x11-base/xorg-server/xorg-server-1.18.0.ebuild +++ b/x11-base/xorg-server/xorg-server-1.18.0.ebuild @@ -194,7 +194,7 @@ src_configure() { --disable-linux-acpi --without-dtrace --without-fop - --with-os-vendor=Gentoo + --with-os-vendor="${DISTRO}" --with-sha1=libcrypto ) diff --git a/x11-base/xorg-server/xorg-server-1.18.1.ebuild b/x11-base/xorg-server/xorg-server-1.18.1.ebuild index f72243f3ebb59..5bdfd78d0bc1c 100644 --- a/x11-base/xorg-server/xorg-server-1.18.1.ebuild +++ b/x11-base/xorg-server/xorg-server-1.18.1.ebuild @@ -194,7 +194,7 @@ src_configure() { --disable-linux-acpi --without-dtrace --without-fop - --with-os-vendor=Gentoo + --with-os-vendor="${DISTRO}" --with-sha1=libcrypto ) diff --git a/x11-base/xorg-server/xorg-server-1.18.2.ebuild b/x11-base/xorg-server/xorg-server-1.18.2.ebuild index f72243f3ebb59..5bdfd78d0bc1c 100644 --- a/x11-base/xorg-server/xorg-server-1.18.2.ebuild +++ b/x11-base/xorg-server/xorg-server-1.18.2.ebuild @@ -194,7 +194,7 @@ src_configure() { --disable-linux-acpi --without-dtrace --without-fop - --with-os-vendor=Gentoo + --with-os-vendor="${DISTRO}" --with-sha1=libcrypto ) diff --git a/x11-base/xorg-server/xorg-server-1.18.3.ebuild b/x11-base/xorg-server/xorg-server-1.18.3.ebuild index 06d230312d6e6..4e230356852a0 100644 --- a/x11-base/xorg-server/xorg-server-1.18.3.ebuild +++ b/x11-base/xorg-server/xorg-server-1.18.3.ebuild @@ -194,7 +194,7 @@ src_configure() { --disable-linux-acpi --without-dtrace --without-fop - --with-os-vendor=Gentoo + --with-os-vendor="${DISTRO}" --with-sha1=libcrypto ) diff --git a/x11-base/xorg-server/xorg-server-1.18.4.ebuild b/x11-base/xorg-server/xorg-server-1.18.4.ebuild index 2c6bbb1d7f620..a4ae95766f06a 100644 --- a/x11-base/xorg-server/xorg-server-1.18.4.ebuild +++ b/x11-base/xorg-server/xorg-server-1.18.4.ebuild @@ -194,7 +194,7 @@ src_configure() { --disable-linux-acpi --without-dtrace --without-fop - --with-os-vendor=Gentoo + --with-os-vendor="${DISTRO}" --with-sha1=libcrypto ) diff --git a/x11-base/xorg-server/xorg-server-1.19.0.ebuild b/x11-base/xorg-server/xorg-server-1.19.0.ebuild index 41d4b14422dde..2c481919e66f8 100644 --- a/x11-base/xorg-server/xorg-server-1.19.0.ebuild +++ b/x11-base/xorg-server/xorg-server-1.19.0.ebuild @@ -194,7 +194,7 @@ src_configure() { --disable-linux-acpi --without-dtrace --without-fop - --with-os-vendor=Gentoo + --with-os-vendor="${DISTRO}" --with-sha1=libcrypto ) diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index 95a3ad2f15066..2fb0bdc66883a 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -194,7 +194,7 @@ src_configure() { --disable-linux-acpi --without-dtrace --without-fop - --with-os-vendor=Gentoo + --with-os-vendor="${DISTRO}" --with-sha1=libcrypto ) diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.12.1-r2.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.12.1-r2.ebuild index bf189fb7c7172..0cb53ebec2004 100644 --- a/xfce-base/libxfce4ui/libxfce4ui-4.12.1-r2.ebuild +++ b/xfce-base/libxfce4ui/libxfce4ui-4.12.1-r2.ebuild @@ -37,7 +37,7 @@ pkg_setup() { $(xfconf_use_debug) # requires deprecated glade:3 (gladeui-1.0), bug #551296 --disable-gladeui - --with-vendor-info=Gentoo + --with-vendor-info="${DISTRO}" ) [[ ${CHOST} == *-darwin* ]] && XFCONF+=( --disable-visibility ) #366857 diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.13.0.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.13.0.ebuild index a12d086b3e706..47f4d947235aa 100644 --- a/xfce-base/libxfce4ui/libxfce4ui-4.13.0.ebuild +++ b/xfce-base/libxfce4ui/libxfce4ui-4.13.0.ebuild @@ -41,7 +41,7 @@ pkg_setup() { --disable-gladeui # this one's for :3.10 $(use_enable glade gladeui2) - --with-vendor-info=Gentoo + --with-vendor-info="${DISTRO}" ) [[ ${CHOST} == *-darwin* ]] && XFCONF+=( --disable-visibility ) #366857 diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.13.1.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.13.1.ebuild index 2a913219b5c96..d799309d72f05 100644 --- a/xfce-base/libxfce4ui/libxfce4ui-4.13.1.ebuild +++ b/xfce-base/libxfce4ui/libxfce4ui-4.13.1.ebuild @@ -41,7 +41,7 @@ pkg_setup() { --disable-gladeui # this one's for :3.10 $(use_enable glade gladeui2) - --with-vendor-info=Gentoo + --with-vendor-info="${DISTRO}" ) [[ ${CHOST} == *-darwin* ]] && XFCONF+=( --disable-visibility ) #366857