Version bumped and removed old beta version

Package-Manager: portage-2.0.51.22-r2

diff --git a/net-libs/libpri/ChangeLog b/net-libs/libpri/ChangeLog
index 0fedecff1a0a5ffb4947cd63619b1efb232e23fe..fc522b3bd7470878a102d3375dacc44d874beb63 100644 (file)
--- a/net-libs/libpri/ChangeLog
+++ b/net-libs/libpri/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/libpri
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/ChangeLog,v 1.40 2005/09/15 02:45:15 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/ChangeLog,v 1.41 2005/11/18 16:24:14 stkn Exp $
+
+*libpri-1.2.0 (18 Nov 2005)
+
+  18 Nov 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/libpri-1.2.0-gentoo.diff, -files/libpri-1.2.0_beta1-gentoo.diff,
+  -libpri-1.2.0_beta1.ebuild, +libpri-1.2.0.ebuild:
+  Version bumped and removed old beta ebuild.
 
   15 Sep 2005; Stefan Knoblich <stkn@gentoo.org> libpri-1.0.4.ebuild,
   libpri-1.0.6.ebuild, libpri-1.0.7.ebuild, libpri-1.0.7-r1.ebuild,

diff --git a/net-libs/libpri/Manifest b/net-libs/libpri/Manifest
index a88e16b8eebdbf52329f2d5585d5154ed25ab4a6..004c9cfcdd7f10752205c354c6991ce67682c785 100644 (file)
--- a/net-libs/libpri/Manifest
+++ b/net-libs/libpri/Manifest
@@ -1,19 +1,19 @@
 MD5 d988d508ed6a6b40c542b1af643e2446 libpri-1.0.7-r1.ebuild 1002
 MD5 d4eea14fb867c7510353cd463eae8442 libpri-1.0.8.ebuild 998
+MD5 e3fbbfe6c60e8c31fe3f184fd7870835 libpri-1.2.0.ebuild 1051
 MD5 a5d65ff8326161e7845e26b721f4d6dd libpri-1.0.9.ebuild 996
 MD5 290ac8efa69f6a6cdcccddac3c963388 libpri-1.0.6.ebuild 1000
-MD5 fc2b7d2ecb1a7ac579d6b5dc6a950991 libpri-1.2.0_beta1.ebuild 1050
 MD5 20a5cc1d89bd50c1ebe632b199707b9f libpri-1.0.7.ebuild 1000
 MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
-MD5 59cefc72529b7739caff55431fb03b3e ChangeLog 4969
+MD5 d7cef760192021efa1a2ee54f93838e3 ChangeLog 5220
 MD5 46619e05129738f3b85e97fc2e76d958 libpri-1.0.4.ebuild 598
 MD5 57a84bfa8a8a1dae9eff85b7e259fda4 libpri-1.0.9-r1.ebuild 999
+MD5 3a2b30f73ce69b5676222b6050648531 files/libpri-1.2.0-gentoo.diff 2007
 MD5 d000e51d01723b5cf6acd521740cad5b files/digest-libpri-1.0.9 134
-MD5 c0ce8dfc299febbd63c851177d98d762 files/libpri-1.2.0_beta1-gentoo.diff 2122
 MD5 854a97c4aecaf1536521b247dcdbd3a1 files/digest-libpri-1.0.4 63
-MD5 64f61304e7d2476f8fff69091dde8040 files/digest-libpri-1.2.0_beta1 69
 MD5 434c5302587dc0457610cdb0fa7b3627 files/digest-libpri-1.0.8 134
 MD5 4077c9b011632414cb2cdb36e1b24c27 files/digest-libpri-1.0.6 134
 MD5 460b3c5461f842545b60d6c3f716631b files/digest-libpri-1.0.7 134
 MD5 287da2d882869ddba4be296407e0632f files/digest-libpri-1.0.7-r1 134
+MD5 7b7227dc45fedd6d746680da010475ff files/digest-libpri-1.2.0 63
 MD5 4794bc9f4c11421a31a1d665ee5adef2 files/digest-libpri-1.0.9-r1 134

diff --git a/net-libs/libpri/files/digest-libpri-1.2.0 b/net-libs/libpri/files/digest-libpri-1.2.0
new file mode 100644 (file)
index 0000000..a46c268
--- /dev/null
+++ b/net-libs/libpri/files/digest-libpri-1.2.0
@@ -0,0 +1 @@
+MD5 e22af697ff4002944436449c1803fc57 libpri-1.2.0.tar.gz 75899

diff --git a/net-libs/libpri/files/digest-libpri-1.2.0_beta1 b/net-libs/libpri/files/digest-libpri-1.2.0_beta1
deleted file mode 100644 (file)
index acb9146..0000000
--- a/net-libs/libpri/files/digest-libpri-1.2.0_beta1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 085bd46523c795b22206a7838f9d9d84 libpri-1.2.0-beta1.tar.gz 75374

diff --git a/net-libs/libpri/files/libpri-1.2.0-gentoo.diff b/net-libs/libpri/files/libpri-1.2.0-gentoo.diff
new file mode 100644 (file)
index 0000000..3113835
--- /dev/null
+++ b/net-libs/libpri/files/libpri-1.2.0-gentoo.diff
@@ -0,0 +1,38 @@
+--- libpri-1.2.0-beta2/Makefile.orig   2005-11-05 02:16:24.000000000 +0000
++++ libpri-1.2.0-beta2/Makefile        2005-11-05 02:19:07.000000000 +0000
+@@ -38,7 +38,7 @@
+ DYNAMIC_LIBRARY=libpri.so.1.0
+ STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o
+ DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo
+-CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS)
++CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS)
+ INSTALL_PREFIX?=
+ INSTALL_BASE=/usr
+ SOFLAGS = -Wl,-hlibpri.so.1
+@@ -59,14 +59,6 @@
+ #INSTALL_PREFIX = /opt/asterisk  # Uncomment out to install in standard Solaris location for 3rd party code
+ endif
+ 
+-#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
+-CFLAGS += -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
+-endif
+-
+ all: depend $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
+ 
+ update:
+@@ -83,10 +75,8 @@
+ ifneq (${OSARCH},SunOS)
+       install -m 644 libpri.h $(INSTALL_PREFIX)$(INSTALL_BASE)/include
+       install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
+-      if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then  restorecon -v $(INSTALL_PREFIX)$(INSTALL_BASE)/lib/$(DYNAMIC_LIBRARY); fi
+-      ( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; ln -sf libpri.so.1 libpri.so )
++      ( cd $(INSTALL_PREFIX)$(INSTALL_BASE)/lib ; $(LDCONFIG) $(LDCONFIG_FLAGS) . ; ln -sf libpri.so.1.0 libpri.so )
+       install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(INSTALL_BASE)/lib
+-      if test $$(id -u) = 0; then $(LDCONFIG); fi
+ else
+       install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h
+       install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/lib -m 755 $(DYNAMIC_LIBRARY)

diff --git a/net-libs/libpri/files/libpri-1.2.0_beta1-gentoo.diff b/net-libs/libpri/files/libpri-1.2.0_beta1-gentoo.diff
deleted file mode 100644 (file)
index b12be30..0000000
--- a/net-libs/libpri/files/libpri-1.2.0_beta1-gentoo.diff
+++ /dev/null
@@ -1,56 +0,0 @@
---- libpri/Makefile.orig       2005-06-22 00:47:39.000000000 +0200
-+++ libpri/Makefile    2005-07-25 17:48:27.000000000 +0200
-@@ -38,33 +38,18 @@
- DYNAMIC_LIBRARY=libpri.so.1.0
- STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o
- DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo
--CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS)
-+CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS)
- INSTALL_PREFIX=
- INSTALL_BASE=/usr
--ifeq (${OSARCH},Linux)
--LDCONFIG_FLAGS=-n
--else
- ifeq (${OSARCH},FreeBSD)
--LDCONFIG_FLAGS=-m
- CFLAGS += -I../zaptel -I../zapata
- endif
--endif
- ifeq (${OSARCH},SunOS)
- CFLAGS += -DSOLARIS -I../zaptel-solaris -lsocket -lnsl
- SOFLAGS = 
--LDCONFIG = echo
- INSTALL_BASE = /usr/local
- else
- SOFLAGS = -Wl,-soname,libpri.so.1
--LDCONFIG = /sbin/ldconfig
--endif
--
--#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
--CFLAGS += -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
- endif
- 
- all: depend $(STATIC_LIBRARY) $(DYNAMIC_LIBRARY)
-@@ -82,10 +67,8 @@
-       mkdir -p $(INSTALL_PREFIX)/$(INSTALL_BASE)/include
-       install -m 644 libpri.h $(INSTALL_PREFIX)/$(INSTALL_BASE)/include
-       install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)/$(INSTALL_BASE)/lib
--      if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then  restorecon -v $(INSTALL_PREFIX)/$(INSTALL_BASE)/lib/$(DYNAMIC_LIBRARY); fi
-       ( cd $(INSTALL_PREFIX)/$(INSTALL_BASE)/lib ; ln -sf libpri.so.1 libpri.so )
-       install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)/$(INSTALL_BASE)/lib
--      $(LDCONFIG)
- 
- uninstall:
-       @echo "Removing Libpri"
-@@ -119,7 +102,6 @@
- 
- $(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS)
-       $(CC) -shared $(SOFLAGS) -o $@ $(DYNAMIC_OBJS)
--      $(LDCONFIG) $(LDCONFIG_FLAGS) .
-       ln -sf libpri.so.1 libpri.so
- 
- clean:

diff --git a/net-libs/libpri/libpri-1.2.0_beta1.ebuild b/net-libs/libpri/libpri-1.2.0.ebuild
similarity index 82%
rename from net-libs/libpri/libpri-1.2.0_beta1.ebuild
rename to net-libs/libpri/libpri-1.2.0.ebuild
index 7006318302710d594fca4f01b2464e0bef586738..6b617b023f69892aaddceed0da12106779c66ec3 100644 (file)
--- a/net-libs/libpri/libpri-1.2.0_beta1.ebuild
+++ b/net-libs/libpri/libpri-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.2.0_beta1.ebuild,v 1.1 2005/08/27 17:58:05 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpri/libpri-1.2.0.ebuild,v 1.1 2005/11/18 16:24:14 stkn Exp $
 
 inherit eutils
 
@@ -24,7 +24,7 @@ S="${WORKDIR}/${MY_P}"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 DEPEND="virtual/libc"
 
@@ -32,7 +32,7 @@ src_unpack() {
        unpack ${A}
 
        cd ${S}
-       epatch ${FILESDIR}/${P}-gentoo.diff
+       epatch ${FILESDIR}/${PN}-1.2.0-gentoo.diff
 
 #      if use bri; then
 #              einfo "Patching libpri w/ BRI stuff (${BRI_VERSION})"