commit: 83726af5c28885e3b68bc82959b2f730409b4cc5 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Sat Feb 18 12:51:57 2017 +0000 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Sat Feb 18 12:52:11 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83726af5
net-print/cups: Restore prefix compatibility, bug 597728 Package-Manager: Portage-2.3.3, Repoman-2.3.1 net-print/cups/{cups-9999.ebuild => cups-2.2.2-r3.ebuild} | 8 +++++++- net-print/cups/cups-9999.ebuild | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-2.2.2-r3.ebuild similarity index 95% copy from net-print/cups/cups-9999.ebuild copy to net-print/cups/cups-2.2.2-r3.ebuild index 24b53a61b1..1257737e2e 100644 --- a/net-print/cups/cups-9999.ebuild +++ b/net-print/cups/cups-2.2.2-r3.ebuild @@ -191,7 +191,7 @@ multilib_src_configure() { --with-docdir="${EPREFIX}"/usr/share/cups/html \ --with-languages="${LINGUAS}" \ --with-system-groups=lpadmin \ - --with-xinetd=/etc/xinetd.d \ + --with-xinetd="${EPREFIX}"/etc/xinetd.d \ $(multilib_native_use_enable acl) \ $(use_enable dbus) \ $(use_enable debug) \ @@ -218,6 +218,12 @@ multilib_src_configure() { sed -i -e "s:SERVERBIN.*:SERVERBIN = \"\$\(BUILDROOT\)${EPREFIX}/usr/libexec/cups\":" Makedefs || die sed -i -e "s:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN \"${EPREFIX}/usr/libexec/cups\":" config.h || die sed -i -e "s:cups_serverbin=.*:cups_serverbin=\"${EPREFIX}/usr/libexec/cups\":" cups-config || die + + # additional path corrections needed for prefix, see bug 597728 + sed -i -e "s:ICONDIR.*:ICONDIR = ${EPREFIX}/usr/share/icons:" Makedefs || die + sed -i -e "s:INITDIR.*:INITDIR = ${EPREFIX}/etc:" Makedefs || die + sed -i -e "s:DBUSDIR.*:DBUSDIR = ${EPREFIX}/etc/dbus-1:" Makedefs || die + sed -i -e "s:MENUDIR.*:MENUDIR = ${EPREFIX}/usr/share/applications:" Makedefs || die } multilib_src_compile() { diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild index 24b53a61b1..1257737e2e 100644 --- a/net-print/cups/cups-9999.ebuild +++ b/net-print/cups/cups-9999.ebuild @@ -191,7 +191,7 @@ multilib_src_configure() { --with-docdir="${EPREFIX}"/usr/share/cups/html \ --with-languages="${LINGUAS}" \ --with-system-groups=lpadmin \ - --with-xinetd=/etc/xinetd.d \ + --with-xinetd="${EPREFIX}"/etc/xinetd.d \ $(multilib_native_use_enable acl) \ $(use_enable dbus) \ $(use_enable debug) \ @@ -218,6 +218,12 @@ multilib_src_configure() { sed -i -e "s:SERVERBIN.*:SERVERBIN = \"\$\(BUILDROOT\)${EPREFIX}/usr/libexec/cups\":" Makedefs || die sed -i -e "s:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN \"${EPREFIX}/usr/libexec/cups\":" config.h || die sed -i -e "s:cups_serverbin=.*:cups_serverbin=\"${EPREFIX}/usr/libexec/cups\":" cups-config || die + + # additional path corrections needed for prefix, see bug 597728 + sed -i -e "s:ICONDIR.*:ICONDIR = ${EPREFIX}/usr/share/icons:" Makedefs || die + sed -i -e "s:INITDIR.*:INITDIR = ${EPREFIX}/etc:" Makedefs || die + sed -i -e "s:DBUSDIR.*:DBUSDIR = ${EPREFIX}/etc/dbus-1:" Makedefs || die + sed -i -e "s:MENUDIR.*:MENUDIR = ${EPREFIX}/usr/share/applications:" Makedefs || die } multilib_src_compile() {