Consolidate flag respect patching and take care to remove spurious -g. As per arch...

Package-Manager: portage-2.1.10.7/cvs/Linux x86_64

diff --git a/net-libs/libpri/ChangeLog b/net-libs/libpri/ChangeLog
index c86e5f9f9a4622f0fc883e76edff716840b77048..28c6ee39857554c57ef36794e3247547eec384e1 100644 (file)
--- a/net-libs/libpri/ChangeLog
+++ b/net-libs/libpri/ChangeLog
@@ -1,6 +1,13 @@
 # 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.91 2011/07/27 09:04:41 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/ChangeLog,v 1.92 2011/07/27 09:46:10 chainsaw Exp $
+
+*libpri-1.4.12-r1 (27 Jul 2011)
+
+  27 Jul 2011; Tony Vroon <chainsaw@gentoo.org> +libpri-1.4.12-r1.ebuild,
+  +files/libpri-1.4.12-respect-user-flags.patch:
+  Consolidate flag respect patching and take care to remove spurious -g. As per
+  arch test report by Agostino "ago" Sarubbo in bug #376573.
 
   27 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> libpri-1.4.11.4.ebuild,
   libpri-1.4.11.5.ebuild, libpri-1.4.12_beta2.ebuild,

diff --git a/net-libs/libpri/Manifest b/net-libs/libpri/Manifest
index 49c0ad0aeb97435227b5cd93dd4f299c1e2c6ccf..c28d9e9069bf0940e7261f953ff2e1a0e666c16d 100644 (file)
--- a/net-libs/libpri/Manifest
+++ b/net-libs/libpri/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX libpri-1.4.11.1-multilib.patch 2503 RMD160 6d007d94fb6066993acdf1d8d90fa1333b9015c6 SHA1 cedd9e2036d691903c880faf974bc5e7fc4f3360 SHA256 5d13bfec3301b699f936a9a8727c6191d9f1e65ecebe7ddebbab5b1eb5de3880
 AUX libpri-1.4.11.1-respect-cflags.patch 1139 RMD160 8acb09b58d5c124ca86269a7ef3b047e0450df17 SHA1 5a81fab8fd294e1b74b476011348fe68f6ae3847 SHA256 29d89457ce283cd59aa09e7b11fc0e0fd9ea95623702e8b94eac8a3afbccd2b6
@@ -9,6 +9,7 @@ AUX libpri-1.4.12-multilib.patch 2592 RMD160 10309e09d30d930f74befc6308f51567019
 AUX libpri-1.4.12-released-respect-cflags.patch 1380 RMD160 ba669e0feb90be9cc4cb829fbfe1e176e6e3b3e7 SHA1 ee9e86be6dadd3d1e90635750f50b08cebdbc144 SHA256 0d27aeb033f47309ba38bc494664294da2227043c3983d0fabc390b69769154e
 AUX libpri-1.4.12-respect-cflags.patch 1427 RMD160 5b9a7fe0b0b0eb72d89ff054b71f08c62e3873e6 SHA1 10ac792147701021d5a23d0ef620be29c6013646 SHA256 1f053ecece913a00b93d7a508ac4d3e94cd21de45f5eb13937a39dcbf7ac23c0
 AUX libpri-1.4.12-respect-ldflags.patch 397 RMD160 a968b57c0712512d8e728637d3560a6e6e04ed9a SHA1 79d23fce6f343cacdf1f83715a249c55f1aaa7cf SHA256 22c9336e30a323e1fc77121f419de10e5cf55d081fa7d9d550714d5cae8c9da5
+AUX libpri-1.4.12-respect-user-flags.patch 1694 RMD160 364cb3e1de959f3d38b707a38799f446632e66e3 SHA1 98cf49d5521e7353d8e81fe3876c4998d78f829e SHA256 a34e0fd4bef4e6fa28ef76f67edf83586197b8a41660b5594a2ab1a62f4ae9f0
 DIST libpri-1.4.11.4.tar.gz 230748 RMD160 82d2709277a03c569d1f8153f3baedea45d1b5f9 SHA1 5cdb7342d799ea3bda863f0ce680203ccec93ecd SHA256 93332cda6f5eacb18efde21bf3a5e67fcfef79d0f62333239c428ffb8ecbdcca
 DIST libpri-1.4.11.5.tar.gz 235367 RMD160 96673fbb52d93d269bf51306631e93e453071409 SHA1 43dc4037706fb9792be0344c600c18b66fd6578a SHA256 f72f0bbf9115be939ccf24ebd83a3a1482603743dff91952d8afacb16b954e6f
 DIST libpri-1.4.12-beta2.tar.gz 312648 RMD160 c953c66c94695e80d50e9e620d652af985323cbb SHA1 ede623b4ea14c1fd28c8cf29f87b2c56ad356236 SHA256 a2436cb8e4dcfa08edae1b8f54783e79d1201b5fdf84d4e7da631140706c25e6
@@ -16,17 +17,16 @@ DIST libpri-1.4.12-beta3.tar.gz 323534 RMD160 89cc8783de78ca2173320ad56c39110175
 DIST libpri-1.4.12.tar.gz 339669 RMD160 0cfd14463c58c02e30c25e0a42ef2c7e07cd2164 SHA1 20db95cbc358ab5ca83f32f8275d59e60e03d7af SHA256 c0e170a742ed5d19515c99472fe79a467522355b3c24e4f7359d667b7d756e75
 EBUILD libpri-1.4.11.4.ebuild 874 RMD160 42abadd7ad2014958170cec4e27a5b4c27ca27fd SHA1 da4f67ba663a745aff7e7cc05141789b44404cde SHA256 c9723470a2314d0dc9324c2f297dbda49cd84dd9e19b4bd011e580f767aa8c91
 EBUILD libpri-1.4.11.5.ebuild 866 RMD160 c1d3aff641cc6a7dfbae14791bc361818bf308dd SHA1 fc5ca614c977aba009a5adfb25deedf4789d9156 SHA256 9e0db284fe7331872a5242850add6ed6bbfeaf860bc2fb7e45e3db3bf89e968a
+EBUILD libpri-1.4.12-r1.ebuild 801 RMD160 6fbc1bb78741edd2bdb1af4ec2579e5261c0c270 SHA1 9fdffae6938f1335ad141b5ab2e23e03e91a3159 SHA256 ceac2f3c496fdbb2087300a93a1e023ea528ed25a5e7528a096be418ab9f2eab
 EBUILD libpri-1.4.12.ebuild 855 RMD160 a59492aa794190db5230929bd01c6741b757832a SHA1 7e56080de5d0af15341962dce5ef05d52b4422d2 SHA256 983c870aeeece7bdb6c57daa4ba12822c377f996d73a0f6a2e769107a098dd29
 EBUILD libpri-1.4.12_beta2.ebuild 916 RMD160 33974ac7f770f6088af48964e530f90b4aa44151 SHA1 026f6feac01a3974ea80e9e6ade58f2619d45281 SHA256 66165e0777ab849d8a0e86a4bbf5a55b798742e261aa2fc815c3891686c14068
 EBUILD libpri-1.4.12_beta3.ebuild 852 RMD160 a6a623e57818f23292ce3fdf403ea3f32f1c7292 SHA1 64ad81c63504204688c789f2100b81ec3a96ae05 SHA256 81979ecd460e5f4e59ac85cb06312f36f706709e26136797d67059da50577b73
-MISC ChangeLog 15006 RMD160 ea7ae0381e8c94f5b7b9bb00c2a89191ae991cbc SHA1 b3709fda0f323afa45fdb8f5ac2851da63dd577e SHA256 4124bb2023c2e08c99072344e3bc716d240ad16e9081e1d3c086cf35e509c4df
+MISC ChangeLog 15302 RMD160 409f75e125905d0e0c2a4bdff01df3afed5efd8f SHA1 37cffa5417f719bba30077a69bf8e197a6611ee6 SHA256 abcc177b36c385aae8953938bed4bbdbaa5f9435db0923a34c7a9a3b25f42cf0
 MISC metadata.xml 257 RMD160 310ad9c194b37abe9bb814131148f5cc78c77625 SHA1 9f8b9263984b3fca531dcd3c859b0f0945d9920f SHA256 ad64812c2b7c47f6071002a0d7614aff3d4ba8349958093745d0a637b265d23b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk4v1LMACgkQIiMqcbOVdxT3OQP/S6r7FoKkjq8cBwPMSuuE4nDc
-Qd3+kCURnBbjfBcCliKxw7km+JWWJc2A0zOrMVbyudA0Kv3XSy5vzD062p3JntId
-Cm66Mt1uFrW5ouEfhvalDEBcVVxwlpN/977kOQ3/poTxIZ5vLOwPZsCao99AaPMx
-zWizg/dIh0XoMZn7x2Y=
-=bJat
+iEYEARECAAYFAk4v3mgACgkQp5vW4rUFj5puAwCgobOAi7yuSS48eE0loRpbXkl4
+lt8AoJwia43UWWa96xBcYYFhPV5/hpyg
+=+0qP
 -----END PGP SIGNATURE-----

diff --git a/net-libs/libpri/files/libpri-1.4.12-respect-user-flags.patch b/net-libs/libpri/files/libpri-1.4.12-respect-user-flags.patch
new file mode 100644 (file)
index 0000000..dd5b285
--- /dev/null
+++ b/net-libs/libpri/files/libpri-1.4.12-respect-user-flags.patch
@@ -0,0 +1,47 @@
+diff -uNr libpri-1.4.12.ORIG//Makefile libpri-1.4.12/Makefile
+--- libpri-1.4.12.ORIG//Makefile       2011-07-27 10:37:34.247793740 +0100
++++ libpri-1.4.12/Makefile     2011-07-27 10:38:54.183790788 +0100
+@@ -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 -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)
+@@ -216,7 +208,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.12-r1.ebuild b/net-libs/libpri/libpri-1.4.12-r1.ebuild
new file mode 100644 (file)
index 0000000..858853a
--- /dev/null
+++ b/net-libs/libpri/libpri-1.4.12-r1.ebuild
@@ -0,0 +1,31 @@
+# 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-r1.ebuild,v 1.1 2011/07/27 09:46:10 chainsaw 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-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"
+}