Add patch for ffmpeg2 support. Bug #476536. Also use subslots for x264 dep. Bug #476076. Thanks to Marcel Pennewiß <gentoo@pennewiss.de> for the patches

(Portage version: 2.1.13.7/cvs/Linux x86_64, signed Manifest commit with key C2BA7F3C!)

4 files changed, 155 insertions, 4 deletions

diff --git a/net-voip/homer/ChangeLog b/net-voip/homer/ChangeLog
index c2be864f2cc9..e97fb31bfde1 100644
--- a/net-voip/homer/ChangeLog
+++ b/net-voip/homer/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-voip/homer
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/homer/ChangeLog,v 1.9 2013/08/11 22:59:21 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/homer/ChangeLog,v 1.10 2013/08/12 19:45:35 hwoarang Exp $
+
+*homer-0.24.1-r1 (12 Aug 2013)
+*homer-0.25-r1 (12 Aug 2013)
+
+  12 Aug 2013; Markos Chandras <hwoarang@gentoo.org> +homer-0.24.1-r1.ebuild,
+  +homer-0.25-r1.ebuild, homer-9999.ebuild:
+  Add patch for ffmpeg2 support. Bug #476536. Also use subslots for x264 dep.
+  Bug #476076. Thanks to Marcel Pennewiß <gentoo@pennewiss.de> for the patches
 
   11 Aug 2013; Alexis Ballier <aballier@gentoo.org> homer-0.24.1.ebuild,
   homer-0.25.ebuild, homer-9999.ebuild:
diff --git a/net-voip/homer/homer-0.24.1-r1.ebuild b/net-voip/homer/homer-0.24.1-r1.ebuild
new file mode 100644
index 000000000000..0e5a31884f32
--- /dev/null
+++ b/net-voip/homer/homer-0.24.1-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-voip/homer/homer-0.24.1-r1.ebuild,v 1.1 2013/08/12 19:45:35 hwoarang Exp $
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Homer Conferencing (short: Homer) is a free SIP softphone with advanced audio and video support."
+HOMEPAGE="http://www.homer-conferencing.com"
+
+MY_PN="Homer-Conferencing"
+MY_BIN="Homer"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://github.com/${MY_PN}/${MY_PN}.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/V${PV}.tar.gz -> ${PN}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=dev-libs/openssl-1.0
+	media-libs/alsa-lib
+	media-libs/libsdl[X,audio,video,alsa]
+	media-libs/portaudio[alsa]
+	media-libs/sdl-mixer
+	media-libs/sdl-sound
+	media-libs/x264:*
+	net-libs/sofia-sip
+	virtual/ffmpeg:0[X]
+	|| ( <media-video/ffmpeg-2 media-video/libav )
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtmultimedia:4
+	dev-qt/qtwebkit:4"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-libav-9.patch"
+}
+
+src_compile() {
+	tc-export CXX
+	emake -C HomerBuild default \
+		INSTALL_PREFIX=/usr/bin \
+		INSTALL_LIBDIR=/usr/$(get_libdir) \
+		INSTALL_DATADIR=/usr/share/${PN} \
+		VERBOSE=1
+}
+
+src_install() {
+	emake -C HomerBuild install \
+		DESTDIR="${D}" \
+		VERBOSE=1
+
+	# Create .desktop entry
+	doicon ${MY_BIN}/${MY_BIN}.png
+	make_desktop_entry "${MY_BIN}" "${MY_PN}" "${MY_BIN}" "Network;InstantMessaging;Telephony;VideoConference"
+}
diff --git a/net-voip/homer/homer-0.25-r1.ebuild b/net-voip/homer/homer-0.25-r1.ebuild
new file mode 100644
index 000000000000..77ef2236d6e0
--- /dev/null
+++ b/net-voip/homer/homer-0.25-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-voip/homer/homer-0.25-r1.ebuild,v 1.1 2013/08/12 19:45:35 hwoarang Exp $
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Homer Conferencing (short: Homer) is a free SIP softphone with advanced audio and video support."
+HOMEPAGE="http://www.homer-conferencing.com"
+
+MY_PN="Homer-Conferencing"
+MY_BIN="Homer"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-2
+	EGIT_REPO_URI="git://github.com/${MY_PN}/${MY_PN}.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/V${PV}.tar.gz -> ${PN}-${PV}.tar.gz
+	http://dev.gentoo.org/distfiles/${P}-ffmpeg2.patch"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="pulseaudio"
+
+DEPEND=">=dev-libs/openssl-1.0
+	media-libs/alsa-lib
+	media-libs/libsdl[X,audio,video,alsa]
+	media-libs/portaudio[alsa]
+	media-libs/sdl-mixer
+	media-libs/sdl-sound
+	media-libs/x264:*
+	media-video/ffmpeg:0[X]
+	net-libs/sofia-sip
+	dev-qt/qtcore:4
+	dev-qt/qtdbus:4
+	dev-qt/qtgui:4
+	dev-qt/qtmultimedia:4
+	dev-qt/qtwebkit:4
+	pulseaudio? ( media-sound/pulseaudio )"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	epatch "${DISTDIR}/${P}-ffmpeg2.patch"
+
+	if use pulseaudio; then
+		sed -i \
+			-e "/^set(FEATURE_PULSEAUDIO/s:OFF:ON:" \
+			HomerBuild/config/HomerFeatures.txt || die "sed failed"
+	fi
+}
+
+src_compile() {
+	tc-export CXX
+	emake -C HomerBuild default \
+		INSTALL_PREFIX=/usr/bin \
+		INSTALL_LIBDIR=/usr/$(get_libdir) \
+		INSTALL_DATADIR=/usr/share/${PN} \
+		VERBOSE=1
+}
+
+src_install() {
+	emake -C HomerBuild install \
+		DESTDIR="${D}" \
+		VERBOSE=1
+
+	# Create .desktop entry
+	doicon ${MY_BIN}/${MY_BIN}.png
+	make_desktop_entry "${MY_BIN}" "${MY_PN}" "${MY_BIN}" "Network;InstantMessaging;Telephony;VideoConference"
+}
diff --git a/net-voip/homer/homer-9999.ebuild b/net-voip/homer/homer-9999.ebuild
index 01d8d1ee7fe6..d315dae82e7b 100644
--- a/net-voip/homer/homer-9999.ebuild
+++ b/net-voip/homer/homer-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/homer/homer-9999.ebuild,v 1.6 2013/08/11 22:59:22 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/homer/homer-9999.ebuild,v 1.7 2013/08/12 19:45:35 hwoarang Exp $
 
-EAPI=4
+EAPI=5
 
 inherit eutils multilib toolchain-funcs
 
@@ -31,7 +31,7 @@ DEPEND=">=dev-libs/openssl-1.0
 	media-libs/portaudio[alsa]
 	media-libs/sdl-mixer
 	media-libs/sdl-sound
-	media-libs/x264
+	media-libs/x264:*
 	media-video/ffmpeg:0[X]
 	net-libs/sofia-sip
 	dev-qt/qtcore:4