[gentoo-commits] repo/gentoo:master commit in: sys-fs/owfs/files/, sys-fs/owfs/

[Michael Palimaka]

commit:     96b46325f8e468dbba02a7ed1199e3fed5fd9761
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 30 08:05:45 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Mar 30 08:05:54 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96b46325

sys-fs/owfs: remove old

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 sys-fs/owfs/Manifest                   |   2 -
 sys-fs/owfs/files/owfs-vendordir.patch |  30 ------
 sys-fs/owfs/files/owfs.initd           |  31 ------
 sys-fs/owfs/files/owftpd.initd         |  31 ------
 sys-fs/owfs/files/owhttpd.initd        |  31 ------
 sys-fs/owfs/files/owserver.initd       |  31 ------
 sys-fs/owfs/metadata.xml               |   1 -
 sys-fs/owfs/owfs-2.7_p21-r4.ebuild     | 167 --------------------------------
 sys-fs/owfs/owfs-3.1_p1.ebuild         | 170 ---------------------------------
 9 files changed, 494 deletions(-)

diff --git a/sys-fs/owfs/Manifest b/sys-fs/owfs/Manifest
index 549445dd52c..fda88792fa0 100644
--- a/sys-fs/owfs/Manifest
+++ b/sys-fs/owfs/Manifest
@@ -1,3 +1 @@
-DIST owfs-2.7p21.tar.gz 1247466 SHA256 070a3368e9400e900618f8a704f487baf3671f6764715b4de04b151c66d3306d SHA512 ec6d372d32ebf59278c2c68d5fbed42664f52bc1702f4ea8e5506457594943413e37801d341102029cb48a9d8c3d6b3d68615a1dd517c93aa0a475a1bb06c4cf WHIRLPOOL 31901ae07a7431a368cdb4fa0a30a1885da29f55187dc601b53f2e9ebf4e11aba73de93d7f6308671ecb3afa8433548b41a2e79a9a0cc4771adee93a5a6a1ddd
-DIST owfs-3.1p1.tar.gz 1400962 SHA256 e69421ae534565c1f8530a2447f583401f4d0d4b1cf3cb8cf399a57133ed7f81 SHA512 f5c2694ce1076969cf4a6970a07b2c2edee42cfbc6886c1790d777d650cc0afe42cf3282328f8832d5286a0aa5827c48e3d4657412ba3391db5e26adfa890cf5 WHIRLPOOL 2a3a4ebeb3eebaf0d370a7dcc8a9a5fb95defa3e218039f9203b996e4ac2272c2a16323bb8e43da39df9a389dbd057e49c936f40bdc08de201076fbd8d2fdba4
 DIST owfs-3.1p4.tar.gz 1455420 SHA256 83ea34ede9f44665c5bef4e46fd9bbc087ad8a76c533bcbf03b436b7601e1e54 SHA512 9d04b466fc64761f53dc5fb11b4eb71d10154be5eb335174e8a9002a944bb3f2fbfe1cea3cf5962aa794486830e78d7ba5a7a87c68e3a4d32ab1a95e7ca59cdb WHIRLPOOL 0a1790e111e01bd66237899311ae348bd347f6446094fe7a33d36f2f86db5c18211abd13f76c7e080398f3daf3f20184542f083c818f028ec6f2ca695accebd4

diff --git a/sys-fs/owfs/files/owfs-vendordir.patch b/sys-fs/owfs/files/owfs-vendordir.patch
deleted file mode 100644
index ac09e4f2fc7..00000000000
--- a/sys-fs/owfs/files/owfs-vendordir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ruN owfs-2.7p21.orig/module/ownet/perl5/Makefile.am owfs-2.7p21/module/ownet/perl5/Makefile.am
---- owfs-2.7p21.orig/module/ownet/perl5/Makefile.am	2008-06-12 16:24:30.000000000 +0200
-+++ owfs-2.7p21/module/ownet/perl5/Makefile.am	2012-05-20 15:45:07.340529762 +0200
-@@ -7,9 +7,9 @@
- # Can't really install the perl-modules under prefix-directory.. it should be site-global.
- OWNet/Makefile: OWNet/Makefile.PL
- if HAVE_DEBIAN
--	( cd OWNet; $(PERL) Makefile.PL PREFIX=@prefix@ )
-+	( cd OWNet; $(PERL) Makefile.PL PREFIX=@prefix@ INSTALLDIRS=vendor )
- else
--	( cd OWNet; $(PERL) Makefile.PL )
-+	( cd OWNet; $(PERL) Makefile.PL INSTALLDIRS=vendor )
- endif
- 
- install-data-local: OWNet/Makefile
-diff -ruN owfs-2.7p21.orig/module/swig/perl5/Makefile.am owfs-2.7p21/module/swig/perl5/Makefile.am
---- owfs-2.7p21.orig/module/swig/perl5/Makefile.am	2008-06-12 16:24:30.000000000 +0200
-+++ owfs-2.7p21/module/swig/perl5/Makefile.am	2012-05-20 15:44:04.519526274 +0200
-@@ -17,9 +17,9 @@
- 	( cd OW; $(PERL) Makefile.PL )
- else
- if HAVE_DEBIAN
--	( cd OW; $(PERL) Makefile.PL PREFIX=@prefix@ )
-+	( cd OW; $(PERL) Makefile.PL PREFIX=@prefix@ INSTALLDIRS=vendor )
- else
--	( cd OW; $(PERL) Makefile.PL )
-+	( cd OW; $(PERL) Makefile.PL INSTALLDIRS=vendor )
- endif
- endif
- 

diff --git a/sys-fs/owfs/files/owfs.initd b/sys-fs/owfs/files/owfs.initd
deleted file mode 100644
index a1ade56a561..00000000000
--- a/sys-fs/owfs/files/owfs.initd
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-INSTANCE=${SVCNAME#*.}
-PROGRAM=${SVCNAME%%.*}
-PIDFILE=${PIDFILE:-/var/run/owfs/${PROGRAM}.pid}
-OWUID=${OWUID:-owfs}
-OWGID=${OWGID:-owfs}
-
-depend() {
-	need net
-	use logger owserver
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --exec /usr/bin/${PROGRAM} \
-		--pidfile ${PIDFILE} -c ${OWUID}:${OWGID} -- \
-		--pid_file ${PIDFILE} \
-		--background --error_print 1 \
-		${OWFS_OPTS:--m /var/lib/owfs/mnt --allow_other -s 127.0.0.1:4304}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --exec /usr/bin/${PROGRAM} \
-		--pidfile ${PIDFILE} -u ${OWUID}
-	eend $?
-}

diff --git a/sys-fs/owfs/files/owftpd.initd b/sys-fs/owfs/files/owftpd.initd
deleted file mode 100644
index 180ecf9efcd..00000000000
--- a/sys-fs/owfs/files/owftpd.initd
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-INSTANCE=${SVCNAME#*.}
-PROGRAM=${SVCNAME%%.*}
-PIDFILE=${PIDFILE:-/var/run/owfs/${PROGRAM}.pid}
-OWUID=${OWUID:-owfs}
-OWGID=${OWGID:-owfs}
-
-depend() {
-	need net
-	use logger owserver
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --exec /usr/bin/${PROGRAM} \
-		--pidfile ${PIDFILE} -c ${OWUID}:${OWGID} -- \
-		--pid_file ${PIDFILE} \
-		--background --error_print 1 \
-		${OWFTPD_OPTS:---nozero -p 127.0.0.1:4381 -s 127.0.0.1:4304 --max_clients 5 --timeout_ftp 600}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --exec /usr/bin/${PROGRAM} \
-		--pidfile ${PIDFILE} -u ${OWUID}
-	eend $?
-}

diff --git a/sys-fs/owfs/files/owhttpd.initd b/sys-fs/owfs/files/owhttpd.initd
deleted file mode 100644
index f30dd6efb1e..00000000000
--- a/sys-fs/owfs/files/owhttpd.initd
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-INSTANCE=${SVCNAME#*.}
-PROGRAM=${SVCNAME%%.*}
-PIDFILE=${PIDFILE:-/var/run/owfs/${PROGRAM}.pid}
-OWUID=${OWUID:-owfs}
-OWGID=${OWGID:-owfs}
-
-depend() {
-	need net
-	use logger owserver
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --exec /usr/bin/${PROGRAM} \
-		--pidfile ${PIDFILE} -c ${OWUID}:${OWGID} -- \
-		--pid_file ${PIDFILE} \
-		--background --error_print 1 \
-		${OWHTTPD_OPTS:---nozero -p 127.0.0.1:4380 -s 127.0.0.1:4304}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --exec /usr/bin/${PROGRAM} \
-		--pidfile ${PIDFILE} -u ${OWUID}
-	eend $?
-}

diff --git a/sys-fs/owfs/files/owserver.initd b/sys-fs/owfs/files/owserver.initd
deleted file mode 100644
index 9ad58ca225e..00000000000
--- a/sys-fs/owfs/files/owserver.initd
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-INSTANCE=${SVCNAME#*.}
-PROGRAM=${SVCNAME%%.*}
-PIDFILE=${PIDFILE:-/var/run/owfs/${PROGRAM}.pid}
-OWUID=${OWUID:-owfs}
-OWGID=${OWGID:-owfs}
-
-depend() {
-	need net
-	use logger
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --exec /usr/bin/${PROGRAM} \
-		--pidfile ${PIDFILE} -c ${OWUID}:${OWGID} -- \
-		--pid_file ${PIDFILE} \
-		--background --error_print 1 \
-		${OWSERVER_OPTS:---nozero -p 127.0.0.1:4304 -d /dev/ttyS0}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --exec /usr/bin/${PROGRAM} \
-		--pidfile ${PIDFILE} -u ${OWUID}
-	eend $?
-}

diff --git a/sys-fs/owfs/metadata.xml b/sys-fs/owfs/metadata.xml
index 0b9818389ae..3643be9f41d 100644
--- a/sys-fs/owfs/metadata.xml
+++ b/sys-fs/owfs/metadata.xml
@@ -20,7 +20,6 @@
 		<flag name="fuse">Enable building the FUSE-based OWFS client (owfs)</flag>
 		<flag name="httpd">Enable building the OWFS web server (owhttpd)</flag>
 		<flag name="parport">Enable support for the DS1410E parallel port adapter</flag>
-		<flag name="server">Enable building the OWFS server (owserver)</flag>
 		<flag name="zeroconf">Enables support for zero-configuration networking via <pkg>net-dns/avahi</pkg></flag>
 	</use>
 </pkgmetadata>

diff --git a/sys-fs/owfs/owfs-2.7_p21-r4.ebuild b/sys-fs/owfs/owfs-2.7_p21-r4.ebuild
deleted file mode 100644
index be8f703a8f7..00000000000
--- a/sys-fs/owfs/owfs-2.7_p21-r4.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 eutils perl-module autotools user
-
-MY_P=${P/_/}
-
-DESCRIPTION="Access 1-Wire devices like a filesystem"
-SRC_URI="mirror://sourceforge/owfs/${MY_P}.tar.gz"
-HOMEPAGE="http://www.owfs.org/ http://owfs.sourceforge.net/"
-
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-RDEPEND="
-	fuse? ( sys-fs/fuse )
-	perl? ( dev-lang/perl )
-	php? ( dev-lang/php:=[cli] )
-	python? ( ${PYTHON_DEPS} )
-	tcl? ( dev-lang/tcl:0= )
-	usb? ( virtual/libusb:0 )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
-
-DEPEND="${RDEPEND}
-	perl? ( dev-lang/swig )
-	php? ( dev-lang/swig )
-	python? ( dev-lang/swig )"
-
-IUSE="debug fuse ftpd httpd parport perl php python server tcl usb zeroconf"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S=${WORKDIR}/${MY_P}
-
-OWUID=${OWUID:-owfs}
-OWGID=${OWGID:-owfs}
-
-pkg_setup() {
-	enewgroup ${OWGID} 150
-	enewuser  ${OWUID} 150 -1 -1 ${OWGID}
-}
-
-src_prepare() {
-	# Support user's CFLAGS and LDFLAGS.
-	sed -i "s/@CPPFLAGS@/@CPPFLAGS@ ${CFLAGS}/" \
-		module/swig/perl5/OW/Makefile.linux.in || die
-	sed -i "s/@LIBS@/@LIBS@ ${LDFLAGS}/" \
-		module/swig/perl5/OW/Makefile.linux.in || die
-
-	epatch "${FILESDIR}/${PN}-vendordir.patch"
-
-	eautoreconf
-}
-
-src_configure() {
-	# disable owpython since we can build python anyway
-	# and without it, we don't have to fix the build ;)
-	econf \
-		$(use_enable debug) \
-		$(use_enable fuse owfs) \
-		$(use_enable ftpd owftpd) \
-		$(use_enable httpd owhttpd) \
-		$(use_enable parport) \
-		$(use_enable perl owperl) \
-		$(use_enable php owphp) \
-		--disable-owpython \
-		$(use_enable server owserver) \
-		$(use_enable tcl owtcl) \
-		$(use_enable zeroconf zero) \
-		$(use_enable usb)
-}
-
-src_compile() {
-	default
-
-	if use python; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-
-		pushd module/ownet/python > /dev/null || die
-		distutils-r1_src_compile
-		popd > /dev/null || die
-
-		pushd module/swig/python > /dev/null || die
-		emake ow_wrap.c
-		distutils-r1_src_compile
-		popd > /dev/null || die
-	fi
-}
-
-src_test() { :; }
-
-src_install() {
-	default
-
-	if use server || use httpd || use ftpd || use fuse; then
-		diropts -m 0750 -o ${OWUID} -g ${OWGID}
-		dodir /var/run/owfs
-
-		for i in server httpd ftpd; do
-			if use ${i}; then
-				newinitd "${FILESDIR}"/ow${i}.initd ow${i}
-				newconfd "${FILESDIR}"/ow${i}.confd ow${i}
-			fi
-		done
-
-		if use fuse; then
-			dodir /var/lib/owfs
-			dodir /var/lib/owfs/mnt
-			newinitd "${FILESDIR}"/owfs.initd owfs
-			newconfd "${FILESDIR}"/owfs.confd owfs
-		fi
-	fi
-	use perl && perl_delete_localpod
-
-	if use python; then
-		pushd module/ownet/python > /dev/null || die
-		distutils-r1_src_install
-		popd > /dev/null || die
-
-		pushd module/swig/python > /dev/null || die
-		distutils-r1_src_install
-		popd > /dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	if use server || use httpd || use ftpd || use fuse; then
-		echo
-		einfo
-		einfo "Be sure to check/edit the following files,"
-		einfo "e.g. to fit your 1 wire bus controller"
-		einfo "device or daemon network settings:"
-		for i in server httpd ftpd; do
-			if use ${i}; then
-				einfo "- ${ROOT%/}/etc/conf.d/ow${i}"
-			fi
-		done
-		if use fuse; then
-			einfo "- ${ROOT%/}/etc/conf.d/owfs"
-		fi
-		einfo
-		echo
-		if [[ ${OWUID} != root ]]; then
-			ewarn
-			ewarn "In order to allow the OWFS daemon user '${OWUID}' to read"
-			ewarn "from and/or write to a 1 wire bus controller device, make"
-			ewarn "sure the user has appropriate permission to access the"
-			ewarn "corresponding device node/path (e.g. /dev/ttyS0), for example"
-			ewarn "by adding the user to the group 'uucp' (for serial devices)"
-			ewarn "or 'usb' (for USB devices accessed via usbfs on /proc/bus/usb)."
-			ewarn
-			if use fuse; then
-				ewarn "In order to allow regular users to read from and/or write to"
-				ewarn "1 wire bus devices accessible via the owfs FUSE filesystem"
-				ewarn "client and its filesystem mountpoint, make sure the user is"
-				ewarn "a member of the group '${OWGID}'."
-				ewarn
-			fi
-			echo
-		fi
-	fi
-}

diff --git a/sys-fs/owfs/owfs-3.1_p1.ebuild b/sys-fs/owfs/owfs-3.1_p1.ebuild
deleted file mode 100644
index 9551eb95165..00000000000
--- a/sys-fs/owfs/owfs-3.1_p1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-
-inherit autotools distutils-r1 perl-functions user
-
-MY_P=${P/_/}
-
-DESCRIPTION="Access 1-Wire devices like a filesystem"
-SRC_URI="mirror://sourceforge/owfs/${MY_P}.tar.gz"
-HOMEPAGE="http://owfs.org/ https://sourceforge.net/projects/owfs/"
-
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0/1"
-LICENSE="GPL-2"
-
-RDEPEND="
-	fuse? ( sys-fs/fuse )
-	perl? ( dev-lang/perl:= )
-	php? ( dev-lang/php:=[cli] )
-	python? ( ${PYTHON_DEPS} )
-	tcl? ( dev-lang/tcl:0= )
-	usb? ( virtual/libusb:0 )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
-
-DEPEND="${RDEPEND}
-	perl? ( dev-lang/swig )
-	php? ( dev-lang/swig )
-	python? ( dev-lang/swig )"
-
-IUSE="debug ftpd fuse httpd parport perl php python tcl usb zeroconf"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1-vendordir.patch
-)
-
-S=${WORKDIR}/${MY_P}
-
-OWUID=${OWUID:-owfs}
-OWGID=${OWGID:-owfs}
-
-pkg_setup() {
-	use perl && perl_set_version
-
-	enewgroup ${OWGID} 150
-	enewuser  ${OWUID} 150 -1 -1 ${OWGID}
-}
-
-src_prepare() {
-	default
-
-	# Support user's CFLAGS and LDFLAGS.
-	sed -i "s/@CPPFLAGS@/@CPPFLAGS@ ${CFLAGS}/" \
-		module/swig/perl5/OW/Makefile.linux.in || die
-	sed -i "s/@LIBS@/@LIBS@ ${LDFLAGS}/" \
-		module/swig/perl5/OW/Makefile.linux.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# disable owpython since we can build python anyway
-	# and without it, we don't have to fix the build ;)
-	local myeconf=(
-		$(use_enable debug)
-		$(use_enable fuse owfs)
-		$(use_enable ftpd owftpd)
-		$(use_enable httpd owhttpd)
-		$(use_enable parport)
-		$(use_enable perl owperl)
-		$(use_enable php owphp)
-		--disable-owpython
-		$(use_enable tcl owtcl)
-		$(use_enable zeroconf zero)
-		$(use_enable usb)
-	)
-
-	if use httpd || use ftpd || use fuse; then
-		myeconf+=( --enable-owserver )
-	else
-		myeconf+=( --disable-owserver )
-	fi
-
-	econf ${myeconf[@]}
-}
-
-src_compile() {
-	default
-
-	if use python; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-
-		pushd module/ownet/python > /dev/null || die
-		distutils-r1_src_compile
-		popd > /dev/null || die
-
-		pushd module/swig/python > /dev/null || die
-		emake ow_wrap.c
-		distutils-r1_src_compile
-		popd > /dev/null || die
-	fi
-}
-
-src_test() { :; }
-
-src_install() {
-	default
-
-	if use httpd || use ftpd || use fuse; then
-		newinitd "${FILESDIR}"/owserver.initd-r1 owserver
-		newconfd "${FILESDIR}"/owserver.confd owserver
-
-		for i in httpd ftpd; do
-			if use ${i}; then
-				newinitd "${FILESDIR}"/ow${i}.initd-r1 ow${i}
-				newconfd "${FILESDIR}"/ow${i}.confd ow${i}
-			fi
-		done
-
-		if use fuse; then
-			dodir /var/lib/owfs
-			dodir /var/lib/owfs/mnt
-			newinitd "${FILESDIR}"/owfs.initd-r1 owfs
-			newconfd "${FILESDIR}"/owfs.confd owfs
-		fi
-	fi
-
-	use perl && perl_delete_localpod
-
-	if use python; then
-		pushd module/ownet/python > /dev/null || die
-		distutils-r1_src_install
-		popd > /dev/null || die
-
-		pushd module/swig/python > /dev/null || die
-		distutils-r1_src_install
-		popd > /dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	if use httpd || use ftpd || use fuse; then
-		echo
-		if [[ ${OWUID} != root ]]; then
-			ewarn
-			ewarn "In order to allow the OWFS daemon user '${OWUID}' to read"
-			ewarn "from and/or write to a 1 wire bus controller device, make"
-			ewarn "sure the user has appropriate permission to access the"
-			ewarn "corresponding device node/path (e.g. /dev/ttyS0), for example"
-			ewarn "by adding the user to the group 'uucp' (for serial devices)"
-			ewarn "or 'usb' (for USB devices accessed via usbfs on /proc/bus/usb),"
-			ewarn "or install an appropriate UDEV rules (see http://owfs.org/index.php?page=udev-and-usb"
-			ewarn "for more information)."
-			ewarn
-			if use fuse; then
-				ewarn "In order to allow regular users to read from and/or write to"
-				ewarn "1 wire bus devices accessible via the owfs FUSE filesystem"
-				ewarn "client and its filesystem mountpoint, make sure the user is"
-				ewarn "a member of the group '${OWGID}'."
-				ewarn
-			fi
-			echo
-		fi
-	fi
-}