re-writen ebuild. gets rid of eclass usage. distcc/ccache fixes. no custom CFLAGS

Package-Manager: portage-2.0.51.21-r1

6 files changed, 256 insertions, 11 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index ad9dd64d2098..a19b5c1ad192 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-tv/mythtv
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.53 2005/05/10 01:35:48 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.54 2005/05/11 20:16:42 cardoe Exp $
+
+*mythtv-0.18-r1 (11 May 2005)
+
+  11 May 2005; <cardoe@gentoo.org> +files/0.18-mythbackend.conf,
+  +files/0.18-mythbackend.rc, +mythtv-0.18-r1.ebuild:
+  rewrite the ebuild to get rid of the breakage of distcc/ccache and other
+  breakage MMX support is back CFLAGS are now picked by mythtv everything
+  should be happy
 
   10 May 2005; Herbie Hopkins <herbs@gentoo.org> mythtv-0.18.ebuild:
   Fixed bug #90185.
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 12880ab54aba..c942aedb782a 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -1,23 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d031942485bf1c04b7b66ea1cbe191fb mythtv-0.17-r1.ebuild 7329
+MD5 ad503120fba8988a0e8aa87e0ed3f876 ChangeLog 10652
+MD5 f62db0df6ee8ee1d4fe7b9c3d74432a7 metadata.xml 222
 MD5 2fa8416fc9cfa49edcdc9558f1e8ad48 mythtv-0.16.ebuild 5817
+MD5 d031942485bf1c04b7b66ea1cbe191fb mythtv-0.17-r1.ebuild 7329
 MD5 d14f144db087679122b05172770ec3e9 mythtv-0.18.ebuild 3365
-MD5 68df689486bac69fec2e0f6a51710b84 ChangeLog 10333
-MD5 f62db0df6ee8ee1d4fe7b9c3d74432a7 metadata.xml 222
-MD5 8d46f5508de5d412db9e4a757db00e26 files/mythtv-0.16-cx88.patch 674
+MD5 0e92e712b3903ae881be35c5c53daee1 mythtv-0.18-r1.ebuild 3771
+MD5 fb4505fe7e8b832e115d777bf836d3bc files/digest-mythtv-0.16 66
 MD5 590c9a6a89442b347c3a5f52d1781351 files/digest-mythtv-0.17-r1 66
+MD5 67c40a05f5751719f170820c4d50c9c6 files/digest-mythtv-0.18 65
 MD5 2623cb1c902bf07fca69b846e7a0915a files/mythbackend.conf 1186
 MD5 5938ea3584383e501674bf67a7f7e2a7 files/mythbackend.rc6 1776
-MD5 fb4505fe7e8b832e115d777bf836d3bc files/digest-mythtv-0.16 66
-MD5 67c40a05f5751719f170820c4d50c9c6 files/digest-mythtv-0.18 65
-MD5 bcfd584bc73afea9d88c8afe7d47f5be files/mythtv-0.17-qt334-dst-fix.patch 5663
 MD5 b3a4780890d53640604812b8069a8297 files/mythfilldatabase.cron 74
+MD5 8d46f5508de5d412db9e4a757db00e26 files/mythtv-0.16-cx88.patch 674
+MD5 bcfd584bc73afea9d88c8afe7d47f5be files/mythtv-0.17-qt334-dst-fix.patch 5663
+MD5 67c40a05f5751719f170820c4d50c9c6 files/digest-mythtv-0.18-r1 65
+MD5 69529caf9bcd614caadcfbdb274fccfd files/0.18-mythbackend.rc 1813
+MD5 ba381c4010bd75f48666918420710fe4 files/0.18-mythbackend.conf 1191
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCgBAH2G5bA0cA/ScRAm2WAJ9zDSgApxCSFJaMMLnwwDlF5sPOWgCfeznT
-jdHnu16yGiPB+xb8FHpg+gQ=
-=eWSQ
+iD8DBQFCgmhGBtvusYtCZMsRAi+oAJ0SgGnljyr0K8+HL5RcuCF/X99x+QCePXJN
+OtUeztAlM+IHxDWV3cPSHTo=
+=/BW1
 -----END PGP SIGNATURE-----
diff --git a/media-tv/mythtv/files/0.18-mythbackend.conf b/media-tv/mythtv/files/0.18-mythbackend.conf
new file mode 100644
index 000000000000..6d0f6815af8d
--- /dev/null
+++ b/media-tv/mythtv/files/0.18-mythbackend.conf
@@ -0,0 +1,33 @@
+# Copyright 1999-2004 Gentoo Foundation 
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/files/0.18-mythbackend.conf,v 1.1 2005/05/11 20:16:42 cardoe Exp $
+
+# Uncomment this to disable the permission warnings.
+MYTH_WARN=yes
+
+# Specify which user to run as
+#
+# NOTE: this user must have permissions to write
+#       to the LOG and PID directories specified
+#       below.  Furthermore, this user must be able
+#       to write to the audio and video devices
+#       that are configured in MythTV.  This can
+#       be achieved by adding this user to the
+#       audio and video groups.
+MYTH_USER=root
+
+# Specify which file to use for the backend log.
+#MYTH_LOG=/var/log/mythtv/mythbackend.log
+
+# Specify in which file to store the backend process id.
+#MYTH_PID=/var/run/mythtv/mythbackend.pid
+
+# Specify debug-level in log.
+# Accepts any combination (separated by comma) of:
+# all,none,quiet,record,playback,channel,osd,file,
+# schedule,network,commflag,audio,libav,jobqueue
+#MYTH_VERBOSE="none"
+
+# Set the nice level (see nice(1)).  To give mythbackend a higher
+# priority, you may want to set this to -15.
+#MYTH_NICE="0"
diff --git a/media-tv/mythtv/files/0.18-mythbackend.rc b/media-tv/mythtv/files/0.18-mythbackend.rc
new file mode 100644
index 000000000000..97aaf0a181c8
--- /dev/null
+++ b/media-tv/mythtv/files/0.18-mythbackend.rc
@@ -0,0 +1,59 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/files/0.18-mythbackend.rc,v 1.1 2005/05/11 20:16:42 cardoe Exp $
+
+depend() {
+	need net
+	use mysql
+}
+
+checkconfig() {
+	for i in $(groups "${MYTH_USER/:*/}") ; do
+		[[ "${i}" == "audio" ]] && audio="yes"
+		[[ "${i}" == "video" ]] && video="yes"
+	done
+
+	if [ -z "${audio}" -o -z "${video}" ] ; then
+		ewarn ""
+		[[ -z "${audio}" ]] && \
+			ewarn "${HILITE}${MYTH_USER/:*/}${NORMAL} is not in the audio group"
+		[[ -z "${video}" ]] && \
+			ewarn "${HILITE}${MYTH_USER/:*/}${NORMAL} is not in the video group"
+		ewarn ""
+		ewarn "insufficient permissions discovered"
+		ewarn "mythbackend may not start correctly"
+		ewarn ""
+	fi
+}
+
+start() {
+	[[ -z "${MYTH_USER}" ]] && MYTH_USER="nobody:nobody"
+	[[ -z "${MYTH_LOG}" ]] && MYTH_LOG="/var/log/mythtv/mythbackend.log"
+	[[ -z "${MYTH_PID}" ]] && MYTH_PID="/var/run/mythbackend.pid"
+	[[ -z "${MYTH_WARN}" || "${MYTH_WARN}" == "yes" ]] && checkconfig
+	[[ -z "${MYTH_NICE}" ]] && MYTH_NICE="0"
+	[[ -z "${MYTH_VERBOSE}" ]] && MYTH_VERBOSE="none"
+
+	HOME="$(dirname "${MYTH_PID}")"
+	QTDIR=/usr/qt/3
+
+	# Work around any strange permissions that may be on these files.
+	chown -R "${MYTH_USER}" "$(dirname "${MYTH_LOG}")"
+	chown -R "${MYTH_USER}" "$(dirname "${MYTH_PID}")"
+
+	ebegin "Starting myth backend"
+	start-stop-daemon --start --quiet --chuid "${MYTH_USER}" \
+		--exec /usr/bin/mythbackend --nicelevel "${MYTH_NICE}" -- \
+		--daemon --pidfile "${MYTH_PID}" --logfile "${MYTH_LOG}" \
+		--verbose ${MYTH_VERBOSE}
+	eend $?
+}
+
+stop () {
+	[[ -z "${MYTH_PID}" ]] && MYTH_PID="/var/run/mythbackend.pid"
+
+	ebegin "Stopping myth backend"
+	start-stop-daemon --stop --quiet --pidfile="${MYTH_PID}"
+	eend $?
+}
diff --git a/media-tv/mythtv/files/digest-mythtv-0.18-r1 b/media-tv/mythtv/files/digest-mythtv-0.18-r1
new file mode 100644
index 000000000000..af9b82960007
--- /dev/null
+++ b/media-tv/mythtv/files/digest-mythtv-0.18-r1
@@ -0,0 +1 @@
+MD5 8480c534508a2530c1ba35d295870faf mythtv-0.18.tar.bz2 8801515
diff --git a/media-tv/mythtv/mythtv-0.18-r1.ebuild b/media-tv/mythtv/mythtv-0.18-r1.ebuild
new file mode 100644
index 000000000000..b3a0a2b0de53
--- /dev/null
+++ b/media-tv/mythtv/mythtv-0.18-r1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.18-r1.ebuild,v 1.1 2005/05/11 20:16:42 cardoe Exp $
+
+inherit flag-o-matic eutils debug
+
+DESCRIPTION="Homebrew PVR project"
+HOMEPAGE="http://www.mythtv.org/"
+SRC_URI="http://www.mythtv.org/mc/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="alsa altivec arts cle266 debug dvb ieee1394 jack joystick lcd lirc mmx nvidia oggvorbis opengl oss xv"
+
+DEPEND=">=media-libs/freetype-2.0
+	>=media-sound/lame-3.93.1
+	virtual/x11
+	>=x11-libs/qt-3.1.1
+	dev-db/mysql
+	alsa? ( >=media-libs/alsa-lib-0.9 )
+	arts? ( kde-base/arts )
+	dvb? ( media-libs/libdvb )
+	jack? ( media-sound/jack-audio-connection-kit )
+	lcd? ( app-misc/lcdproc )
+	lirc? ( app-misc/lirc )
+	nvidia? ( media-video/nvidia-glx )
+	oggvorbis? ( media-libs/libvorbis )
+	opengl? ( virtual/opengl )
+	ieee1394? ( >=sys-libs/libraw1394-1.2.0 )
+	|| ( >=net-misc/wget-1.9.1 >=media-tv/xmltv-0.5.34 )"
+
+# ieee1394 also needs >=sys-libs/libiec61883-1.0.0
+
+RDEPEND="${DEPEND}
+	!media-tv/mythfrontend"
+
+pkg_setup() {
+
+	if ! built_with_use x11-libs/qt mysql ; then
+		eerror "Qt is missing MySQL support. Please add"
+		eerror "'mysql' to your USE flags, and re-emerge Qt."
+		die "Qt needs MySQL support"
+	fi
+
+	if use nvidia; then
+		echo
+		ewarn "You enabled the 'nvidia' USE flag, you must have a GeForce 4 or"
+		ewarn "greater to use this. Otherwise, you'll have crashes with MythTV"
+		echo
+	fi
+
+	einfo
+	einfo "Please note, this ebuild does not use your CFLAGS and CXXFLAGS. It determines"
+	einfo "a sane set and uses those. Please do not attempt to override this behavior."
+	einfo
+
+}
+
+# memory in case I ever bring it back
+#src_unpack() {
+#	unpack ${A}
+#
+#	# Fix bugs 40964 and 42943.
+#	filter-flags -fforce-addr -fPIC -momit-leaf-frame-pointer
+#	is-flag "-fomit-frame-pointer" || append-flags "-fomit-frame-pointer"
+#}
+
+src_compile() {
+	use cle266 && use nvidia && die "You can not have USE="cle266" and USE="nvidia" at the same time. Must disable one or the other."
+	local myconf="$(use_enable altivec)
+		$(use_enable oss audio-oss)
+		$(use_enable alsa audio-alsa)
+		$(use_enable arts audio-arts)
+		$(use_enable jack audio-jack)
+		$(use_enable lirc)
+		$(use_enable joystick joystick-menu)
+		$(use_enable cle266 xvmc-vld)
+		$(use_enable dvb)
+		$(use_enable dvb dvb-eit)
+		--dvb-path=/usr/include
+		$(use_enable opengl opengl-vsync)
+		$(use_enable oggvorbis vorbis)
+		$(use_enable nvidia xvmc)
+		$(use_enable xv)
+		--disable-directfb
+		--enable-x11
+		--enable-proc-opt"
+
+	if use mmx || use amd64; then
+		myconf="${myconf} --enable-mmx"
+	else
+		myconf="${myconf} --disable-mmx"
+	fi
+
+	if use debug; then
+		myconf="${myconf} --compile-type=debug"
+	else
+		myconf="${myconf} --compile-type=release"
+	fi
+
+	hasq distcc ${FEATURES} || myconf="${myconf} --disable-distcc"
+	hasq ccache ${FEATURES} || myconf="${myconf} --distable-ccache"
+
+	# depends on bug # 89799
+	# $(use_enable ieee1394 firewire)
+
+	# let MythTV come up with our CFLAGS. Upstream will support this
+	CFLAGS=""
+	CXXFLAGS=""
+	econf ${myconf} || die "configure died"
+
+	qmake -o "Makefile" mythtv.pro || die "qmake failed"
+	emake || die "emake failed"
+
+}
+
+src_install() {
+
+	einstall INSTALL_ROOT="${D}" || die "install failed"
+	for doc in AUTHORS COPYING FAQ UPGRADING ChangeLog README; do
+		test -e "${doc}" && dodoc ${doc}
+	done
+
+	newbin "setup/mythtv-setup" "mythsetup"
+
+	insinto /usr/share/mythtv/database
+	doins database/*
+
+	exeinto /usr/share/mythtv
+	doexe "${FILESDIR}/mythfilldatabase.cron"
+
+	newinitd ${FILESDIR}/0.18-mythbackend.rc mythbackend
+	newconfd ${FILESDIR}/0.18-mythbackend.conf mythbackend
+
+	dodoc keys.txt docs/*.{txt,pdf}
+	dohtml docs/*.html
+
+	keepdir /var/log/mythtv
+}