Galapagos-Linux · awilfox · Dec 14, 2016 · Dec 14, 2016 · Dec 14, 2016 · Dec 14, 2016
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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