Author: Nathan Phillip Brink Description: Attempst to hackily fix libixp's installations paths for multilib systems. URL: https://bugs.gentoo.org/309095 diff -r c3f7b4baeed2 sys-libs/libixp/libixp-0.2-r1.ebuild --- a/sys-libs/libixp/libixp-0.2-r1.ebuild Thu Mar 11 21:59:32 2010 -0500 +++ b/sys-libs/libixp/libixp-0.2-r1.ebuild Thu Mar 11 23:09:24 2010 -0500 @@ -2,7 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-libs/libixp/libixp-0.2-r1.ebuild,v 1.7 2007/11/19 03:59:15 omp Exp $ -inherit eutils toolchain-funcs +EAPI="2" + +inherit base eutils multilib toolchain-funcs DESCRIPTION="Standalone client/server 9P library" HOMEPAGE="http://libs.suckless.org/" @@ -16,10 +18,7 @@ DEPEND="!>=sys-libs/libixp-0.4" RDEPEND="" -src_unpack() { - unpack ${A} - cd "${S}" - +src_prepare() { epatch "${FILESDIR}/libixp-0.2-shared-object.patch" sed -i \ @@ -29,9 +28,19 @@ -e "/^AR/s|=.*|= $(tc-getAR) cr|" \ -e "/^CC/s|=.*|= $(tc-getCC)|" \ -e "/^RANLIB/s|=.*|= $(tc-getRANLIB)|" \ + -e "/^LIBS/iLIBDIR = \$(PREFIX)/$(get_libdir)" \ + -e "/^LIBS =/s|-L/usr/lib|-L\$(LIBDIR)|" \ config.mk || die "sed failed" + + sed -i \ + -e 's|${PREFIX}/lib|${LIBDIR}|g' \ + Makefile || die "sed failed" +} + +src_compile() { + emake -j1 || die "emake failed" } src_install() { - emake DESTDIR="${D}" install || die "emake install failed" + emake -j1 DESTDIR="${D}" install || die "emake install failed" } diff -r c3f7b4baeed2 sys-libs/libixp/libixp-0.4.ebuild --- a/sys-libs/libixp/libixp-0.4.ebuild Thu Mar 11 21:59:32 2010 -0500 +++ b/sys-libs/libixp/libixp-0.4.ebuild Thu Mar 11 23:09:24 2010 -0500 @@ -2,7 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-libs/libixp/libixp-0.4.ebuild,v 1.1 2007/11/18 05:44:12 omp Exp $ -inherit toolchain-funcs +EAPI="2" + +inherit base multilib toolchain-funcs DESCRIPTION="Standalone client/server 9P library" HOMEPAGE="http://libs.suckless.org/" @@ -16,16 +18,22 @@ DEPEND="" RDEPEND="" -src_unpack() { - unpack ${A} - cd "${S}" - +src_prepare() { sed -i \ -e "/^PREFIX/s|=.*|= ${D}/usr|" \ -e "/^ETC/s|=.*|= ${D}/etc|" \ -e "/^CFLAGS/s|=|+=|" \ -e "/^LDFLAGS/s|=|+=|" \ + -e "/LIBDIR =/s|/lib|/$(get_libdir)|" \ + -e "/^LIBS =/s|-L/usr/lib|-L\$(LIBDIR)|" \ config.mk || die "sed failed" + + sed -i \ + -e '/^PTARG/s|${ROOT}/lib/||' \ + mk/lib.mk || die "sed failed" + sed -i \ + -e '/^LIB/s|/lib/|/libixp/|' \ + cmd/Makefile || die "sed failed" } src_compile() { diff -r c3f7b4baeed2 sys-libs/libixp/libixp-0.5.ebuild --- a/sys-libs/libixp/libixp-0.5.ebuild Thu Mar 11 21:59:32 2010 -0500 +++ b/sys-libs/libixp/libixp-0.5.ebuild Thu Mar 11 23:09:24 2010 -0500 @@ -2,6 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-libs/libixp/libixp-0.5.ebuild,v 1.1 2009/07/11 11:12:37 omp Exp $ +EAPI="2" + +inherit base multilib + DESCRIPTION="Standalone client/server 9P library" HOMEPAGE="http://libs.suckless.org/libixp" SRC_URI="http://code.suckless.org/dl/libs/${P}.tar.gz" @@ -14,15 +18,13 @@ DEPEND="" RDEPEND="" -src_unpack() { - unpack ${A} - cd "${S}" - +src_prepare() { sed -i \ -e "/^PREFIX/s|=.*|= ${D}/usr|" \ -e "/^ ETC/s|=.*|= ${D}/etc|" \ -e "/^CFLAGS/s|=|+=|" \ -e "/^LDFLAGS/s|=|+=|" \ + -e "/LIBDIR =/s|/lib|/$(get_libdir)|" \ config.mk || die "sed failed" }