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

Package-Manager: portage-2.1.13.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2BA7F3C!

5 files changed, 175 insertions, 9 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/Manifest b/net-voip/homer/Manifest
index 4adc6fc4cfb7..e7b649ad8257 100644
--- a/net-voip/homer/Manifest
+++ b/net-voip/homer/Manifest
@@ -3,16 +3,31 @@ Hash: SHA256
 
 AUX homer-0.24.1-libav-9.patch 3754 SHA256 70b90b79f82eb380df37e5c0dbed397b533675d0dab58ec5f55e7d5c1cf63c56 SHA512 077c8622af82719273ccb168ce7a1c49b9818361dd647c5a98c9f20ebe97aa86703b5ada25bc9ec317c6b917cb5e9820120b115123d29ebc4702f11a538b9651 WHIRLPOOL 209b7ef3ac573d8d99480770a6c77d2617c24f5da2f77e51b6dd6e1e515492eb1ede715ce90817993c777e9382482972605d33cb7f75cb39e9b0a3aecce16beb
 DIST homer-0.24.1.tar.gz 1297045 SHA256 738cd4a1e8b437936c904bdea649c0ee12ecca2caa1bef5c585925eabe84ff44 SHA512 ea2d1a5224048668e20a62f142370910f337b3b56b94c9a92a9b7530652ceed67a59223fac57ee0d835c31545d2d06c21329a0463680936d32a1455dbb2fac33 WHIRLPOOL b16ccdea6c5ea0845aca4f31a2d6258cf6a71258c531ee36a02b2844814df73b26229ffc96129532b4f9c1f2070a9cd279b720b7286e691e488bc7b524c47278
+DIST homer-0.25-ffmpeg2.patch 65617 SHA256 ce1327a59dc20c2fbe23e968786ecce21126cdb2119916bf2227594dc8c0a229 SHA512 fb4ca0bd161c94999b54b86337220f3f018672e4a5031788d8292273515fe68d4364574645d96e04b19bdb64f1b032119503cf823c7604d625015ba0cdabf030 WHIRLPOOL 909069e830b9ef473a006f686a5e5e9f7279c5b0fc8fb8f212a30b767106055970441fa4fdbe2d443fce500024bc00494c112ebb3b95a65a475b2731e8d361c7
 DIST homer-0.25.tar.gz 1404242 SHA256 1c3e67a7f7134a317bc32dfb691679a2997fbfa129c70d5d165ccfd0272a752d SHA512 92254f9cc133589760a4c3081e1636232ace8eb972f7800c4fb5aaeba52e22546c6772e4c93625aa31a5d7b366f441cf8155f52d85ca44dade60edebf98b6340 WHIRLPOOL 944277b8248a1037dd27881456b6fb304d19d2f12cc7bc4268ba3dbf876de668fde25749dfbfd424950fe641d7dc65f5f14a29e9d14d5c1e738dc555af201ffe
+EBUILD homer-0.24.1-r1.ebuild 1630 SHA256 021bf0f6f8ec05394f2728822138d54d71454a8e878a7b74befc3da411b290a6 SHA512 abdf14f129bc8615c5fcd306e4a48b3bb7d1a157207ae30e77368389736029d016bbeb487d5f69835f007f79ec61bb25c6a8e4eed6b4de6caf702ec297cc335b WHIRLPOOL 10329f139059994bfa8fa73ffd60a07eec6019e4a6f50f416c7c13a73ef516fdb2636cc9b1b2130514a3295ad3b05407c2dfd3d3120a1bb228a2a995e60cde9a
 EBUILD homer-0.24.1.ebuild 1575 SHA256 a3f9d765eb0a2c3aa7f17a94d94ebe10755d6bca0d674567588464bbe09ab76d SHA512 a8e581fcf893790033abbff71d17bfd50e415613d54a0202e80d8c004474515e9bfaf6e26296f19c5d48545d2c9232111b0469d0822ad5d63206992f19cf1243 WHIRLPOOL 909fcdb74d575cdcfb81f8902397e579705bee5be8af62d859a5d298d1ff281117bb460d9ca3c78ff83bb191e19a16c2619cf9094505f26eac0c542a831956c2
+EBUILD homer-0.25-r1.ebuild 1848 SHA256 17b1b61f2f46dea253ee0071788623bd1e9b0b5c21860c7b3db0dd48a7b10497 SHA512 ef3f7a177e447acc059d50014791116093a5943acaea60f8e38cde7abf58f63ba155f0e8d6df98abef85b9b532877574d3f9a0fc370c0a54bdb2fa82568903ed WHIRLPOOL e119bb58c0ffdc48fc9a69bca33099c24e2344a3e9af50abcddbf5beec4899a32c0624eef442bed7dc16f1e9249752dcc6086439f35cba8ed42474a072f70927
 EBUILD homer-0.25.ebuild 1750 SHA256 be640f812f56211808bebbdeb75f9acdbb0a0e243c4267fb42b36e0972481e2c SHA512 17d34c25fc313df3f2594e2ab189d5eefb6392baaeb0e19137a0a82aa7505eb3c1441534f93e85fa1ea120f5b29ff75b4698dde74cb585391135b883ffa539ef WHIRLPOOL cd3269aa8e2e2baa3517483313a55d84dfbe23c61a9a072ed6524e510b4a56551c26923c0a1d1bf296cc9238a3ed28f52e1b0815d2559e2dfa859511b206277d
-EBUILD homer-9999.ebuild 1750 SHA256 b03715497146ad11494aab333f31ff62cc08624712eba2018f54820be80e794b SHA512 344b834694f17ea22ff8f8feef3b0e26ec38e1e2f5e273355acddbe3ed3a2e73a05cb99bb57fe357e5cd38d4fe197014e9738ea05012a74be3662b8c8b23eea9 WHIRLPOOL 9af71bfbc9910cc3fb84afb2a2ae49880e3c140c652d87404b7b254679234ce7879686e71401ab8598e59822caeaf4c96948409a645944d4a0f93518f15a1277
-MISC ChangeLog 1716 SHA256 539cc659ed4858293d2b42362f3ad5e53c430d93c1199d9c714b85faa6cca86c SHA512 7b2debdbc991b2527678b14ddaae77d4c52cbba9e444eb0ef72e2b8d4bfdf44049cee4afed700e881d917952c37692bdd1c1116d379029ec8647a9b295bb85db WHIRLPOOL d25f4ad402feee38e7a50af6b4be9c5a58c44f397493d4692a4448380cc42b529e3bf7cec4494781be93c740dcd61fff5c17ede2dce45a95264dcaed5d67e3e0
+EBUILD homer-9999.ebuild 1752 SHA256 6161ff0f1f33081ea4fdec7ec8e882f112e82e70abfdeabac2534b88cbfef607 SHA512 ca21192b06842f04f5549be9b53f9211c61f93f76a3658a68895100eef4cb1e4475e8347c1559ee011792e10bb19e0591ecfd13838957be5634c2c424227da5c WHIRLPOOL 9683525d6fede65e58e3824b80423f0fede2febf255665441f8bad12f835e9483b44392a5e2516378932e9c4f5ed2d9b4954bd5df3564c758807b4c86fafae0a
+MISC ChangeLog 2059 SHA256 1aa0cb1d00eea812e98b985a6a49c4d57dc6bc2c6fcfc068f610e8a36fab3b17 SHA512 ba2b39c6d8396fea48f9707f520aebe6ea5029e1288206fdefec71fa25c7ef92877473a3f087c8ea42ce36b49f6e190006ecc0bbdaa0c5c5f647f350eedfc3e2 WHIRLPOOL 1da926c0ea9a60b27b74d6d59340e3f54f5c107c427ceea57fc8edd1d678ec9326cdb3c1dc387ab036c9b61df559b450ebef1d359aa6667fdb32fe60bc9da4de
 MISC metadata.xml 310 SHA256 033cdf543570f9dfd2a40e0bd982d3f59b8f47f77cf127c62c8dce9dbd7fa90b SHA512 762d68ba46a64c5e2ae0fa579d53febdcdb4b82702763e6183355ea30c7925499c4704b2a49202f90481c9fa4bcd78174e797bdd085af3ed4532b449993dbdf7 WHIRLPOOL 8fc36d53febd9e11f5c515c1c263509a88680002578699e69877f5cc8e18582fcfc9a21a2ce777b7d82b56d389f4c240f5b2e3af7f6f91bb89063941e0c73514
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlIIF0sACgkQvFcC4BYPU0p3SQCfWlAIAKQKHqYfvVPlgqTCDWMv
-A+IAn1HHTxCLwo81LDgvzYGh4DGmAyVT
-=y6Nv
+iQJ8BAEBCABmBQJSCTtfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun880BcQAJiUIiQr/S7SSTBgvfPNZIZR
+SsyhSA5ltfKjZaz+sOWqUcAE32q7ECrMDNkpFZ4bHWjLyq/AzDXRnzWZkxaO1o6N
+ueTujSjBpaIlQTUUAJ9bGX723rM5t3ZkbgJOo4GO6m/LI4zHYtGJ1mqrfjn4oeh8
+yn6hVDL/xSws7JtbThfdSxJ6NAYLgtuACs6nPqDAknir2DccvJNeYnGH4PfDSlbu
+BMjm3+/abv1F2dOZPSaOO3z08M3U7nSR6hGSb+E7LWJpFMItRuiU3Sah6lf8Vaml
+DZLbzLQ7UFvs2+n1y2pb2QdAXfklZsRMUe9p4nIGgZ8IAhs9DOcFMUIQ0O3qMbjN
+eAO8eHx/v1KPSFq8wgpEmQD9IRLXqKs8NWwlEeYVc//qgNxosDMBEEYmuxwS32b7
+oSpQgllBGRIXK8V5gZcasYOR/E1mouJeSXbHNGc2/hY6lCBswQ+3xh1LQNZfLUxt
+A7kBX34vzQ8DV6W2RAw24lFwpn6YVOngOSJ564kiMv7gelX1H44ZXmlnGbVoYeM1
+IaQozkGuKWhw0Cd8Nhm8CJv7RQXeX7NjyF6FeVy8T+RCPYPaYkOcuWTyf4gmgaVG
+AwlfUOIualtZrmt7VMzRqtwz1FGWoQ4aXP+Unjs3EwGWtcaBhwVIQnrB35eSExgD
+IiUJ6sRv77gtHXz4sEbZ
+=vHnV
 -----END PGP SIGNATURE-----
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