commit: 32f22b5061c59a63ac3bc641661eea759fe03b77 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Aug 27 18:30:10 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Aug 28 06:54:33 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32f22b50
media-sound/edna: Remove last-rited package Closes: https://bugs.gentoo.org/735404 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-sound/edna/Manifest | 1 - media-sound/edna/edna-0.6.ebuild | 68 ------------------- media-sound/edna/files/edna-0.6-SystemExit.patch | 11 ---- media-sound/edna/files/edna-0.6-daemon.patch | 67 ------------------- media-sound/edna/files/edna-0.6-flac.patch | 79 ---------------------- media-sound/edna/files/edna-0.6-syslog.patch | 83 ------------------------ media-sound/edna/files/edna.gentoo | 31 --------- media-sound/edna/metadata.xml | 14 ---- profiles/package.mask | 5 -- 9 files changed, 359 deletions(-) diff --git a/media-sound/edna/Manifest b/media-sound/edna/Manifest deleted file mode 100644 index 6d15bdcf28f..00000000000 --- a/media-sound/edna/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST edna-0.6.tar.gz 50303 BLAKE2B 754017434722f5f6b0be508785b137ae1051a7566c39922b46732177b8cb61ceb509577bf167c7fb1a19f6cdb81cb45469009134d0dc18f8bf7c900326be18dd SHA512 d48786829c127b0a1e24116524b8b95a91990c8952882ef00d7761fc6c1dd9b4b0037af2b176dbfd066b6d80670bad7a0c724af984b24c6b4bde93c884c3b76b diff --git a/media-sound/edna/edna-0.6.ebuild b/media-sound/edna/edna-0.6.ebuild deleted file mode 100644 index 3136909a43b..00000000000 --- a/media-sound/edna/edna-0.6.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils multilib user python-r1 - -DESCRIPTION="Greg Stein's python streaming audio server for desktop or LAN use" -HOMEPAGE="http://edna.sourceforge.net/"; -SRC_URI="mirror://sourceforge/edna/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 hppa ~mips ppc ppc64 sparc x86" -IUSE="flac ogg" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - flac? ( media-libs/mutagen[${PYTHON_USEDEP}] ) - ogg? ( dev-python/pyogg[${PYTHON_USEDEP}] )" -DEPEND="${RDEPEND}" - -src_prepare() { - epatch \ - "${FILESDIR}/${P}"-SystemExit.patch \ - "${FILESDIR}/${P}"-flac.patch \ - "${FILESDIR}/${P}"-daemon.patch \ - "${FILESDIR}/${P}"-syslog.patch -} - -src_install() { - newinitd "${FILESDIR}"/edna.gentoo edna - - python_foreach_impl python_newscript edna.py edna - - python_scriptinto /usr/$(get_libdir)/edna - python_foreach_impl python_domodule ezt.py MP3Info.py - - python_foreach_impl python_optimize - - insinto /usr/$(get_libdir)/edna - doins -r templates resources - - insinto /etc/edna - doins edna.conf - - dosym /usr/$(get_libdir)/edna/resources /etc/edna/resources - dosym /usr/$(get_libdir)/edna/templates /etc/edna/templates - - dodoc README ChangeLog - dohtml -r www/* -} - -pkg_postinst() { - enewgroup edna - enewuser edna -1 -1 -1 edna - - elog "Edit edna.conf to taste before starting (multiple source" - elog "directories are allowed). Test edna from a shell prompt" - elog "until you have it configured properly, then add edna to" - elog "the default runlevel when you're ready. Add the USE flag" - elog "vorbis if you want edna to serve ogg files." - elog "See edna.conf and the html docs for more info, and set" - elog "PYTHONPATH=/usr/lib/edna to run from a shell prompt." -} diff --git a/media-sound/edna/files/edna-0.6-SystemExit.patch b/media-sound/edna/files/edna-0.6-SystemExit.patch deleted file mode 100644 index 78aec6f3176..00000000000 --- a/media-sound/edna/files/edna-0.6-SystemExit.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- edna.py.orig 2007-01-27 15:31:00.000000000 +0000 -+++ edna.py 2007-01-27 16:03:30.000000000 +0000 -@@ -1159,7 +1159,7 @@ - - if os.path.isfile(fname) != 1: - print "edna: %s:No such file" %fname -- raise systemExit -+ raise SystemExit - - if daemon_mode: - daemonize('/dev/null', '/var/log/edna.log', '/var/log/edna.log', '/var/run/edna.pid') diff --git a/media-sound/edna/files/edna-0.6-daemon.patch b/media-sound/edna/files/edna-0.6-daemon.patch deleted file mode 100644 index e003689956a..00000000000 --- a/media-sound/edna/files/edna-0.6-daemon.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- edna.py.orig 2007-01-27 18:49:16.000000000 +0000 -+++ edna.py 2007-01-27 18:47:19.000000000 +0000 -@@ -36,7 +36,9 @@ - import string - import os - import cgi -+import ctypes - import urllib -+import pwd - import socket - import re - import stat -@@ -1149,7 +1151,7 @@ - print ' if config-file is not specified, then edna.conf is used' - sys.exit(0) - --def daemonize(stdin='/dev/null', stdout='/dev/null', stderr='/dev/null',pname=''): -+def daemonize(stdin='/dev/null', stdout='/dev/null', stderr='/dev/null', pname='', uid = None): - '''This forks the current process into a daemon. - The stdin, stdout, and stderr arguments are file names that - will be opened and be used to replace the standard file descriptors -@@ -1159,6 +1161,11 @@ - if it shares a file with stdout then interleaved output - may not appear in the order that you expect. - ''' -+ # Rename process in /proc/<pid>/stat from python to edna -+ # (helps start-stop-daemon find us) -+ libc = ctypes.CDLL('/lib/libc.so.6') -+ libc.prctl(15, 'edna\0', 0, 0, 0) -+ - # Do first fork. - try: - pid = os.fork() -@@ -1186,6 +1193,8 @@ - sys.stderr.write("fork #2 failed: (%d) %s\n" % (e.errno, e.strerror) ) - sys.exit(1) - # Now I am a daemon! -+ # If specified change the process owner -+ if uid: os.setuid(uid) - # Redirect standard file descriptors. - si = open(stdin, 'r') - so = open(stdout, 'a+') -@@ -1198,9 +1207,16 @@ - if __name__ == '__main__': - fname = 'edna.conf' - daemon_mode=0 -+ uid = os.getuid() -+ pidfile = '/var/run/edna.pid' - for a in sys.argv[1:]: - if a == "--daemon": - daemon_mode=1 -+ elif a.startswith("--user"): -+ uname = a.split("=")[1].strip() -+ uid = pwd.getpwnam(uname)[2] -+ elif a.startswith("--pidfile"): -+ pidfile = a.split("=")[1].strip() - elif a == "--help" or a == "-h" or string.find(a, '--')==0: - usage() - else: -@@ -1211,6 +1227,6 @@ - raise SystemExit - - if daemon_mode: -- daemonize('/dev/null', '/var/log/edna.log', '/var/log/edna.log', '/var/run/edna.pid') -+ daemonize(uid = uid, pname = pidfile) - - run_server(fname) diff --git a/media-sound/edna/files/edna-0.6-flac.patch b/media-sound/edna/files/edna-0.6-flac.patch deleted file mode 100644 index b22687d2fb0..00000000000 --- a/media-sound/edna/files/edna-0.6-flac.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- edna.py.orig 2007-01-31 19:25:14.000000000 +0000 -+++ edna.py 2007-01-31 20:55:09.000000000 +0000 -@@ -64,6 +64,12 @@ - oggSupport = 'no' - - try: -+ from mutagen.flac import FLAC -+ flacSupport = True -+except ImportError: -+ flacSupport = False -+ -+try: - import cStringIO - StringIO = cStringIO - except ImportError: -@@ -920,6 +926,9 @@ - if ext == '.ogg': - info = OggInfo(fullpath) - self.__dict__.update(info.__dict__) -+ elif ext == '.flac': -+ info = FlacInfo(fullpath) -+ self.__dict__.update(info.__dict__) - else: - info = MP3Info.MP3Info(open(fullpath, 'rb')) - self.__dict__.update(info.__dict__) -@@ -1001,6 +1010,45 @@ - self.transcoded = val - self.valid = 1 - -+class FlacInfo: -+ def __init__(self, name): -+ # Setup the defaults -+ self.valid = 0 -+ self.total_time = 0 -+ self.samplerate = 'unknown' -+ self.bitrate = 'unknown' -+ self.mode = '' -+ self.mode_extension = '' -+ -+ if not flacSupport: return -+ -+ mflac = FLAC(name) -+ streaminfo = mflac.metadata_blocks[0] -+ -+ self.samplerate = streaminfo.sample_rate -+ self.total_time = streaminfo.length -+ self.bitrate =int(round((streaminfo.bits_per_sample * streaminfo.total_samples) / streaminfo.length)) -+ self.filesize = os.path.getsize(name) / (1024 ** 2) -+ -+ for key, val in mflac.tags: -+ if key == 'TITLE': -+ self.title = val -+ elif key == 'ARTIST': -+ self.artist = val -+ elif key == 'ALBUM': -+ self.album = val -+ elif key == 'DATE': -+ self.year = val -+ elif key == 'GENRE': -+ self.genre = val -+ elif key == 'VENDOR': -+ self.vendor = val -+ elif key == 'TRACKNUMBER': -+ self.track = val -+ elif key == 'DESCRIPTION': -+ self.comment = val -+ -+ self.valid = 1 - - def _usable_file(fname): - return fname[0] != '.' -@@ -1044,6 +1092,7 @@ - '.avi' : 'video/x-msvideo', - '.mpg' : 'video/mpeg', - '.ogg' : 'application/x-ogg', -+ '.flac' : 'audio/x-flac', - '.m4a' : 'audio/mp4', - '.mp4' : 'video/mp4', - } diff --git a/media-sound/edna/files/edna-0.6-syslog.patch b/media-sound/edna/files/edna-0.6-syslog.patch deleted file mode 100644 index 4ff0bbf8bdb..00000000000 --- a/media-sound/edna/files/edna-0.6-syslog.patch +++ /dev/null @@ -1,83 +0,0 @@ ---- edna.py.orig 2007-01-27 18:53:24.000000000 +0000 -+++ edna.py 2007-01-27 18:58:38.000000000 +0000 -@@ -42,6 +42,7 @@ - import socket - import re - import stat -+import syslog - import random - import time - import struct -@@ -144,6 +145,12 @@ - self.log = open(log, 'a') - except IOError: - pass -+ else: -+ try: -+ syslog.openlog('edna') -+ self.log = True -+ except: -+ pass - - template_path = config.get('server', 'template-dir') - template_file = config.get('server', 'template') -@@ -254,7 +261,7 @@ - (config.get('server', 'binding-hostname'), self.port), - EdnaRequestHandler) - except socket.error, value: -- self.log_message( "edna: bind(): %s" % str(value[1]) ) -+ self.log_message( "bind(): %s" % str(value[1]) ) - raise SystemExit - - def server_bind(self): -@@ -290,12 +297,17 @@ - return 0 - - def log_message(self, msg): -- if self.log: -- try: -- self.log.write(msg + '\n') -- self.log.flush() -- except IOError: -- pass -+ if self.log == True: -+ try: -+ syslog.syslog(msg) -+ except: -+ pass -+ elif self.log: -+ try: -+ self.log.write('edna: ' + msg + '\n') -+ self.log.flush() -+ except IOError: -+ pass - - def debug_message(self, msg): - if debug_level<1: -@@ -1125,21 +1137,21 @@ - - svr = Server(fname) - if oggSupport == 'yes': -- svr.log_message('edna: Ogg Vorbis support enabled') -+ svr.log_message('Ogg Vorbis support enabled') - else: -- svr.log_message('edna: Ogg Vorbis support disabled, to enable it you will need to install the "pyogg" and the "pyvorbis" modules') -+ svr.log_message('Ogg Vorbis support disabled, to enable it you will need to install the "pyogg" and the "pyvorbis" modules') - -- svr.log_message("edna: serving on port %d..." % svr.port) -+ svr.log_message("serving on port %d..." % svr.port) - try: - while running: - # print 'waiting ... ' - if config_needed: -- svr.log_message('edna: Reloading config %s' % fname) -+ svr.log_message('Reloading config %s' % fname) - svr.server_close() - svr = Server(fname) - config_needed = None - svr.handle_request() -- svr.log_message ("edna: exiting") -+ svr.log_message ("exiting") - sys.exit(0) - except KeyboardInterrupt: - print "\nCaught ctr-c, taking down the server" diff --git a/media-sound/edna/files/edna.gentoo b/media-sound/edna/files/edna.gentoo deleted file mode 100644 index add215faca7..00000000000 --- a/media-sound/edna/files/edna.gentoo +++ /dev/null @@ -1,31 +0,0 @@ -#!/sbin/openrc-run -# -# Startup script for the edna mp3 mini server -# -# description: edna is a mini mp3 webserver -# processname: python -# pidfile: /var/run/ednad.pid -# config: - -PYTHONPATH=/usr/lib/edna -EDNA=/usr/bin/edna -EDNACONF=/etc/edna/edna.conf -PIDFILE=/var/run/edna.pid -USER=edna - -depend() { - need local -} - -start() { - ebegin "Starting edna mp3 server" - start-stop-daemon --env PYTHONPATH=$PYTHONPATH \ - --start --exec $EDNA -- --daemon --user=$USER --pidfile=$PIDFILE $EDNACONF - eend $? -} - -stop() { - ebegin "Stopping ednad" - start-stop-daemon --quiet --stop --pidfile $PIDFILE - eend $? -} diff --git a/media-sound/edna/metadata.xml b/media-sound/edna/metadata.xml deleted file mode 100644 index 34878382b07..00000000000 --- a/media-sound/edna/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Sound project</name> - </maintainer> - <longdescription> - Edna is Greg Stein's http streaming audio server for mp3 and ogg files. -</longdescription> - <upstream> - <remote-id type="sourceforge">edna</remote-id> - </upstream> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index 86481af9a21..b61e55429e5 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -774,11 +774,6 @@ app-arch/cfv # Ancient unresolved bugs #453918, #505076. Removal in 30 days. app-admin/conkyforecast -# Andreas Sturmlechner <[email protected]> (2020-07-29) -# Py2-only, last release in 2006, no one else is packaging this. -# Removal in 30 days. -media-sound/edna - # Andrey Utkin <[email protected]> (2020-07-28) # Not used by other packages anymore. # Removal in 30 days.
