Version bump, new version compiles with astersk-1.2.0, old versions do not, added blocker.

Package-Manager: portage-2.0.51.22-r2

7 files changed, 98 insertions, 8 deletions

diff --git a/net-misc/asterisk-app_ldap/ChangeLog b/net-misc/asterisk-app_ldap/ChangeLog
index 1222b23cb9df..a79d8a213d4a 100644
--- a/net-misc/asterisk-app_ldap/ChangeLog
+++ b/net-misc/asterisk-app_ldap/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/asterisk-app_ldap
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_ldap/ChangeLog,v 1.13 2005/09/29 23:58:17 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_ldap/ChangeLog,v 1.14 2005/12/05 17:18:37 stkn Exp $
+
+*asterisk-app_ldap-1.0_rc5 (05 Dec 2005)
+
+  05 Dec 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/app_ldap-1.0_rc5-gentoo.diff, asterisk-app_ldap-0.9.9_p2.ebuild,
+  asterisk-app_ldap-1.0_rc1.ebuild, +asterisk-app_ldap-1.0_rc5.ebuild:
+  Version bump, new version compiles with astersk-1.2.0, old versions do not,
+  added blocker.
 
   30 Sep 2005; Stefan Knoblich <stkn@gentoo.org>
   -files/app_ldap-0.9.3-astcfg.diff, -asterisk-app_ldap-0.9.5.ebuild:
diff --git a/net-misc/asterisk-app_ldap/Manifest b/net-misc/asterisk-app_ldap/Manifest
index 774c6a638251..fac2efd5110c 100644
--- a/net-misc/asterisk-app_ldap/Manifest
+++ b/net-misc/asterisk-app_ldap/Manifest
@@ -1,7 +1,10 @@
-MD5 667ba3547905295d4de1d09c4358a106 asterisk-app_ldap-0.9.9_p2.ebuild 1067
-MD5 0b2539de55defd1ec8f7c719dc04ae38 asterisk-app_ldap-1.0_rc1.ebuild 1065
+MD5 8ce6b824660cba5a14d126d037131dae asterisk-app_ldap-0.9.9_p2.ebuild 1095
+MD5 9ae0e26fe47ac1fa048da1aea987e490 asterisk-app_ldap-1.0_rc1.ebuild 1093
+MD5 3b7f949ea23f9a266799bc96195e0469 asterisk-app_ldap-1.0_rc5.ebuild 1076
 MD5 de41c503f05f5f99a8635b0e333729a5 metadata.xml 217
-MD5 5c9d7b8433cceccddd38ea854c449b94 ChangeLog 2085
+MD5 af69ba3137e16aff0be2851aedc958de ChangeLog 2417
+MD5 0bd2ed4630b92ad1b95cf85ebc054e2d files/app_ldap-1.0_rc5-gentoo.diff 807
 MD5 f2c8f978f335d6a1685ca0613b7fd2f5 files/digest-asterisk-app_ldap-0.9.9_p2 64
+MD5 16388011c058b887897ae9bf30dc2239 files/digest-asterisk-app_ldap-1.0_rc5 62
 MD5 b04db881b7de10671c3c524accaf2185 files/digest-asterisk-app_ldap-1.0_rc1 62
 MD5 c03b7aacfa063473f9f352484ecf034a files/app_ldap-0.9.9-astcfg.diff 1268
diff --git a/net-misc/asterisk-app_ldap/asterisk-app_ldap-0.9.9_p2.ebuild b/net-misc/asterisk-app_ldap/asterisk-app_ldap-0.9.9_p2.ebuild
index c3f4bb4170d5..73f937cef1c1 100644
--- a/net-misc/asterisk-app_ldap/asterisk-app_ldap-0.9.9_p2.ebuild
+++ b/net-misc/asterisk-app_ldap/asterisk-app_ldap-0.9.9_p2.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-misc/asterisk-app_ldap/asterisk-app_ldap-0.9.9_p2.ebuild,v 1.2 2005/09/29 23:55:06 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_ldap/asterisk-app_ldap-0.9.9_p2.ebuild,v 1.3 2005/12/05 17:18:37 stkn Exp $
 
 inherit eutils
 
@@ -19,7 +19,8 @@ KEYWORDS="~ppc x86"
 # depends on iconv support
 DEPEND="sys-libs/glibc
 	>=net-nds/openldap-2.0.0
-	>=net-misc/asterisk-1.0.7-r1"
+	>=net-misc/asterisk-1.0.7-r1
+	!>=net-misc/asterisk-1.2.0"
 
 S=${WORKDIR}/${MY_PN}
 
diff --git a/net-misc/asterisk-app_ldap/asterisk-app_ldap-1.0_rc1.ebuild b/net-misc/asterisk-app_ldap/asterisk-app_ldap-1.0_rc1.ebuild
index 7c1adb0bbda0..375bda1a0614 100644
--- a/net-misc/asterisk-app_ldap/asterisk-app_ldap-1.0_rc1.ebuild
+++ b/net-misc/asterisk-app_ldap/asterisk-app_ldap-1.0_rc1.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-misc/asterisk-app_ldap/asterisk-app_ldap-1.0_rc1.ebuild,v 1.1 2005/09/29 23:52:02 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_ldap/asterisk-app_ldap-1.0_rc1.ebuild,v 1.2 2005/12/05 17:18:37 stkn Exp $
 
 inherit eutils
 
@@ -19,7 +19,8 @@ KEYWORDS="~x86 ~ppc"
 # depends on iconv support
 DEPEND="sys-libs/glibc
 	>=net-nds/openldap-2.0.0
-	>=net-misc/asterisk-1.0.7-r1"
+	>=net-misc/asterisk-1.0.7-r1
+	!>=net-misc/asterisk-1.2.0"
 
 S=${WORKDIR}/${MY_PN}
 
diff --git a/net-misc/asterisk-app_ldap/asterisk-app_ldap-1.0_rc5.ebuild b/net-misc/asterisk-app_ldap/asterisk-app_ldap-1.0_rc5.ebuild
new file mode 100644
index 000000000000..dfdef5188f5c
--- /dev/null
+++ b/net-misc/asterisk-app_ldap/asterisk-app_ldap-1.0_rc5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-app_ldap/asterisk-app_ldap-1.0_rc5.ebuild,v 1.1 2005/12/05 17:18:37 stkn Exp $
+
+inherit eutils
+
+MY_PN="app_ldap"
+
+DESCRIPTION="Asterisk application plugin to do lookups in a LDAP directory"
+HOMEPAGE="http://www.mezzo.net/asterisk/"
+SRC_URI="http://www.mezzo.net/asterisk/${MY_PN}-${PV/_/}.tgz"
+
+IUSE=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+
+# depends on iconv support
+DEPEND="sys-libs/glibc
+	>=net-nds/openldap-2.0.0
+	>=net-misc/asterisk-1.0.7-r1"
+
+S=${WORKDIR}/${MY_PN}-${PV/_/}
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	# use asterisk-config...
+	epatch ${FILESDIR}/${MY_PN}-1.0_rc5-gentoo.diff
+}
+
+src_compile() {
+	emake -j1 clean all || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	dodoc CHANGES README ldap.conf.sample
+
+	# fix permissions
+	if [[ -n "$(egetent group asterisk)" ]]; then
+		chown -R root:asterisk ${D}etc/asterisk
+		chmod -R u=rwX,g=rX,o= ${D}etc/asterisk
+	fi
+}
diff --git a/net-misc/asterisk-app_ldap/files/app_ldap-1.0_rc5-gentoo.diff b/net-misc/asterisk-app_ldap/files/app_ldap-1.0_rc5-gentoo.diff
new file mode 100644
index 000000000000..6a58146628f9
--- /dev/null
+++ b/net-misc/asterisk-app_ldap/files/app_ldap-1.0_rc5-gentoo.diff
@@ -0,0 +1,28 @@
+--- app_ldap-1.0rc5/Makefile.orig	2005-11-15 00:28:09.000000000 +0000
++++ app_ldap-1.0rc5/Makefile	2005-12-05 19:16:08.000000000 +0000
+@@ -9,7 +9,7 @@
+ NAME=app_ldap
+ CONF=ldap.conf
+ 
+-CFLAGS=$(shell ./cflags.sh)
++CFLAGS+=$(shell ./cflags.sh)
+ LIBS=-llber -lldap
+ RES=$(shell if [ -f /usr/include/asterisk/channel.h ]; then echo "$(NAME).so"; fi)
+ 
+@@ -29,13 +29,9 @@
+ clean:
+ 	rm -f $(NAME).o $(NAME).so
+ 
+-install: all
+-	if ! [ -f /etc/asterisk/$(CONF) ]; then \
+-		install -m 644 $(CONF).sample /etc/asterisk/$(CONF) ; \
+-	fi
+-	if [ -f $(NAME).so ]; then \
+-		install -m 755 $(NAME).so $(MODULES_DIR) ; \
+-	fi
++install:
++	install -D -m 644 $(CONF).sample $(DESTDIR)/etc/asterisk/$(CONF)
++	install -D -m 755 $(NAME).so $(DESTDIR)$(MODULES_DIR)/$(NAME).so
+ 
+ reload: install
+ 	asterisk -rx "unload ${RES}"
diff --git a/net-misc/asterisk-app_ldap/files/digest-asterisk-app_ldap-1.0_rc5 b/net-misc/asterisk-app_ldap/files/digest-asterisk-app_ldap-1.0_rc5
new file mode 100644
index 000000000000..5197ec905e5c
--- /dev/null
+++ b/net-misc/asterisk-app_ldap/files/digest-asterisk-app_ldap-1.0_rc5
@@ -0,0 +1 @@
+MD5 383ea4c49b9b8a0e178a6e9279e1a951 app_ldap-1.0rc5.tgz 6253