version bump to 1.0.0.4d, add multilib support, removing not-working older version, bug 171863

Package-Manager: portage-13790-svn/cvs/Linux i686

5 files changed, 57 insertions, 92 deletions

diff --git a/net-misc/asterisk-chan_unistim/ChangeLog b/net-misc/asterisk-chan_unistim/ChangeLog
index e6a8ec6e376f..930eb3d4315d 100644
--- a/net-misc/asterisk-chan_unistim/ChangeLog
+++ b/net-misc/asterisk-chan_unistim/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/asterisk-chan_unistim
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_unistim/ChangeLog,v 1.9 2009/07/07 13:29:29 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_unistim/ChangeLog,v 1.10 2009/07/07 15:18:54 volkmar Exp $
+
+*asterisk-chan_unistim-1.0.0.4d (07 Jul 2009)
+
+  07 Jul 2009; Mounir Lamouri <volkmar@gentoo.org>
+  -files/chan_unistim-0.9.2-gentoo.diff,
+  -asterisk-chan_unistim-0.9.4.ebuild,
+  +asterisk-chan_unistim-1.0.0.4d.ebuild:
+  Version bump to 1.0.0.4d. Add multilib support. Removing not-working older
+  version. See bug 171863
 
   07 Jul 2009; Mounir Lamouri <volkmar@gentoo.org>
   -asterisk-chan_unistim-0.9.2.ebuild:
diff --git a/net-misc/asterisk-chan_unistim/Manifest b/net-misc/asterisk-chan_unistim/Manifest
index 7b8d07851541..2fcf0f7caf57 100644
--- a/net-misc/asterisk-chan_unistim/Manifest
+++ b/net-misc/asterisk-chan_unistim/Manifest
@@ -1,5 +1,4 @@
-AUX chan_unistim-0.9.2-gentoo.diff 1367 RMD160 e12a438da9a44e77b2fa777034123d50e35d0820 SHA1 314e5e0a38afd9f8f878dc22d0ee650a4f2941cd SHA256 eff22e8d8ee377494e5b95f36e7975454a3485133a9bc9a8ce07a40b428eeef1
-DIST chan_unistim-0.9.4.tar.bz2 27997 RMD160 75de65e089c7f4f18349e628f9969888be3d3c5b SHA1 97db1d0c7e0730fd51e9fe04d258e6aea52e11fa SHA256 84782d8862462a2fff150beb5173b5f4e88a9966622a7e06d0943ac686217481
-EBUILD asterisk-chan_unistim-0.9.4.ebuild 1225 RMD160 26289716822c8d53006fab73fa7826faa946c370 SHA1 7052d618a54f5129fd8ea115fbf06c99bd2a8d2e SHA256 42ee2dc53453cf03bb982ce1199ea1d515322ad7a3baf7e4e86b027290476369
-MISC ChangeLog 1608 RMD160 a1dfe1c9213f2874543d3efd37ad5d84a7aef315 SHA1 24ca6eb6696a767e985b5ea29dec9bf073b77a03 SHA256 74ff8b0a5f4684a7b263733d4e2b9d753df8cb8733f2d10545d7a9922d1999bf
+DIST chan_unistim-1.0.0.4d.tar.bz2 43387 RMD160 5d20c2754a6ecdd3b9a03ed5f80655a869c4ae11 SHA1 4c1be840a2ef5ac2e06088a0b67321efd155ad2f SHA256 56bf9c746189b965fe7f50aa1b3a7483f4f4ae48abf69fd4effc49f27c3ca764
+EBUILD asterisk-chan_unistim-1.0.0.4d.ebuild 1154 RMD160 913dc0baf69d8efb461253f02c9eff4194a5080e SHA1 d535ebb4956d51ce31139d6c534c52d2fc9b429a SHA256 65a85eb87f37c001bd490eeaa60afe37f7b55df604e595b3d0a1209cfb0352ee
+MISC ChangeLog 1933 RMD160 30c7d568876dc54dddd9d6f58fe2b15407d90ef7 SHA1 25bf3a52475ed748ebb1614b16bf87c1c159b861 SHA256 d743a7853c3868e1dea05e6caac38c240f743e444cd7a8576f62c1de45b95d20
 MISC metadata.xml 159 RMD160 1cb780cd4240aaeb1b22a09a786b8ed4b0803823 SHA1 c96c65dcb37a559953bf3446b6719b0cac3585a8 SHA256 6831e631b05a25ddae6c3e148d49b98877ee1dd318185a0c95f3cad8a89bf34d
diff --git a/net-misc/asterisk-chan_unistim/asterisk-chan_unistim-0.9.4.ebuild b/net-misc/asterisk-chan_unistim/asterisk-chan_unistim-0.9.4.ebuild
deleted file mode 100644
index dfc13205de78..000000000000
--- a/net-misc/asterisk-chan_unistim/asterisk-chan_unistim-0.9.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_unistim/asterisk-chan_unistim-0.9.4.ebuild,v 1.2 2007/01/06 16:43:26 drizzt Exp $
-
-inherit eutils
-
-MY_PN="chan_unistim"
-
-DESCRIPTION="Unistim channel module for Asterisk"
-HOMEPAGE="http://mlkj.net/UNISTIM/"
-SRC_URI="http://mlkj.net/asterisk/${MY_PN}-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-
-IUSE=""
-
-DEPEND="!=net-misc/asterisk-1.0*
-	>=net-misc/asterisk-1.2.0"
-
-S="${WORKDIR}"/${MY_PN}-${PV}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${MY_PN}-0.9.2-gentoo.diff
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	make INSTALL_PREFIX="${D}" install config || die "make install failed"
-
-	dodoc README unistim.conf
-
-	# fix permissions
-	if [[ -n "$(egetent group asterisk)" ]]; then
-		einfo "Fixing permissions..."
-		chown -R root:asterisk "${D}"etc/asterisk
-		chmod -R u=rwX,g=rX,o= "${D}"etc/asterisk
-	fi
-}
-
-pkg_postinst() {
-	elog "For more information about this module:"
-	echo
-	elog "http://www.voip-info.org/wiki-Asterisk+UNISTIM+channels"
-	echo
-	elog "http://www.voip-info.org/wiki-Nortel+Phones"
-}
diff --git a/net-misc/asterisk-chan_unistim/asterisk-chan_unistim-1.0.0.4d.ebuild b/net-misc/asterisk-chan_unistim/asterisk-chan_unistim-1.0.0.4d.ebuild
new file mode 100644
index 000000000000..ecc98fb83f89
--- /dev/null
+++ b/net-misc/asterisk-chan_unistim/asterisk-chan_unistim-1.0.0.4d.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk-chan_unistim/asterisk-chan_unistim-1.0.0.4d.ebuild,v 1.1 2009/07/07 15:18:54 volkmar Exp $
+
+EAPI="2"
+
+inherit multilib
+
+MY_PN="chan_unistim"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Unistim channel module for Asterisk"
+HOMEPAGE="http://mlkj.net/UNISTIM/"
+SRC_URI="http://mlkj.net/asterisk/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+IUSE=""
+
+DEPEND="=net-misc/asterisk-1.2*"
+RDEPEND=${DEPEND}
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	# multilib support
+	sed -i -e "s:/usr/lib:/usr/$(get_libdir):" Makefile || die "sed failed"
+	# respect users C(XX)FLAGS
+	sed -i -e "s:^CFLAGS=:CFLAGS+=:" -e "/O6/d" -e "/march/d" Makefile \
+		|| die "sed failed"
+	# better to let -pipe as user choice and add -fPIC
+	sed -i -e "s:pipe:fPIC:" Makefile || die "sed failed"
+}
+
+src_install() {
+	# create needed dirs
+	dodir /etc/asterisk
+	dodir /usr/$(get_libdir)/asterisk/modules
+
+	emake INSTALL_PREFIX="${D}" install config || die "emake install failed"
+
+	dodoc README CHANGES || die "dodoc failed"
+}
diff --git a/net-misc/asterisk-chan_unistim/files/chan_unistim-0.9.2-gentoo.diff b/net-misc/asterisk-chan_unistim/files/chan_unistim-0.9.2-gentoo.diff
deleted file mode 100644
index 662416f41067..000000000000
--- a/net-misc/asterisk-chan_unistim/files/chan_unistim-0.9.2-gentoo.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- chan_unistim-0.9.2/Makefile.orig	2005-03-29 14:56:16.634635584 +0000
-+++ chan_unistim-0.9.2/Makefile	2005-03-29 15:02:37.375754136 +0000
-@@ -7,15 +7,14 @@
- INSTALL_PREFIX=
- ASTERISK_HEADER_DIR=$(INSTALL_PREFIX)/usr/include
- 
--MODULES_DIR=$(INSTALL_PREFIX)/usr/lib/asterisk/modules
-+MODULES_DIR=$(INSTALL_PREFIX)$(shell /usr/bin/asterisk-config --modulesdir)
-+ETC_DIR=$(INSTALL_PREFIX)$(shell /usr/bin/asterisk-config --sysconfdir)
- 
- PROC=$(shell uname -m)
- 
- DEBUG=-g #-pg
- INCLUDE=-I$(ASTERISK_HEADER_DIR)
--CFLAGS=-pipe -Wall -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE
--CFLAGS+=-O6
--CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
-+CFLAGS+=-pipe -fPIC -DPIC -Wall -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE
- CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
- 
- LIBS=-ldl -lpthread -lm
-@@ -40,8 +39,10 @@
- 	$(CC) -shared -Xlinker -x -o $@ chan_unistim.o
- 
- install: all
-+	if [ ! -d $(MODULES_DIR) ]; then mkdir -m 755 -p $(MODULES_DIR) ; fi
- 	for x in $(SHAREDOS); do $(INSTALL) -m 755 $$x $(MODULES_DIR) ; done
- 
- config: all
--	cp unistim.conf $(INSTALL_PREFIX)/etc/asterisk/
-+	if [ ! -d $(ETC_DIR) ]; then mkdir -m 755 -p $(ETC_DIR) ; fi
-+	cp unistim.conf $(ETC_DIR)
-