Author: Nathan Phillip Brink Description: Upgrade to EAPI=2, move some stuff into src_prepare(), apply the libdir patch for bug 343461, inherit all used eclasses to ensure that functionality doesn't change. --- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.3.ebuild Sat Oct 30 22:27:07 2010 -0400 +++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.3.ebuild Sun Oct 31 01:46:03 2010 -0400 @@ -5,7 +5,9 @@ # Must be before x-modular eclass is inherited # SNAPSHOT="yes" -inherit x-modular +EAPI=2 + +inherit eutils multilib x-modular DESCRIPTION="Old Imake-related build files" KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" @@ -14,8 +16,15 @@ RDEPEND="" DEPEND="${RDEPEND}" +src_prepare() { + epatch "${FILESDIR}"/${P}-libdir.patch + + sed -i \ + -e "s/LibDirName *lib\$/LibDirName $(get_libdir)/" \ + Imake.tmpl || die "failed LibDirName sed" +} + src_install() { x-modular_src_install - echo "#define ManDirectoryRoot /usr/share/man" >> ${D}/usr/$(get_libdir)/X11/config/host.def - sed -i -e "s/LibDirName *lib$/LibDirName $(get_libdir)/" "${D}"/usr/$(get_libdir)/X11/config/Imake.tmpl || die "failed libdir sed" + echo "#define ManDirectoryRoot /usr/share/man" >> ${D}/usr/$(get_libdir)/X11/config/host.def || die }