public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-misc/iaxmodem/
@ 2016-02-10 16:03 Amy Winston
  0 siblings, 0 replies; 7+ messages in thread
From: Amy Winston @ 2016-02-10 16:03 UTC (permalink / raw
  To: gentoo-commits

commit:     9aa24445eb7786b235cc8301902441cbf0365a5b
Author:     Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 10 15:58:37 2016 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Wed Feb 10 16:02:17 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9aa24445

net-misc/iaxmodem: eapi bump

Package-Manager: portage-2.2.26

 net-misc/iaxmodem/iaxmodem-1.2.0.ebuild | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/net-misc/iaxmodem/iaxmodem-1.2.0.ebuild b/net-misc/iaxmodem/iaxmodem-1.2.0.ebuild
index 69f9053..fc3d4f3 100644
--- a/net-misc/iaxmodem/iaxmodem-1.2.0.ebuild
+++ b/net-misc/iaxmodem/iaxmodem-1.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="2"
+EAPI="5"
 
 inherit eutils toolchain-funcs multilib
 
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 
 IUSE=""
 
-RDEPEND="media-libs/tiff
+RDEPEND="media-libs/tiff:=
 	sys-process/procps"
 
 DEPEND="${RDEPEND}
@@ -71,13 +71,13 @@ src_compile() {
 
 src_install() {
 	cd "${S}/lib/libiax2"
-	emake DESTDIR="${D}" install || die "install libiax2 failed"
+	emake DESTDIR="${D}" install
 
 	cd "${S}/lib/spandsp"
-	emake DESTDIR="${D}" install || die "install spandsp failed"
+	emake DESTDIR="${D}" install
 
 	cd "${S}"
-	dosbin iaxmodem || die "install failed"
+	dosbin iaxmodem
 
 	# remove libiax and spandsp headers, we don't need them
 	rm -rf "${D}usr/include" "${D}usr/bin/iax-config"


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/iaxmodem/
@ 2016-02-10 16:03 Amy Winston
  0 siblings, 0 replies; 7+ messages in thread
From: Amy Winston @ 2016-02-10 16:03 UTC (permalink / raw
  To: gentoo-commits

commit:     fa934a7a56cbaa922eba759ffde4dfa3a1ba9bf2
Author:     Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 10 16:01:27 2016 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Wed Feb 10 16:02:20 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa934a7a

net-misc/iaxmodem: version bump 1.3.0 bug #574228.

Package-Manager: portage-2.2.26

 net-misc/iaxmodem/Manifest              |   1 +
 net-misc/iaxmodem/iaxmodem-1.3.0.ebuild | 108 ++++++++++++++++++++++++++++++++
 2 files changed, 109 insertions(+)

diff --git a/net-misc/iaxmodem/Manifest b/net-misc/iaxmodem/Manifest
index b25bcc6..91a248e 100644
--- a/net-misc/iaxmodem/Manifest
+++ b/net-misc/iaxmodem/Manifest
@@ -1 +1,2 @@
 DIST iaxmodem-1.2.0.tar.gz 3075769 SHA256 fa263c0df0870cb8133c4bee141146ca5db47ece6db50899a6acf508d76591ed SHA512 53b66a0977366541ffaa743fcbefa11c20eb9ea7182245a1d11bc7fd015d98a4ec8086b3cb85b8de84f63d67221bccb1a868fe9f0a603de600023ea158909707 WHIRLPOOL a258b663909cd7d8aa8be0e543a5cbd482ce978bd95534959cd300f96572b199d538fb1e6d7b8ec07fffda33b6e5c446065db89d1bbe50fe199492e191a418f1
+DIST iaxmodem-1.3.0.tar.gz 2483995 SHA256 9dcff90bbc41846e5c3919ca92687df4b17f54d8df692940b8c67c4e98287535 SHA512 3add8fe1c228ee63f12a3d23fcc8bad5405b9fa6af70cadbcdb276d4e7dfe2a90f1b7c300d35659ab0247010c2315e25a5def5715e670071226bd89271d004f4 WHIRLPOOL 52502bdda06ec3bf128b738c0f7f59ea668961dbd70c31b873374c195bbbf23d0a1fb103d4b4baf313ec83a2c2d438e3a1db8bed772d5e5c0662f32741216c1e

diff --git a/net-misc/iaxmodem/iaxmodem-1.3.0.ebuild b/net-misc/iaxmodem/iaxmodem-1.3.0.ebuild
new file mode 100644
index 0000000..fc3d4f3
--- /dev/null
+++ b/net-misc/iaxmodem/iaxmodem-1.3.0.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils toolchain-funcs multilib
+
+DESCRIPTION="Software modem that uses an IAX channel instead of a traditional phone line"
+HOMEPAGE="http://sourceforge.net/projects/iaxmodem/"
+SRC_URI="mirror://sourceforge/iaxmodem/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+RDEPEND="media-libs/tiff:=
+	sys-process/procps"
+
+DEPEND="${RDEPEND}
+	sys-apps/sed"
+
+src_prepare() {
+	# fix header file position
+	sed -i -e 's:iax/iax-client\.h:iax-client.h:g' iaxmodem.c
+
+	# fix broken line terminators
+	sed -i -e 's:\r::g' -e 's:--s$:--:g' -e 's:$:\r:g' iaxmodem.inf
+
+	# fix installation of libiax2 headers (though we don't need them)
+	sed -i -e 's: \(\$(includedir)/\): $(DESTDIR)\1:g' lib/libiax2/src/Makefile.in
+
+	# patch configure (we compile libs for ourself)
+	sed -i -e 's:^\(cd\|./configure\):# \1:g' configure
+	sed -i -e 's:build-libiax build-libspandsp ::g' Makefile.in
+
+	# fix dumb x86_64 libdir handling
+	sed -i -e 's: \(x86_64-\*)\): _DISABLED_\1:g' lib/spandsp/configure
+}
+
+src_configure() {
+	cd "${S}/lib/libiax2"
+	econf --disable-static \
+		--libdir=/usr/$(get_libdir)/iaxmodem \
+		--datadir=/usr/share/iaxmodem/libiax2 || die "econf libiax2 failed"
+
+	cd "${S}/lib/spandsp"
+	econf --disable-static \
+		--libdir=/usr/$(get_libdir)/iaxmodem \
+		--datadir=/usr/share/iaxmodem || die "econf spandsp failed"
+
+	cd "${S}"
+	./configure || die "configure iaxmodem failed"
+}
+
+src_compile() {
+	cd "${S}/lib/libiax2"
+	emake || die "emake libiax2 failed"
+
+	cd "${S}/lib/spandsp"
+	emake || die "emake spandsp failed"
+
+	cd "${S}"
+	emake OBJS="iaxmodem.o" CC=$(tc-getCC) \
+		LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/$(get_libdir)/iaxmodem \
+			-Llib/spandsp/src/.libs -Llib/libiax2/src/.libs -lm -lutil -ltiff -lspandsp -liax" \
+	|| die "emake iaxmodem failed"
+}
+
+src_install() {
+	cd "${S}/lib/libiax2"
+	emake DESTDIR="${D}" install
+
+	cd "${S}/lib/spandsp"
+	emake DESTDIR="${D}" install
+
+	cd "${S}"
+	dosbin iaxmodem
+
+	# remove libiax and spandsp headers, we don't need them
+	rm -rf "${D}usr/include" "${D}usr/bin/iax-config"
+
+	# install init-script + conf
+	newinitd "${FILESDIR}/iaxmodem.initd" iaxmodem
+	newconfd "${FILESDIR}/iaxmodem.confd" iaxmodem
+
+	# install docs
+	doman iaxmodem.1
+	newdoc CHANGES ChangeLog
+	newdoc lib/libiax2/ChangeLog ChangeLog.libiax2
+	newdoc lib/spandsp/ChangeLog ChangeLog.spandsp
+	dodoc FAQ README lib/spandsp/DueDiligence
+
+	# install sample configs
+	insinto /etc/iaxmodem
+	newins "${FILESDIR}/iaxmodem.cfg" default
+	insinto /usr/share/iaxmodem
+	doins config.ttyIAX iaxmodem-cfg.ttyIAX iaxmodem.inf
+
+	# install logrotate rule
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/iaxmodem.logrotated" iaxmodem
+
+	# create log dir
+	keepdir /var/log/iaxmodem
+}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/iaxmodem/
@ 2016-02-10 19:35 Amy Winston
  0 siblings, 0 replies; 7+ messages in thread
From: Amy Winston @ 2016-02-10 19:35 UTC (permalink / raw
  To: gentoo-commits

commit:     8fa0efaacd12eff0f40b35d3396a0e4fa4cb0a08
Author:     Göktürk Yüksek <gokturk <AT> binghamton <DOT> edu>
AuthorDate: Wed Feb 10 18:58:16 2016 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Wed Feb 10 19:33:32 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fa0efaa

net-misc/iaxmodem: adjust '|| die' per EAPI 5, remove implicit system dep

Also, add missing '|| die' on calls to external tools like sed.

Package-Manager: portage-2.2.26

 net-misc/iaxmodem/iaxmodem-1.2.0.ebuild | 42 ++++++++++++++++-----------------
 net-misc/iaxmodem/iaxmodem-1.3.0.ebuild | 40 +++++++++++++++----------------
 2 files changed, 39 insertions(+), 43 deletions(-)

diff --git a/net-misc/iaxmodem/iaxmodem-1.2.0.ebuild b/net-misc/iaxmodem/iaxmodem-1.2.0.ebuild
index fc3d4f3..98a1320 100644
--- a/net-misc/iaxmodem/iaxmodem-1.2.0.ebuild
+++ b/net-misc/iaxmodem/iaxmodem-1.2.0.ebuild
@@ -19,68 +19,66 @@ IUSE=""
 RDEPEND="media-libs/tiff:=
 	sys-process/procps"
 
-DEPEND="${RDEPEND}
-	sys-apps/sed"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
 	# fix header file position
-	sed -i -e 's:iax/iax-client\.h:iax-client.h:g' iaxmodem.c
+	sed -i -e 's:iax/iax-client\.h:iax-client.h:g' iaxmodem.c || die
 
 	# fix broken line terminators
-	sed -i -e 's:\r::g' -e 's:--s$:--:g' -e 's:$:\r:g' iaxmodem.inf
+	sed -i -e 's:\r::g' -e 's:--s$:--:g' -e 's:$:\r:g' iaxmodem.inf || die
 
 	# fix installation of libiax2 headers (though we don't need them)
-	sed -i -e 's: \(\$(includedir)/\): $(DESTDIR)\1:g' lib/libiax2/src/Makefile.in
+	sed -i -e 's: \(\$(includedir)/\): $(DESTDIR)\1:g' lib/libiax2/src/Makefile.in || die
 
 	# patch configure (we compile libs for ourself)
-	sed -i -e 's:^\(cd\|./configure\):# \1:g' configure
-	sed -i -e 's:build-libiax build-libspandsp ::g' Makefile.in
+	sed -i -e 's:^\(cd\|./configure\):# \1:g' configure || die
+	sed -i -e 's:build-libiax build-libspandsp ::g' Makefile.in || die
 
 	# fix dumb x86_64 libdir handling
-	sed -i -e 's: \(x86_64-\*)\): _DISABLED_\1:g' lib/spandsp/configure
+	sed -i -e 's: \(x86_64-\*)\): _DISABLED_\1:g' lib/spandsp/configure || die
 }
 
 src_configure() {
-	cd "${S}/lib/libiax2"
+	cd "${S}/lib/libiax2" || die
 	econf --disable-static \
 		--libdir=/usr/$(get_libdir)/iaxmodem \
-		--datadir=/usr/share/iaxmodem/libiax2 || die "econf libiax2 failed"
+		--datadir=/usr/share/iaxmodem/libiax2
 
-	cd "${S}/lib/spandsp"
+	cd "${S}/lib/spandsp" || die
 	econf --disable-static \
 		--libdir=/usr/$(get_libdir)/iaxmodem \
-		--datadir=/usr/share/iaxmodem || die "econf spandsp failed"
+		--datadir=/usr/share/iaxmodem
 
 	cd "${S}"
-	./configure || die "configure iaxmodem failed"
+	./configure || die "configure iaxmodem failed" || die
 }
 
 src_compile() {
-	cd "${S}/lib/libiax2"
-	emake || die "emake libiax2 failed"
+	cd "${S}/lib/libiax2" || die
+	emake
 
-	cd "${S}/lib/spandsp"
-	emake || die "emake spandsp failed"
+	cd "${S}/lib/spandsp" || die
+	emake
 
 	cd "${S}"
 	emake OBJS="iaxmodem.o" CC=$(tc-getCC) \
 		LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/$(get_libdir)/iaxmodem \
-			-Llib/spandsp/src/.libs -Llib/libiax2/src/.libs -lm -lutil -ltiff -lspandsp -liax" \
-	|| die "emake iaxmodem failed"
+			-Llib/spandsp/src/.libs -Llib/libiax2/src/.libs -lm -lutil -ltiff -lspandsp -liax"
 }
 
 src_install() {
-	cd "${S}/lib/libiax2"
+	cd "${S}/lib/libiax2" || die
 	emake DESTDIR="${D}" install
 
-	cd "${S}/lib/spandsp"
+	cd "${S}/lib/spandsp" || die
 	emake DESTDIR="${D}" install
 
 	cd "${S}"
 	dosbin iaxmodem
 
 	# remove libiax and spandsp headers, we don't need them
-	rm -rf "${D}usr/include" "${D}usr/bin/iax-config"
+	rm -rf "${D}usr/include" "${D}usr/bin/iax-config" || die
 
 	# install init-script + conf
 	newinitd "${FILESDIR}/iaxmodem.initd" iaxmodem

diff --git a/net-misc/iaxmodem/iaxmodem-1.3.0.ebuild b/net-misc/iaxmodem/iaxmodem-1.3.0.ebuild
index fc3d4f3..f0ee6ee 100644
--- a/net-misc/iaxmodem/iaxmodem-1.3.0.ebuild
+++ b/net-misc/iaxmodem/iaxmodem-1.3.0.ebuild
@@ -19,68 +19,66 @@ IUSE=""
 RDEPEND="media-libs/tiff:=
 	sys-process/procps"
 
-DEPEND="${RDEPEND}
-	sys-apps/sed"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
 	# fix header file position
-	sed -i -e 's:iax/iax-client\.h:iax-client.h:g' iaxmodem.c
+	sed -i -e 's:iax/iax-client\.h:iax-client.h:g' iaxmodem.c || die
 
 	# fix broken line terminators
-	sed -i -e 's:\r::g' -e 's:--s$:--:g' -e 's:$:\r:g' iaxmodem.inf
+	sed -i -e 's:\r::g' -e 's:--s$:--:g' -e 's:$:\r:g' iaxmodem.inf || die
 
 	# fix installation of libiax2 headers (though we don't need them)
-	sed -i -e 's: \(\$(includedir)/\): $(DESTDIR)\1:g' lib/libiax2/src/Makefile.in
+	sed -i -e 's: \(\$(includedir)/\): $(DESTDIR)\1:g' lib/libiax2/src/Makefile.in || die
 
 	# patch configure (we compile libs for ourself)
-	sed -i -e 's:^\(cd\|./configure\):# \1:g' configure
-	sed -i -e 's:build-libiax build-libspandsp ::g' Makefile.in
+	sed -i -e 's:^\(cd\|./configure\):# \1:g' configure || die
+	sed -i -e 's:build-libiax build-libspandsp ::g' Makefile.in || die
 
 	# fix dumb x86_64 libdir handling
-	sed -i -e 's: \(x86_64-\*)\): _DISABLED_\1:g' lib/spandsp/configure
+	sed -i -e 's: \(x86_64-\*)\): _DISABLED_\1:g' lib/spandsp/configure || die
 }
 
 src_configure() {
-	cd "${S}/lib/libiax2"
+	cd "${S}/lib/libiax2" || die
 	econf --disable-static \
 		--libdir=/usr/$(get_libdir)/iaxmodem \
-		--datadir=/usr/share/iaxmodem/libiax2 || die "econf libiax2 failed"
+		--datadir=/usr/share/iaxmodem/libiax2
 
-	cd "${S}/lib/spandsp"
+	cd "${S}/lib/spandsp" || die
 	econf --disable-static \
 		--libdir=/usr/$(get_libdir)/iaxmodem \
-		--datadir=/usr/share/iaxmodem || die "econf spandsp failed"
+		--datadir=/usr/share/iaxmodem
 
 	cd "${S}"
 	./configure || die "configure iaxmodem failed"
 }
 
 src_compile() {
-	cd "${S}/lib/libiax2"
-	emake || die "emake libiax2 failed"
+	cd "${S}/lib/libiax2" || die
+	emake
 
-	cd "${S}/lib/spandsp"
-	emake || die "emake spandsp failed"
+	cd "${S}/lib/spandsp" || die
+	emake
 
 	cd "${S}"
 	emake OBJS="iaxmodem.o" CC=$(tc-getCC) \
 		LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/$(get_libdir)/iaxmodem \
-			-Llib/spandsp/src/.libs -Llib/libiax2/src/.libs -lm -lutil -ltiff -lspandsp -liax" \
-	|| die "emake iaxmodem failed"
+			-Llib/spandsp/src/.libs -Llib/libiax2/src/.libs -lm -lutil -ltiff -lspandsp -liax"
 }
 
 src_install() {
-	cd "${S}/lib/libiax2"
+	cd "${S}/lib/libiax2" || die
 	emake DESTDIR="${D}" install
 
-	cd "${S}/lib/spandsp"
+	cd "${S}/lib/spandsp" || die
 	emake DESTDIR="${D}" install
 
 	cd "${S}"
 	dosbin iaxmodem
 
 	# remove libiax and spandsp headers, we don't need them
-	rm -rf "${D}usr/include" "${D}usr/bin/iax-config"
+	rm -rf "${D}usr/include" "${D}usr/bin/iax-config" || die
 
 	# install init-script + conf
 	newinitd "${FILESDIR}/iaxmodem.initd" iaxmodem


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/iaxmodem/
@ 2016-05-04  0:10 Austin English
  0 siblings, 0 replies; 7+ messages in thread
From: Austin English @ 2016-05-04  0:10 UTC (permalink / raw
  To: gentoo-commits

commit:     e1699415ab80aa18fb04f49f5eba2b7dc70386c8
Author:     Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Tue May  3 23:36:54 2016 +0000
Commit:     Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Wed May  4 00:08:37 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1699415

net-misc/iaxmodem: remove old versions

Package-Manager: portage-2.2.26

 net-misc/iaxmodem/iaxmodem-1.2.0.ebuild | 106 --------------------------------
 net-misc/iaxmodem/iaxmodem-1.3.0.ebuild | 106 --------------------------------
 2 files changed, 212 deletions(-)

diff --git a/net-misc/iaxmodem/iaxmodem-1.2.0.ebuild b/net-misc/iaxmodem/iaxmodem-1.2.0.ebuild
deleted file mode 100644
index 98a1320..0000000
--- a/net-misc/iaxmodem/iaxmodem-1.2.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils toolchain-funcs multilib
-
-DESCRIPTION="Software modem that uses an IAX channel instead of a traditional phone line"
-HOMEPAGE="http://sourceforge.net/projects/iaxmodem/"
-SRC_URI="mirror://sourceforge/iaxmodem/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-RDEPEND="media-libs/tiff:=
-	sys-process/procps"
-
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# fix header file position
-	sed -i -e 's:iax/iax-client\.h:iax-client.h:g' iaxmodem.c || die
-
-	# fix broken line terminators
-	sed -i -e 's:\r::g' -e 's:--s$:--:g' -e 's:$:\r:g' iaxmodem.inf || die
-
-	# fix installation of libiax2 headers (though we don't need them)
-	sed -i -e 's: \(\$(includedir)/\): $(DESTDIR)\1:g' lib/libiax2/src/Makefile.in || die
-
-	# patch configure (we compile libs for ourself)
-	sed -i -e 's:^\(cd\|./configure\):# \1:g' configure || die
-	sed -i -e 's:build-libiax build-libspandsp ::g' Makefile.in || die
-
-	# fix dumb x86_64 libdir handling
-	sed -i -e 's: \(x86_64-\*)\): _DISABLED_\1:g' lib/spandsp/configure || die
-}
-
-src_configure() {
-	cd "${S}/lib/libiax2" || die
-	econf --disable-static \
-		--libdir=/usr/$(get_libdir)/iaxmodem \
-		--datadir=/usr/share/iaxmodem/libiax2
-
-	cd "${S}/lib/spandsp" || die
-	econf --disable-static \
-		--libdir=/usr/$(get_libdir)/iaxmodem \
-		--datadir=/usr/share/iaxmodem
-
-	cd "${S}"
-	./configure || die "configure iaxmodem failed" || die
-}
-
-src_compile() {
-	cd "${S}/lib/libiax2" || die
-	emake
-
-	cd "${S}/lib/spandsp" || die
-	emake
-
-	cd "${S}"
-	emake OBJS="iaxmodem.o" CC=$(tc-getCC) \
-		LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/$(get_libdir)/iaxmodem \
-			-Llib/spandsp/src/.libs -Llib/libiax2/src/.libs -lm -lutil -ltiff -lspandsp -liax"
-}
-
-src_install() {
-	cd "${S}/lib/libiax2" || die
-	emake DESTDIR="${D}" install
-
-	cd "${S}/lib/spandsp" || die
-	emake DESTDIR="${D}" install
-
-	cd "${S}"
-	dosbin iaxmodem
-
-	# remove libiax and spandsp headers, we don't need them
-	rm -rf "${D}usr/include" "${D}usr/bin/iax-config" || die
-
-	# install init-script + conf
-	newinitd "${FILESDIR}/iaxmodem.initd" iaxmodem
-	newconfd "${FILESDIR}/iaxmodem.confd" iaxmodem
-
-	# install docs
-	doman iaxmodem.1
-	newdoc CHANGES ChangeLog
-	newdoc lib/libiax2/ChangeLog ChangeLog.libiax2
-	newdoc lib/spandsp/ChangeLog ChangeLog.spandsp
-	dodoc FAQ README lib/spandsp/DueDiligence
-
-	# install sample configs
-	insinto /etc/iaxmodem
-	newins "${FILESDIR}/iaxmodem.cfg" default
-	insinto /usr/share/iaxmodem
-	doins config.ttyIAX iaxmodem-cfg.ttyIAX iaxmodem.inf
-
-	# install logrotate rule
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/iaxmodem.logrotated" iaxmodem
-
-	# create log dir
-	keepdir /var/log/iaxmodem
-}

diff --git a/net-misc/iaxmodem/iaxmodem-1.3.0.ebuild b/net-misc/iaxmodem/iaxmodem-1.3.0.ebuild
deleted file mode 100644
index f0ee6ee..0000000
--- a/net-misc/iaxmodem/iaxmodem-1.3.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils toolchain-funcs multilib
-
-DESCRIPTION="Software modem that uses an IAX channel instead of a traditional phone line"
-HOMEPAGE="http://sourceforge.net/projects/iaxmodem/"
-SRC_URI="mirror://sourceforge/iaxmodem/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-RDEPEND="media-libs/tiff:=
-	sys-process/procps"
-
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# fix header file position
-	sed -i -e 's:iax/iax-client\.h:iax-client.h:g' iaxmodem.c || die
-
-	# fix broken line terminators
-	sed -i -e 's:\r::g' -e 's:--s$:--:g' -e 's:$:\r:g' iaxmodem.inf || die
-
-	# fix installation of libiax2 headers (though we don't need them)
-	sed -i -e 's: \(\$(includedir)/\): $(DESTDIR)\1:g' lib/libiax2/src/Makefile.in || die
-
-	# patch configure (we compile libs for ourself)
-	sed -i -e 's:^\(cd\|./configure\):# \1:g' configure || die
-	sed -i -e 's:build-libiax build-libspandsp ::g' Makefile.in || die
-
-	# fix dumb x86_64 libdir handling
-	sed -i -e 's: \(x86_64-\*)\): _DISABLED_\1:g' lib/spandsp/configure || die
-}
-
-src_configure() {
-	cd "${S}/lib/libiax2" || die
-	econf --disable-static \
-		--libdir=/usr/$(get_libdir)/iaxmodem \
-		--datadir=/usr/share/iaxmodem/libiax2
-
-	cd "${S}/lib/spandsp" || die
-	econf --disable-static \
-		--libdir=/usr/$(get_libdir)/iaxmodem \
-		--datadir=/usr/share/iaxmodem
-
-	cd "${S}"
-	./configure || die "configure iaxmodem failed"
-}
-
-src_compile() {
-	cd "${S}/lib/libiax2" || die
-	emake
-
-	cd "${S}/lib/spandsp" || die
-	emake
-
-	cd "${S}"
-	emake OBJS="iaxmodem.o" CC=$(tc-getCC) \
-		LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/$(get_libdir)/iaxmodem \
-			-Llib/spandsp/src/.libs -Llib/libiax2/src/.libs -lm -lutil -ltiff -lspandsp -liax"
-}
-
-src_install() {
-	cd "${S}/lib/libiax2" || die
-	emake DESTDIR="${D}" install
-
-	cd "${S}/lib/spandsp" || die
-	emake DESTDIR="${D}" install
-
-	cd "${S}"
-	dosbin iaxmodem
-
-	# remove libiax and spandsp headers, we don't need them
-	rm -rf "${D}usr/include" "${D}usr/bin/iax-config" || die
-
-	# install init-script + conf
-	newinitd "${FILESDIR}/iaxmodem.initd" iaxmodem
-	newconfd "${FILESDIR}/iaxmodem.confd" iaxmodem
-
-	# install docs
-	doman iaxmodem.1
-	newdoc CHANGES ChangeLog
-	newdoc lib/libiax2/ChangeLog ChangeLog.libiax2
-	newdoc lib/spandsp/ChangeLog ChangeLog.spandsp
-	dodoc FAQ README lib/spandsp/DueDiligence
-
-	# install sample configs
-	insinto /etc/iaxmodem
-	newins "${FILESDIR}/iaxmodem.cfg" default
-	insinto /usr/share/iaxmodem
-	doins config.ttyIAX iaxmodem-cfg.ttyIAX iaxmodem.inf
-
-	# install logrotate rule
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/iaxmodem.logrotated" iaxmodem
-
-	# create log dir
-	keepdir /var/log/iaxmodem
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/iaxmodem/
@ 2017-03-18  8:40 Michael Palimaka
  0 siblings, 0 replies; 7+ messages in thread
From: Michael Palimaka @ 2017-03-18  8:40 UTC (permalink / raw
  To: gentoo-commits

commit:     caee23695add36dcc111c2e50a555867a963d473
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 18 08:39:50 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Mar 18 08:40:06 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caee2369

net-misc/iaxmodem: remove 1.2.0-r1

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-misc/iaxmodem/Manifest                 |   1 -
 net-misc/iaxmodem/iaxmodem-1.2.0-r1.ebuild | 105 -----------------------------
 2 files changed, 106 deletions(-)

diff --git a/net-misc/iaxmodem/Manifest b/net-misc/iaxmodem/Manifest
index 91a248e3dff..479ed3d5632 100644
--- a/net-misc/iaxmodem/Manifest
+++ b/net-misc/iaxmodem/Manifest
@@ -1,2 +1 @@
-DIST iaxmodem-1.2.0.tar.gz 3075769 SHA256 fa263c0df0870cb8133c4bee141146ca5db47ece6db50899a6acf508d76591ed SHA512 53b66a0977366541ffaa743fcbefa11c20eb9ea7182245a1d11bc7fd015d98a4ec8086b3cb85b8de84f63d67221bccb1a868fe9f0a603de600023ea158909707 WHIRLPOOL a258b663909cd7d8aa8be0e543a5cbd482ce978bd95534959cd300f96572b199d538fb1e6d7b8ec07fffda33b6e5c446065db89d1bbe50fe199492e191a418f1
 DIST iaxmodem-1.3.0.tar.gz 2483995 SHA256 9dcff90bbc41846e5c3919ca92687df4b17f54d8df692940b8c67c4e98287535 SHA512 3add8fe1c228ee63f12a3d23fcc8bad5405b9fa6af70cadbcdb276d4e7dfe2a90f1b7c300d35659ab0247010c2315e25a5def5715e670071226bd89271d004f4 WHIRLPOOL 52502bdda06ec3bf128b738c0f7f59ea668961dbd70c31b873374c195bbbf23d0a1fb103d4b4baf313ec83a2c2d438e3a1db8bed772d5e5c0662f32741216c1e

diff --git a/net-misc/iaxmodem/iaxmodem-1.2.0-r1.ebuild b/net-misc/iaxmodem/iaxmodem-1.2.0-r1.ebuild
deleted file mode 100644
index 08ea1debae0..00000000000
--- a/net-misc/iaxmodem/iaxmodem-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs multilib
-
-DESCRIPTION="Software modem that uses an IAX channel instead of a traditional phone line"
-HOMEPAGE="https://sourceforge.net/projects/iaxmodem/"
-SRC_URI="mirror://sourceforge/iaxmodem/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-RDEPEND="media-libs/tiff:=
-	sys-process/procps"
-
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# fix header file position
-	sed -i -e 's:iax/iax-client\.h:iax-client.h:g' iaxmodem.c || die
-
-	# fix broken line terminators
-	sed -i -e 's:\r::g' -e 's:--s$:--:g' -e 's:$:\r:g' iaxmodem.inf || die
-
-	# fix installation of libiax2 headers (though we don't need them)
-	sed -i -e 's: \(\$(includedir)/\): $(DESTDIR)\1:g' lib/libiax2/src/Makefile.in || die
-
-	# patch configure (we compile libs for ourself)
-	sed -i -e 's:^\(cd\|./configure\):# \1:g' configure || die
-	sed -i -e 's:build-libiax build-libspandsp ::g' Makefile.in || die
-
-	# fix dumb x86_64 libdir handling
-	sed -i -e 's: \(x86_64-\*)\): _DISABLED_\1:g' lib/spandsp/configure || die
-}
-
-src_configure() {
-	cd "${S}/lib/libiax2" || die
-	econf --disable-static \
-		--libdir=/usr/$(get_libdir)/iaxmodem \
-		--datadir=/usr/share/iaxmodem/libiax2
-
-	cd "${S}/lib/spandsp" || die
-	econf --disable-static \
-		--libdir=/usr/$(get_libdir)/iaxmodem \
-		--datadir=/usr/share/iaxmodem
-
-	cd "${S}"
-	./configure || die "configure iaxmodem failed" || die
-}
-
-src_compile() {
-	cd "${S}/lib/libiax2" || die
-	emake
-
-	cd "${S}/lib/spandsp" || die
-	emake
-
-	cd "${S}"
-	emake OBJS="iaxmodem.o" CC=$(tc-getCC) \
-		LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/$(get_libdir)/iaxmodem \
-			-Llib/spandsp/src/.libs -Llib/libiax2/src/.libs -lm -lutil -ltiff -lspandsp -liax"
-}
-
-src_install() {
-	cd "${S}/lib/libiax2" || die
-	emake DESTDIR="${D}" install
-
-	cd "${S}/lib/spandsp" || die
-	emake DESTDIR="${D}" install
-
-	cd "${S}"
-	dosbin iaxmodem
-
-	# remove libiax and spandsp headers, we don't need them
-	rm -rf "${D}usr/include" "${D}usr/bin/iax-config" || die
-
-	# install init-script + conf
-	newinitd "${FILESDIR}/iaxmodem.initd" iaxmodem
-	newconfd "${FILESDIR}/iaxmodem.confd" iaxmodem
-
-	# install docs
-	doman iaxmodem.1
-	newdoc CHANGES ChangeLog
-	newdoc lib/libiax2/ChangeLog ChangeLog.libiax2
-	newdoc lib/spandsp/ChangeLog ChangeLog.spandsp
-	dodoc FAQ README lib/spandsp/DueDiligence
-
-	# install sample configs
-	insinto /etc/iaxmodem
-	newins "${FILESDIR}/iaxmodem.cfg" default
-	insinto /usr/share/iaxmodem
-	doins config.ttyIAX iaxmodem-cfg.ttyIAX iaxmodem.inf
-
-	# install logrotate rule
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/iaxmodem.logrotated" iaxmodem
-
-	# create log dir
-	keepdir /var/log/iaxmodem
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/iaxmodem/
@ 2021-11-25 21:59 Marek Szuba
  0 siblings, 0 replies; 7+ messages in thread
From: Marek Szuba @ 2021-11-25 21:59 UTC (permalink / raw
  To: gentoo-commits

commit:     4cd9ebbdc24a9b3e8be9d91c2f3fd97b9fc0f317
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 25 21:56:52 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Thu Nov 25 21:58:36 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cd9ebbd

net-misc/iaxmodem: add 1.3.3, drop 1.3.0-r1

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 net-misc/iaxmodem/Manifest                                     |  2 +-
 .../{iaxmodem-1.3.0-r1.ebuild => iaxmodem-1.3.3.ebuild}        | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/net-misc/iaxmodem/Manifest b/net-misc/iaxmodem/Manifest
index 8a12723344d6..92c3cca0ce78 100644
--- a/net-misc/iaxmodem/Manifest
+++ b/net-misc/iaxmodem/Manifest
@@ -1 +1 @@
-DIST iaxmodem-1.3.0.tar.gz 2483995 BLAKE2B 31329a1413781210f2c500124b7cd7c17de817f26cfebafe32813337142bba03a13b598b43dacc57abb386611f56bc19d6d2df3cf703289dbb1c9ee979be590c SHA512 3add8fe1c228ee63f12a3d23fcc8bad5405b9fa6af70cadbcdb276d4e7dfe2a90f1b7c300d35659ab0247010c2315e25a5def5715e670071226bd89271d004f4
+DIST iaxmodem-1.3.3.tar.gz 2479022 BLAKE2B df6fd8c7f82382a0975e3439ad92a40831ce6b8fc5fbad0e6fc62b546017d168f7f5b9a1c3449cb7cb7682ddb876efa3d26eab32aaae3be4c28184e735fa05d0 SHA512 216e1aec7e619a7559dcfc4dd431fe5866fce1218027ce0748c003081dba192924009b9d65f33806344f2dd1fb81c0365d241fd8834be9c0a730ab8506381883

diff --git a/net-misc/iaxmodem/iaxmodem-1.3.0-r1.ebuild b/net-misc/iaxmodem/iaxmodem-1.3.3.ebuild
similarity index 93%
rename from net-misc/iaxmodem/iaxmodem-1.3.0-r1.ebuild
rename to net-misc/iaxmodem/iaxmodem-1.3.3.ebuild
index e2c39c7b4f0f..d84be367eebf 100644
--- a/net-misc/iaxmodem/iaxmodem-1.3.0-r1.ebuild
+++ b/net-misc/iaxmodem/iaxmodem-1.3.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
-inherit toolchain-funcs multilib
+inherit toolchain-funcs
 
 DESCRIPTION="Software modem that uses an IAX channel instead of a traditional phone line"
 HOMEPAGE="https://sourceforge.net/projects/iaxmodem/"
-SRC_URI="mirror://sourceforge/iaxmodem/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -18,6 +18,8 @@ RDEPEND="media-libs/tiff:=
 DEPEND="${RDEPEND}"
 
 src_prepare() {
+	default
+
 	# fix header file position
 	sed -i -e 's:iax/iax-client\.h:iax-client.h:g' iaxmodem.c || die
 
@@ -74,7 +76,7 @@ src_install() {
 	dosbin iaxmodem
 
 	# remove libiax and spandsp headers, we don't need them
-	rm -rf "${D}usr/include" "${D}usr/bin/iax-config" || die
+	rm -rf "${D}/usr/include" "${D}/usr/bin/iax-config" || die
 
 	# install init-script + conf
 	newinitd "${FILESDIR}/iaxmodem.initd" iaxmodem


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/iaxmodem/
@ 2022-03-19 23:39 Sam James
  0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2022-03-19 23:39 UTC (permalink / raw
  To: gentoo-commits

commit:     44480956a2c1af5bf3a59a304482d62682da4420
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 19 23:39:25 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 19 23:39:25 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44480956

net-misc/iaxmodem: [QA] fix tc-get* quoting

This can cause build problems for e.g. 32-bit (gcc -m32 ...)

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/iaxmodem/iaxmodem-1.3.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/iaxmodem/iaxmodem-1.3.3.ebuild b/net-misc/iaxmodem/iaxmodem-1.3.3.ebuild
index d84be367eebf..708f599e6d9d 100644
--- a/net-misc/iaxmodem/iaxmodem-1.3.3.ebuild
+++ b/net-misc/iaxmodem/iaxmodem-1.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -60,7 +60,7 @@ src_compile() {
 	emake
 
 	cd "${S}"
-	emake OBJS="iaxmodem.o" CC=$(tc-getCC) \
+	emake OBJS="iaxmodem.o" CC="$(tc-getCC)" \
 		LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/$(get_libdir)/iaxmodem \
 			-Llib/spandsp/src/.libs -Llib/libiax2/src/.libs -lm -lutil -ltiff -lspandsp -liax"
 }


^ permalink raw reply related	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-03-19 23:39 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-11-25 21:59 [gentoo-commits] repo/gentoo:master commit in: net-misc/iaxmodem/ Marek Szuba
  -- strict thread matches above, loose matches on Subject: below --
2022-03-19 23:39 Sam James
2017-03-18  8:40 Michael Palimaka
2016-05-04  0:10 Austin English
2016-02-10 19:35 Amy Winston
2016-02-10 16:03 Amy Winston
2016-02-10 16:03 Amy Winston

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox