summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Vroon <chainsaw@gentoo.org>2011-08-17 10:27:06 +0000
committerTony Vroon <chainsaw@gentoo.org>2011-08-17 10:27:06 +0000
commitfc0eb34f8c2625996c9a134dec9e950476416ef8 (patch)
tree76bcd18acf6736bd966fe61f98def3402288229b /net-libs/libpri
parentLatest upstream fixes (diff)
downloadgentoo-2-fc0eb34f8c2625996c9a134dec9e950476416ef8.tar.gz
gentoo-2-fc0eb34f8c2625996c9a134dec9e950476416ef8.tar.bz2
gentoo-2-fc0eb34f8c2625996c9a134dec9e950476416ef8.zip
Incorporate USE="static-libs" functionality and bump to EAPI 4 as suggested by Agostino "ago" Sarubbo in bug #377603. Remove old ebuilds & patches.
(Portage version: 2.1.10.11/cvs/Linux x86_64)
Diffstat (limited to 'net-libs/libpri')
-rw-r--r--net-libs/libpri/ChangeLog17
-rw-r--r--net-libs/libpri/files/libpri-1.4.11.1-multilib.patch52
-rw-r--r--net-libs/libpri/files/libpri-1.4.11.1-respect-cflags.patch29
-rw-r--r--net-libs/libpri/files/libpri-1.4.11.1-respect-ldflags.patch12
-rw-r--r--net-libs/libpri/files/libpri-1.4.11.1-werror-is-ill-advised.patch12
-rw-r--r--net-libs/libpri/files/libpri-1.4.12-released-respect-cflags.patch37
-rw-r--r--net-libs/libpri/files/libpri-1.4.12-respect-cflags.patch37
-rw-r--r--net-libs/libpri/files/libpri-1.4.12-respect-ldflags.patch11
-rw-r--r--net-libs/libpri/libpri-1.4.11.4.ebuild31
-rw-r--r--net-libs/libpri/libpri-1.4.11.5.ebuild29
-rw-r--r--net-libs/libpri/libpri-1.4.12-r2.ebuild (renamed from net-libs/libpri/libpri-1.4.12_beta3.ebuild)16
-rw-r--r--net-libs/libpri/libpri-1.4.12.ebuild32
-rw-r--r--net-libs/libpri/libpri-1.4.12_beta2.ebuild33
13 files changed, 23 insertions, 325 deletions
diff --git a/net-libs/libpri/ChangeLog b/net-libs/libpri/ChangeLog
index c220fd6eb6d2..1d387dfb4468 100644
--- a/net-libs/libpri/ChangeLog
+++ b/net-libs/libpri/ChangeLog
@@ -1,6 +1,21 @@
# ChangeLog for net-libs/libpri
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/ChangeLog,v 1.94 2011/08/07 15:25:51 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/ChangeLog,v 1.95 2011/08/17 10:27:06 chainsaw Exp $
+
+*libpri-1.4.12-r2 (17 Aug 2011)
+
+ 17 Aug 2011; Tony Vroon <chainsaw@gentoo.org>
+ -files/libpri-1.4.11.1-multilib.patch,
+ -files/libpri-1.4.11.1-respect-cflags.patch,
+ -files/libpri-1.4.11.1-respect-ldflags.patch,
+ -files/libpri-1.4.11.1-werror-is-ill-advised.patch, -libpri-1.4.11.4.ebuild,
+ -libpri-1.4.11.5.ebuild, -libpri-1.4.12_beta2.ebuild,
+ -libpri-1.4.12_beta3.ebuild, -libpri-1.4.12.ebuild, +libpri-1.4.12-r2.ebuild,
+ -files/libpri-1.4.12-released-respect-cflags.patch,
+ -files/libpri-1.4.12-respect-cflags.patch,
+ -files/libpri-1.4.12-respect-ldflags.patch:
+ Incorporate USE="static-libs" functionality and bump to EAPI 4 as suggested
+ by Agostino "ago" Sarubbo in bug #377603. Remove old ebuilds & patches.
07 Aug 2011; Markus Meier <maekke@gentoo.org> libpri-1.4.12-r1.ebuild:
x86 stable, bug #376573
diff --git a/net-libs/libpri/files/libpri-1.4.11.1-multilib.patch b/net-libs/libpri/files/libpri-1.4.11.1-multilib.patch
deleted file mode 100644
index b95b9702d9f8..000000000000
--- a/net-libs/libpri/files/libpri-1.4.11.1-multilib.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -uNr libpri-1.4.11.ORIG/Makefile libpri-1.4.11/Makefile
---- libpri-1.4.11.ORIG/Makefile 2009-03-10 18:08:07.000000000 +0000
-+++ libpri-1.4.11/Makefile 2009-03-10 18:11:24.000000000 +0000
-@@ -86,7 +86,7 @@
- CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(LIBPRI_OPT)
- INSTALL_PREFIX=$(DESTDIR)
- INSTALL_BASE=/usr
--libdir?=$(INSTALL_BASE)/lib
-+LIBDIR=$(INSTALL_PREFIX)$(INSTALL_BASE)/lib
- SOFLAGS:=-Wl,-h$(DYNAMIC_LIBRARY)
- LDCONFIG = /sbin/ldconfig
- ifneq (,$(findstring X$(OSARCH)X, XLinuxX XGNU/kFreeBSDX XGNUX))
-@@ -135,27 +135,27 @@
- fi
-
- install: $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
-- mkdir -p $(INSTALL_PREFIX)$(libdir)
-+ mkdir -p $(LIBDIR)
- mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include
- ifneq (${OSARCH},SunOS)
- install -m 644 libpri.h $(INSTALL_PREFIX)$(INSTALL_BASE)/include
-- install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(libdir)
-- #if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then /sbin/restorecon -v $(INSTALL_PREFIX)$(libdir)/$(DYNAMIC_LIBRARY); fi
-- ( cd $(INSTALL_PREFIX)$(libdir) ; ln -sf libpri.so.$(SONAME) libpri.so)
-- install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(libdir)
-- if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(INSTALL_PREFIX)$(libdir); fi
-+ install -m 755 $(DYNAMIC_LIBRARY) $(LIBDIR)
-+ if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then /sbin/restorecon -v $(LIBDIR)/$(DYNAMIC_LIBRARY); fi
-+ ( cd $(LIBDIR) ; ln -sf libpri.so.$(SONAME) libpri.so)
-+ install -m 644 $(STATIC_LIBRARY) $(LIBDIR)
-+ if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(LIBDIR); fi
- else
- install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h
-- install -f $(INSTALL_PREFIX)$(libdir) -m 755 $(DYNAMIC_LIBRARY)
-- ( cd $(INSTALL_PREFIX)$(libdir) ; ln -sf libpri.so.$(SONAME) libpri.so)
-- install -f $(INSTALL_PREFIX)$(libdir) -m 644 $(STATIC_LIBRARY)
-+ install -f $(LIBDIR) -m 755 $(DYNAMIC_LIBRARY)
-+ ( cd $(LIBDIR) ; ln -sf libpri.so.$(SONAME) libpri.so)
-+ install -f $(LIBDIR) -m 644 $(STATIC_LIBRARY)
- endif
-
- uninstall:
- @echo "Removing Libpri"
-- rm -f $(INSTALL_PREFIX)$(libdir)/libpri.so.$(SONAME)
-- rm -f $(INSTALL_PREFIX)$(libdir)/libpri.so
-- rm -f $(INSTALL_PREFIX)$(libdir)/libpri.a
-+ rm -f $(LIBDIR)/libpri.so.$(SONAME)
-+ rm -f $(LIBDIR)/libpri.so
-+ rm -f $(LIBDIR)/libpri.a
- rm -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include/libpri.h
-
- pritest: pritest.o
diff --git a/net-libs/libpri/files/libpri-1.4.11.1-respect-cflags.patch b/net-libs/libpri/files/libpri-1.4.11.1-respect-cflags.patch
deleted file mode 100644
index b6a4db487747..000000000000
--- a/net-libs/libpri/files/libpri-1.4.11.1-respect-cflags.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -uNr libpri-1.4.11.ORIG/Makefile libpri-1.4.11/Makefile
---- libpri-1.4.11.ORIG/Makefile 2009-03-10 17:43:45.000000000 +0000
-+++ libpri-1.4.11/Makefile 2009-03-10 17:44:00.000000000 +0000
-@@ -83,7 +83,7 @@
- rose_qsig_mwi.lo \
- rose_qsig_name.lo \
- version.lo
--CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(LIBPRI_OPT)
-+CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(LIBPRI_OPT)
- INSTALL_PREFIX=$(DESTDIR)
- INSTALL_BASE=/usr
- libdir?=$(INSTALL_BASE)/lib
-@@ -108,16 +108,7 @@
- export PRIVERSION
-
- PRIVERSION:=$(shell GREP=$(GREP) AWK=$(AWK) build_tools/make_version .)
--
--#The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
--#This works for even old (2.96) versions of gcc and provides a small boost either way.
--#A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesnt support it.
--ifeq ($(PROC),sparc64)
--PROC=ultrasparc
--LIBPRI_OPT = -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
--else
- LIBPRI_OPT = -O2
--endif
-
- ifeq ($(CPUARCH),i686)
- CFLAGS += -m32
diff --git a/net-libs/libpri/files/libpri-1.4.11.1-respect-ldflags.patch b/net-libs/libpri/files/libpri-1.4.11.1-respect-ldflags.patch
deleted file mode 100644
index 778496faef2b..000000000000
--- a/net-libs/libpri/files/libpri-1.4.11.1-respect-ldflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr libpri-1.4.11.ORIG/Makefile libpri-1.4.11/Makefile
---- libpri-1.4.11.ORIG/Makefile 2009-12-08 22:55:12.729738494 +0000
-+++ libpri-1.4.11/Makefile 2009-12-08 22:55:58.645775496 +0000
-@@ -186,7 +186,7 @@
- ranlib $(STATIC_LIBRARY)
-
- $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
-- $(CC) -shared $(SOFLAGS) -o $@ $(DYNAMIC_OBJS)
-+ $(CC) -shared $(SOFLAGS) $(LDFLAGS) -o $@ $(DYNAMIC_OBJS)
- $(LDCONFIG) $(LDCONFIG_FLAGS) .
- ln -sf libpri.so.$(SONAME) libpri.so
-
diff --git a/net-libs/libpri/files/libpri-1.4.11.1-werror-is-ill-advised.patch b/net-libs/libpri/files/libpri-1.4.11.1-werror-is-ill-advised.patch
deleted file mode 100644
index c0e2d9893b35..000000000000
--- a/net-libs/libpri/files/libpri-1.4.11.1-werror-is-ill-advised.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr libpri-1.4.11.1.ORIG//Makefile libpri-1.4.11.1/Makefile
---- libpri-1.4.11.1.ORIG//Makefile 2010-06-07 10:59:44.000000000 +0100
-+++ libpri-1.4.11.1/Makefile 2010-06-07 10:59:52.000000000 +0100
-@@ -83,7 +83,7 @@
- rose_qsig_mwi.lo \
- rose_qsig_name.lo \
- version.lo
--CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(LIBPRI_OPT)
-+CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(LIBPRI_OPT)
- INSTALL_PREFIX=$(DESTDIR)
- INSTALL_BASE=/usr
- LIBDIR=$(INSTALL_PREFIX)$(INSTALL_BASE)/lib
diff --git a/net-libs/libpri/files/libpri-1.4.12-released-respect-cflags.patch b/net-libs/libpri/files/libpri-1.4.12-released-respect-cflags.patch
deleted file mode 100644
index 560bd34bcff0..000000000000
--- a/net-libs/libpri/files/libpri-1.4.12-released-respect-cflags.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- libpri-1.4.12/Makefile.orig 2011-07-07 16:18:34.185504616 +0200
-+++ libpri-1.4.12/Makefile 2011-07-07 16:32:09.095312715 +0200
-@@ -90,7 +90,7 @@
- rose_qsig_mwi.lo \
- rose_qsig_name.lo \
- version.lo
--CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS)
-+CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_OPT) $(COVERAGE_CFLAGS)
- INSTALL_PREFIX=$(DESTDIR)
- INSTALL_BASE=/usr
- LIBDIR=$(INSTALL_PREFIX)$(INSTALL_BASE)/lib
-@@ -124,20 +124,12 @@
-
- PRIVERSION:=$(shell GREP=$(GREP) AWK=$(AWK) build_tools/make_version .)
-
--#The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
--#This works for even old (2.96) versions of gcc and provides a small boost either way.
--#A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesnt support it.
--ifeq ($(PROC),sparc64)
--PROC=ultrasparc
--LIBPRI_OPT = -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
-+ifneq ($(CODE_COVERAGE),)
-+ LIBPRI_OPT=
-+ COVERAGE_CFLAGS=-ftest-coverage -fprofile-arcs
-+ COVERAGE_LDFLAGS=-ftest-coverage -fprofile-arcs
- else
-- ifneq ($(CODE_COVERAGE),)
-- LIBPRI_OPT=
-- COVERAGE_CFLAGS=-ftest-coverage -fprofile-arcs
-- COVERAGE_LDFLAGS=-ftest-coverage -fprofile-arcs
-- else
-- LIBPRI_OPT=-O2
-- endif
-+ LIBPRI_OPT=
- endif
-
- ifeq ($(CPUARCH),i686)
diff --git a/net-libs/libpri/files/libpri-1.4.12-respect-cflags.patch b/net-libs/libpri/files/libpri-1.4.12-respect-cflags.patch
deleted file mode 100644
index bad39bd62471..000000000000
--- a/net-libs/libpri/files/libpri-1.4.12-respect-cflags.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- libpri-1.4.12-beta3/Makefile.orig 2010-11-23 22:06:06.768618707 +0100
-+++ libpri-1.4.12-beta3/Makefile 2010-11-23 22:07:41.328444833 +0100
-@@ -93,7 +93,7 @@
- rose_qsig_mwi.lo \
- rose_qsig_name.lo \
- version.lo
--CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(LIBPRI_OPT) $(COVERAGE_CFLAGS)
-+CFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(LIBPRI_OPT) $(COVERAGE_CFLAGS)
- INSTALL_PREFIX=$(DESTDIR)
- INSTALL_BASE=/usr
- LIBDIR=$(INSTALL_PREFIX)$(INSTALL_BASE)/lib
-@@ -127,20 +127,12 @@
-
- PRIVERSION:=$(shell GREP=$(GREP) AWK=$(AWK) build_tools/make_version .)
-
--#The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
--#This works for even old (2.96) versions of gcc and provides a small boost either way.
--#A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesnt support it.
--ifeq ($(PROC),sparc64)
--PROC=ultrasparc
--LIBPRI_OPT = -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
-+ifneq ($(CODE_COVERAGE),)
-+ LIBPRI_OPT=
-+ COVERAGE_CFLAGS=-ftest-coverage -fprofile-arcs
-+ COVERAGE_LDFLAGS=-ftest-coverage -fprofile-arcs
- else
-- ifneq ($(CODE_COVERAGE),)
-- LIBPRI_OPT=
-- COVERAGE_CFLAGS=-ftest-coverage -fprofile-arcs
-- COVERAGE_LDFLAGS=-ftest-coverage -fprofile-arcs
-- else
-- LIBPRI_OPT=-O2
-- endif
-+ LIBPRI_OPT=
- endif
-
- ifeq ($(CPUARCH),i686)
diff --git a/net-libs/libpri/files/libpri-1.4.12-respect-ldflags.patch b/net-libs/libpri/files/libpri-1.4.12-respect-ldflags.patch
deleted file mode 100644
index 14ad22e83191..000000000000
--- a/net-libs/libpri/files/libpri-1.4.12-respect-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libpri-1.4.12-beta3/Makefile.orig 2010-11-23 22:08:35.749769167 +0100
-+++ libpri-1.4.12-beta3/Makefile 2010-11-23 22:10:01.036710213 +0100
-@@ -211,7 +211,7 @@
- ranlib $(STATIC_LIBRARY)
-
- $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
-- $(CC) $(SOFLAGS) -o $@ $(DYNAMIC_OBJS)
-+ $(CC) $(SOFLAGS) $(LDFLAGS) -o $@ $(DYNAMIC_OBJS)
- $(LDCONFIG) $(LDCONFIG_FLAGS) .
- ln -sf libpri.so.$(SONAME) libpri.so
-
diff --git a/net-libs/libpri/libpri-1.4.11.4.ebuild b/net-libs/libpri/libpri-1.4.11.4.ebuild
deleted file mode 100644
index 75106ded6c7f..000000000000
--- a/net-libs/libpri/libpri-1.4.11.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.4.11.4.ebuild,v 1.4 2011/07/27 09:04:41 xarthisius Exp $
-
-EAPI="3"
-
-EAPI=3
-inherit base
-
-DESCRIPTION="Primary Rate ISDN (PRI) library"
-HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="http://downloads.asterisk.org/pub/telephony/${PN}/releases/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~sparc x86"
-IUSE=""
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.4.11.1-multilib.patch"
- "${FILESDIR}/${PN}-1.4.11.1-respect-cflags.patch"
- "${FILESDIR}/${PN}-1.4.11.1-respect-ldflags.patch"
- "${FILESDIR}/${PN}-1.4.11.1-werror-is-ill-advised.patch"
-)
-
-src_install() {
- emake INSTALL_PREFIX="${D}" LIBDIR="${D}/usr/$(get_libdir)" install \
- || die "emake install failed"
-
- dodoc ChangeLog README TODO || die "dodoc failed"
-}
diff --git a/net-libs/libpri/libpri-1.4.11.5.ebuild b/net-libs/libpri/libpri-1.4.11.5.ebuild
deleted file mode 100644
index 2a73156bb09e..000000000000
--- a/net-libs/libpri/libpri-1.4.11.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.4.11.5.ebuild,v 1.2 2011/07/27 09:04:41 xarthisius Exp $
-
-EAPI=3
-inherit base
-
-DESCRIPTION="Primary Rate ISDN (PRI) library"
-HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="http://downloads.asterisk.org/pub/telephony/${PN}/releases/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.4.11.1-multilib.patch"
- "${FILESDIR}/${PN}-1.4.11.1-respect-cflags.patch"
- "${FILESDIR}/${PN}-1.4.11.1-respect-ldflags.patch"
- "${FILESDIR}/${PN}-1.4.11.1-werror-is-ill-advised.patch"
-)
-
-src_install() {
- emake INSTALL_PREFIX="${D}" LIBDIR="${D}/usr/$(get_libdir)" install \
- || die "emake install failed"
-
- dodoc ChangeLog README TODO || die "dodoc failed"
-}
diff --git a/net-libs/libpri/libpri-1.4.12_beta3.ebuild b/net-libs/libpri/libpri-1.4.12-r2.ebuild
index 85a4ce59d2aa..4eeb32d6c39e 100644
--- a/net-libs/libpri/libpri-1.4.12_beta3.ebuild
+++ b/net-libs/libpri/libpri-1.4.12-r2.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.4.12_beta3.ebuild,v 1.2 2011/07/27 09:04:41 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.4.12-r2.ebuild,v 1.1 2011/08/17 10:27:06 chainsaw Exp $
-EAPI="3"
+EAPI="4"
inherit base
@@ -16,17 +16,15 @@ SRC_URI="http://downloads.asterisk.org/pub/telephony/${PN}/releases/${MY_P}.tar.
SLOT="0"
LICENSE="GPL-2"
KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
+IUSE="static-libs"
PATCHES=(
"${FILESDIR}/${PN}-1.4.12-multilib.patch"
- "${FILESDIR}/${PN}-1.4.12-respect-cflags.patch"
- "${FILESDIR}/${PN}-1.4.12-respect-ldflags.patch"
+ "${FILESDIR}/${PN}-1.4.12-respect-user-flags.patch"
)
src_install() {
- emake INSTALL_PREFIX="${D}" LIBDIR="${D}/usr/$(get_libdir)" install \
- || die "emake install failed"
-
- dodoc ChangeLog README TODO || die "dodoc failed"
+ emake INSTALL_PREFIX="${D}" LIBDIR="${D}/usr/$(get_libdir)" install
+ use static-libs || find "${D}" -name '*.a' -delete
+ dodoc ChangeLog README TODO
}
diff --git a/net-libs/libpri/libpri-1.4.12.ebuild b/net-libs/libpri/libpri-1.4.12.ebuild
deleted file mode 100644
index cacb5da7516f..000000000000
--- a/net-libs/libpri/libpri-1.4.12.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.4.12.ebuild,v 1.2 2011/07/27 09:04:41 xarthisius Exp $
-
-EAPI="3"
-
-inherit base
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Primary Rate ISDN (PRI) library"
-HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="http://downloads.asterisk.org/pub/telephony/${PN}/releases/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.4.12-multilib.patch"
- "${FILESDIR}/${PN}-1.4.12-released-respect-cflags.patch"
- "${FILESDIR}/${PN}-1.4.12-respect-ldflags.patch"
-)
-
-src_install() {
- emake INSTALL_PREFIX="${D}" LIBDIR="${D}/usr/$(get_libdir)" install \
- || die "emake install failed"
-
- dodoc ChangeLog README TODO || die "dodoc failed"
-}
diff --git a/net-libs/libpri/libpri-1.4.12_beta2.ebuild b/net-libs/libpri/libpri-1.4.12_beta2.ebuild
deleted file mode 100644
index e5a17225e446..000000000000
--- a/net-libs/libpri/libpri-1.4.12_beta2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.4.12_beta2.ebuild,v 1.2 2011/07/27 09:04:41 xarthisius Exp $
-
-EAPI="3"
-
-inherit base
-
-MY_P="${P/_/-}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Primary Rate ISDN (PRI) library"
-HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="http://downloads.asterisk.org/pub/telephony/${PN}/releases/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE=""
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.4.11.1-multilib.patch"
- "${FILESDIR}/${PN}-1.4.11.1-respect-cflags.patch"
- "${FILESDIR}/${PN}-1.4.11.1-respect-ldflags.patch"
- "${FILESDIR}/${PN}-1.4.11.1-werror-is-ill-advised.patch"
-)
-
-src_install() {
- emake INSTALL_PREFIX="${D}" LIBDIR="${D}/usr/$(get_libdir)" install \
- || die "emake install failed"
-
- dodoc ChangeLog README TODO || die "dodoc failed"
-}