diff options
| -rw-r--r-- | net-libs/libpri/ChangeLog | 7 | ||||
| -rw-r--r-- | net-libs/libpri/libpri-1.2.5.ebuild | 30 | ||||
| -rw-r--r-- | net-libs/libpri/libpri-1.4.9.ebuild | 27 |
3 files changed, 28 insertions, 36 deletions
diff --git a/net-libs/libpri/ChangeLog b/net-libs/libpri/ChangeLog index c5dbb8a189ed..e41c7a65f632 100644 --- a/net-libs/libpri/ChangeLog +++ b/net-libs/libpri/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-libs/libpri # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/ChangeLog,v 1.72 2009/03/19 13:07:35 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/ChangeLog,v 1.73 2009/05/17 22:22:58 volkmar Exp $ + + 17 May 2009; Mounir Lamouri <volkmar@gentoo.org> libpri-1.2.5.ebuild, + libpri-1.4.9.ebuild: + Updating ebuilds from voip overlay (mostly cleaning with || die fix, SRC_URI + fix, EAPI-2). 19 Mar 2009; Brent Baude <ranger@gentoo.org> libpri-1.2.5.ebuild: Marking libpri-1.2.5 ppc for bug 250748 diff --git a/net-libs/libpri/libpri-1.2.5.ebuild b/net-libs/libpri/libpri-1.2.5.ebuild index b631d458ae31..d7b01ea5939a 100644 --- a/net-libs/libpri/libpri-1.2.5.ebuild +++ b/net-libs/libpri/libpri-1.2.5.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.2.5.ebuild,v 1.7 2009/03/19 13:07:35 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.2.5.ebuild,v 1.8 2009/05/17 22:22:58 volkmar Exp $ + +EAPI="2" inherit eutils @@ -12,25 +14,22 @@ BRI_VERSION="0.3.0-PRE-1y-h" DESCRIPTION="Primary Rate ISDN (PRI) library" HOMEPAGE="http://www.asterisk.org/" -SRC_URI="http://ftp.digium.com/pub/libpri/releases/${MY_P}.tar.gz +SRC_URI="http://downloads.digium.com/pub/libpri/releases/${MY_P}.tar.gz bri? ( http://www.junghanns.net/downloads/bristuff-${BRI_VERSION}.tar.gz )" # bri? ( http://www.netdomination.org/pub/asterisk/libpri-${PV}-bristuff-${BRI_VERSION}.diff.gz )" -S="${WORKDIR}/${MY_P}" +S=${WORKDIR}/${MY_P} -S_BRI="${WORKDIR}/bristuff-${BRI_VERSION}" +S_BRI=${WORKDIR}/bristuff-${BRI_VERSION} SLOT="0" LICENSE="GPL-2" KEYWORDS="amd64 ppc sparc x86" -src_unpack() { - unpack ${A} - - cd "${S}" - epatch "${FILESDIR}/${PN}-1.2.5-gentoo.diff" - epatch "${FILESDIR}/${P}-multilib.patch" - epatch "${FILESDIR}/${P}-gcc42.patch" +src_prepare() { + epatch "${FILESDIR}"/${PN}-1.2.5-gentoo.diff + epatch "${FILESDIR}"/${P}-multilib.patch + epatch "${FILESDIR}"/${P}-gcc42.patch if use bri; then einfo "Patching libpri w/ BRI stuff (${BRI_VERSION})" @@ -45,12 +44,9 @@ src_unpack() { fi } -src_compile() { - emake || die -} - src_install() { - make INSTALL_PREFIX="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die + emake INSTALL_PREFIX="${D}" LIBDIR="${D}/usr/$(get_libdir)" install \ + || die "emake install failed" - dodoc ChangeLog README TODO + dodoc ChangeLog README TODO || die "dodoc failed" } diff --git a/net-libs/libpri/libpri-1.4.9.ebuild b/net-libs/libpri/libpri-1.4.9.ebuild index 7dea409cebfc..540c6f072db0 100644 --- a/net-libs/libpri/libpri-1.4.9.ebuild +++ b/net-libs/libpri/libpri-1.4.9.ebuild @@ -1,37 +1,28 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.4.9.ebuild,v 1.1 2009/03/10 18:51:15 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.4.9.ebuild,v 1.2 2009/05/17 22:22:58 volkmar Exp $ -inherit eutils - -IUSE="" +EAPI="2" -MY_P="${P/_/-}" +inherit eutils DESCRIPTION="Primary Rate ISDN (PRI) library" HOMEPAGE="http://www.asterisk.org/" -SRC_URI="http://downloads.digium.com/pub/libpri/${MY_P}.tar.gz" - -S="${WORKDIR}/${MY_P}" +SRC_URI="http://downloads.digium.com/pub/${PN}/${P}.tar.gz" SLOT="0" LICENSE="GPL-2" KEYWORDS="~amd64 ~x86 ~ppc ~sparc" +IUSE="" -src_unpack() { - unpack ${A} - - cd "${S}" +src_prepare() { epatch "${FILESDIR}/${P}-respect-cflags.patch" epatch "${FILESDIR}/${P}-multilib.patch" } -src_compile() { - emake || die -} - src_install() { - make INSTALL_PREFIX="${D}" LIBDIR="${D}/usr/$(get_libdir)" install || die + emake INSTALL_PREFIX="${D}" LIBDIR="${D}/usr/$(get_libdir)" install \ + || die "emake install failed" - dodoc ChangeLog README TODO + dodoc ChangeLog README TODO || die "dodoc failed" } |