old

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

6 files changed, 6 insertions, 348 deletions

diff --git a/media-libs/nas/ChangeLog b/media-libs/nas/ChangeLog
index ebd8b583dfd2..feb374b0cf56 100644
--- a/media-libs/nas/ChangeLog
+++ b/media-libs/nas/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/nas
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/ChangeLog,v 1.90 2014/02/22 07:40:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/ChangeLog,v 1.91 2014/04/05 19:24:30 ssuominen Exp $
+
+  05 Apr 2014; Samuli Suominen <ssuominen@gentoo.org>
+  -files/nas-1.9.2-implicit-inet_ntoa-amd64.patch, -nas-1.9.2-r1.ebuild,
+  -nas-1.9.2.ebuild, -nas-1.9.3-r1.ebuild, -nas-1.9.3.ebuild:
+  old
 
   22 Feb 2014; Agostino Sarubbo <ago@gentoo.org> nas-1.9.4.ebuild:
   Stable for sparc, wrt bug #484480
diff --git a/media-libs/nas/files/nas-1.9.2-implicit-inet_ntoa-amd64.patch b/media-libs/nas/files/nas-1.9.2-implicit-inet_ntoa-amd64.patch
deleted file mode 100644
index 978a2f11fdf3..000000000000
--- a/media-libs/nas/files/nas-1.9.2-implicit-inet_ntoa-amd64.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://bugs.gentoo.org/323511
-
---- server/os/connection.c
-+++ server/os/connection.c
-@@ -75,9 +75,9 @@ SOFTWARE.
- #include <sys/socket.h>
- #include <sys/stat.h>
- #include <netinet/in.h>
--#include <arpa/inet.h>
- #include <netdb.h>
- #endif
-+#include <arpa/inet.h>
- 
- 
- 
-
diff --git a/media-libs/nas/nas-1.9.2-r1.ebuild b/media-libs/nas/nas-1.9.2-r1.ebuild
deleted file mode 100644
index db34adad44cd..000000000000
--- a/media-libs/nas/nas-1.9.2-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/nas-1.9.2-r1.ebuild,v 1.2 2012/12/03 23:14:19 ulm Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Network Audio System"
-HOMEPAGE="http://radscan.com/nas.html"
-SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
-
-LICENSE="HPND MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND="x11-libs/libXt
-	x11-libs/libXau
-	x11-libs/libXaw
-	x11-libs/libX11
-	x11-libs/libXres
-	x11-libs/libXTrap
-	x11-libs/libXp"
-DEPEND="${RDEPEND}
-	x11-misc/gccmakedep
-	x11-misc/imake
-	app-text/rman
-	x11-proto/xproto"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-asneeded.patch \
-		"${FILESDIR}"/${P}-implicit-inet_ntoa-amd64.patch
-}
-
-src_compile() {
-	xmkmf || die "xmkmf failed"
-	touch doc/man/lib/tmp.{_man,man}
-	emake \
-		MAKE="${MAKE:-gmake}" \
-		CDEBUGFLAGS="${CFLAGS}" \
-		CXXDEBUFLAGS="${CXXFLAGS}" \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR) clq" \
-		AS="$(tc-getAS)" \
-		LD="$(tc-getLD)" \
-		RANLIB="$(tc-getRANLIB)" World || die "emake World failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install install.man || die "emake install failed"
-	dodoc BUILDNOTES FAQ HISTORY README RELEASE TODO
-
-	if use doc; then
-		docinto doc
-		dodoc doc/{actions,protocol.txt,README}
-		insinto /usr/share/doc/${PF}/pdf
-		doins doc/pdf/*.pdf
-	fi
-
-	mv "${D}"/etc/nas/nasd.conf{.eg,}
-
-	newconfd "${FILESDIR}"/nas.conf.d nas
-	newinitd "${FILESDIR}"/nas.init.d nas
-}
-
-pkg_postinst() {
-	elog "To enable NAS on boot you will have to add it to the"
-	elog "default profile, issue the following command as root:"
-	elog "# rc-update add nas default"
-}
diff --git a/media-libs/nas/nas-1.9.2.ebuild b/media-libs/nas/nas-1.9.2.ebuild
deleted file mode 100644
index b0513a5e5e01..000000000000
--- a/media-libs/nas/nas-1.9.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/nas-1.9.2.ebuild,v 1.10 2012/12/03 23:14:19 ulm Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Network Audio System"
-HOMEPAGE="http://radscan.com/nas.html"
-SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
-
-LICENSE="HPND MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND="x11-libs/libXt
-	x11-libs/libXau
-	x11-libs/libXaw
-	x11-libs/libX11
-	x11-libs/libXres
-	x11-libs/libXTrap
-	x11-libs/libXp"
-DEPEND="${RDEPEND}
-	x11-misc/gccmakedep
-	x11-misc/imake
-	app-text/rman
-	x11-proto/xproto"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-asneeded.patch
-}
-
-src_compile() {
-	xmkmf || die "xmkmf failed"
-	touch doc/man/lib/tmp.{_man,man}
-	emake \
-		MAKE="${MAKE:-gmake}" \
-		CDEBUGFLAGS="${CFLAGS}" \
-		CXXDEBUFLAGS="${CXXFLAGS}" \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR) clq" \
-		AS="$(tc-getAS)" \
-		LD="$(tc-getLD)" \
-		RANLIB="$(tc-getRANLIB)" World || die "emake World failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install install.man || die "emake install failed"
-	dodoc BUILDNOTES FAQ HISTORY README RELEASE TODO
-
-	if use doc; then
-		docinto doc
-		dodoc doc/{actions,protocol.txt,README}
-		insinto /usr/share/doc/${PF}/pdf
-		doins doc/pdf/*.pdf
-	fi
-
-	mv "${D}"/etc/nas/nasd.conf{.eg,}
-
-	newconfd "${FILESDIR}"/nas.conf.d nas
-	newinitd "${FILESDIR}"/nas.init.d nas
-}
-
-pkg_postinst() {
-	elog "To enable NAS on boot you will have to add it to the"
-	elog "default profile, issue the following command as root:"
-	elog "# rc-update add nas default"
-}
diff --git a/media-libs/nas/nas-1.9.3-r1.ebuild b/media-libs/nas/nas-1.9.3-r1.ebuild
deleted file mode 100644
index 47e3430968c3..000000000000
--- a/media-libs/nas/nas-1.9.3-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/nas-1.9.3-r1.ebuild,v 1.3 2014/02/16 16:25:52 ssuominen Exp $
-
-EAPI=5
-inherit eutils multilib toolchain-funcs multilib-minimal
-
-DESCRIPTION="Network Audio System"
-HOMEPAGE="http://radscan.com/nas.html"
-SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
-
-LICENSE="HPND MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc static-libs"
-
-RDEPEND="x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau[${MULTILIB_USEDEP}]
-	x11-libs/libXaw
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	app-text/rman
-	sys-devel/bison
-	sys-devel/flex
-	x11-misc/gccmakedep
-	x11-misc/imake
-	x11-proto/xproto[${MULTILIB_USEDEP}]"
-
-DOCS=( BUILDNOTES FAQ HISTORY README RELEASE TODO )
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.9.2-asneeded.patch \
-		"${FILESDIR}"/${PN}-1.9.2-implicit-inet_ntoa-amd64.patch
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	xmkmf -a || die
-}
-
-multilib_src_compile() {
-	# EXTRA_LDOPTIONS, SHLIBGLOBALSFLAGS #336564#c2
-	local emakeopts=(
-		AR="$(tc-getAR) clq"
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		CDEBUGFLAGS="${CFLAGS}"
-		CXX="$(tc-getCXX)"
-		CXXDEBUFLAGS="${CXXFLAGS}"
-		EXTRA_LDOPTIONS="${LDFLAGS}"
-		LD="$(tc-getLD)"
-		MAKE="${MAKE:-gmake}"
-		RANLIB="$(tc-getRANLIB)"
-		SHLIBGLOBALSFLAGS="${LDFLAGS}"
-		WORLDOPTS=
-	)
-
-	if multilib_is_native_abi ; then
-		# dumb fix for parallel make issue wrt #446598, Imake sux
-		emake "${emakeopts[@]}" -C server/dia all
-		emake "${emakeopts[@]}" -C server/dda/voxware all
-		emake "${emakeopts[@]}" -C server/os all
-	else
-		sed -i \
-			-e 's/SUBDIRS =.*/SUBDIRS = include lib config/' \
-			Makefile || die
-	fi
-
-	emake "${emakeopts[@]}" World
-}
-
-multilib_src_install() {
-	# ranlib is used at install phase too wrt #446600
-	emake RANLIB="$(tc-getRANLIB)" \
-		DESTDIR="${D}" USRLIBDIR=/usr/$(get_libdir) \
-		install install.man
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	if use doc; then
-		docinto doc
-		dodoc doc/{actions,protocol.txt,README}
-		docinto pdf
-		dodoc doc/pdf/*.pdf
-	fi
-
-	mv -vf "${D}"/etc/nas/nasd.conf{.eg,} || die
-
-	newconfd "${FILESDIR}"/nas.conf.d nas
-	newinitd "${FILESDIR}"/nas.init.d nas
-
-	use static-libs || rm -f "${D}"/usr/lib*/libaudio.a
-}
diff --git a/media-libs/nas/nas-1.9.3.ebuild b/media-libs/nas/nas-1.9.3.ebuild
deleted file mode 100644
index b7b2f799ecb7..000000000000
--- a/media-libs/nas/nas-1.9.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/nas-1.9.3.ebuild,v 1.3 2012/12/09 16:16:36 hasufell Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Network Audio System"
-HOMEPAGE="http://radscan.com/nas.html"
-SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
-
-LICENSE="HPND MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc static-libs"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXaw
-	x11-libs/libXp
-	x11-libs/libXres
-	x11-libs/libXt
-	x11-libs/libXTrap"
-DEPEND="${RDEPEND}
-	app-text/rman
-	x11-misc/gccmakedep
-	x11-misc/imake
-	x11-proto/xproto"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch \
-		"${FILESDIR}"/${PN}-1.9.2-asneeded.patch \
-		"${FILESDIR}"/${PN}-1.9.2-implicit-inet_ntoa-amd64.patch
-}
-
-src_compile() {
-	xmkmf -a || die
-
-# I *think* this was because of missing -a switch in xmkmf, lets test without:
-#	touch doc/man/lib/tmp.{_man,man}
-
-	# EXTRA_LDOPTIONS, SHLIBGLOBALSFLAGS #336564#c2
-	local emakeopts=(
-		AR="$(tc-getAR) clq"
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		CDEBUGFLAGS="${CFLAGS}"
-		CXX="$(tc-getCXX)"
-		CXXDEBUFLAGS="${CXXFLAGS}"
-		EXTRA_LDOPTIONS="${LDFLAGS}"
-		LD="$(tc-getLD)"
-		MAKE="${MAKE:-gmake}"
-		RANLIB="$(tc-getRANLIB)"
-		SHLIBGLOBALSFLAGS="${LDFLAGS}"
-		)
-
-	# dumb fix for parallel make issue wrt #446598, Imake sux
-	emake "${emakeopts[@]}" -C server/dia all || die
-	emake "${emakeopts[@]}" -C server/dda/voxware all || die
-	emake "${emakeopts[@]}" -C server/os all || die
-
-	emake "${emakeopts[@]}" World || die
-}
-
-src_install() {
-	# ranlib is used at install phase too wrt #446600
-	emake RANLIB="$(tc-getRANLIB)" DESTDIR="${D}" install install.man || die
-	dodoc BUILDNOTES FAQ HISTORY README RELEASE TODO
-
-	if use doc; then
-		docinto doc
-		dodoc doc/{actions,protocol.txt,README}
-		docinto pdf
-		dodoc doc/pdf/*.pdf
-	fi
-
-	mv -vf "${D}"/etc/nas/nasd.conf{.eg,} || die
-
-	newconfd "${FILESDIR}"/nas.conf.d nas || die
-	newinitd "${FILESDIR}"/nas.init.d nas || die
-
-	use static-libs || rm -f "${D}"/usr/lib*/libaudio.a
-
-	[[ -e ${D}/usr/bin/nasd ]] || \
-		die "Missing nasd executable in the destination directory. Exiting." #314631
-}