Merge branch 'emergent'

diff --git a/app-emulation/emul-linux-x86-medialibs/Manifest b/app-emulation/emul-linux-x86-medialibs/Manifest
index b1b7a1234480072b00ca0a7efcc1b1be4af7ccdc..fa23021f25622bf608d4b40c1eded2e63e2bfab3 100644 (file)
--- a/app-emulation/emul-linux-x86-medialibs/Manifest
+++ b/app-emulation/emul-linux-x86-medialibs/Manifest
@@ -1,5 +1,4 @@
-DIST emul-linux-x86-medialibs-20121202.tar.xz 10366156 SHA256 87a7adbf1587d357c74372c33cdb5a8a22f201943ef57dab7ed56492770830dd SHA512 f46c514d15b95da0657fc9fb1c852a93d60aeb35d4532ce2dd66481b22911ba8f8e504879a02f9840b3cd4bf40f0732b291e0fe7d5085a7f409fe9c529569a4c WHIRLPOOL 0a286593163d87c6b9f8efc5629cf9b037923f05af82bf12591e1f1d0a3fdf3fc95f13950f15f49b21871886018dd4d171ec3e5d6b442d8ee02ba883923936e2
 DIST emul-linux-x86-medialibs-20130224.tar.xz 10416488 SHA256 a23696b51754cb838227bf24c81a785b980ad8b492a58b80623004d4634d2ed1 SHA512 56a17ec80c583f10e6754ce0101182d2d6895637b09cb3c3963663b8d3387f86de9d7ba07a7a880c22007ebc42dcfde2f63318a487825b38f4b1d1f1b15041a3 WHIRLPOOL 5d18b4fba7f24ea5fc6b212e2d67b04bfee3a8d80de11c5a53d7c684c94b0227b644e8b3f5ae420fbdd3e0b91fa818be757bb0ddbd7858d0eff1902e23d74f57
-EBUILD emul-linux-x86-medialibs-20121202.ebuild 886 SHA256 dbdab5a4bdbbabe6de1c49fd941d00309e3f775c873e3219ec932947e9722aaf SHA512 591d924e5e1c43a8e377c3f799c54bcd95380f28fc364e340abd63267bdb77e949d21063bdfd4b146c18cede5d8a725c0c702c4f15800e5961d35ca8cb509909 WHIRLPOOL e42065630de7f7f0c702b23748dcbcfacaf5177aa9b3b11584c8139b7674bcddbf161e0c23412280e18159c73b10d2c9e55d810331e6cd4353abe72159795f04
-EBUILD emul-linux-x86-medialibs-20130224-r8.ebuild 1979 SHA256 9ef1738d949e7abbf41502c49809e2f5d820ccac66a33a9ef2575fb435e2048d SHA512 a13ec17936bfcb44b6d3f13a2e62111172f85decf3b322f0f5dd521f8ea7e3defafddc2fc1d763665d1d257cdc35441c2ae7392c59f8dbea628e591a0d67b720 WHIRLPOOL 9bc5734aa417f13dda364e16813af51c9d051d3f9d04d51095c737f2609ec8e233ec12baa963b8d87d8f2f9b305596c0942f7f5be956bc3058362a0ebd8ca142
+DIST emul-linux-x86-medialibs-20131008.tar.xz 11003172 SHA256 7b888139809e8240ecfb0cbcaf060b83d49152e72392e0819d30004e7c6111b0 SHA512 721f2e4122dc749596618df41542abde1ce798e83cc93cefbaa053f3561238d026af9a0b6e7bd430c18808b443a836682f3e629559aee76a8a57229f66782924 WHIRLPOOL d5fde9322c3fe4b8fd3be95a7db32178945ddf54d579b5862d5f18b09d2d958169857559554d481177592a710621f7e0c1bc91512b54b5be0415e719d644fb50
 EBUILD emul-linux-x86-medialibs-20130224.ebuild 886 SHA256 b3c055fb8e64ac44c10a6bcc1755005b19d875daadac4e0c5603e6140b1da3ee SHA512 0cca511a7738a784dff82f7445dac8135e6e676fb4e16534057c4bd5b0938aa12a877566b0141967facbae02f9c716b5dff0ee39c1510fbaecefdb6534376b84 WHIRLPOOL 82ecef1df4b02bd0cc59a413451f13e7531d7f0b9e8e3bae97b0bf6b6d40348ebe8d889241ad10dc8792c0666e03f480c70c11b030ba95a2ac2021f943f7b35a
+EBUILD emul-linux-x86-medialibs-20131008-r1.ebuild 2557 SHA256 d80a6b3e6362f00f645d58faddba96d58e53ef7d520e35f7aa113f010ea3e334 SHA512 320ca1d04b828b61ad32a9b51bcb105f767ccb0f40903466c3e8aa6715ce99119bd55734b586d798743efbdf6769c70af1a9e5bb5b234b3dcfd7ad665cb0dfa0 WHIRLPOOL c39b8e2c283085d38c0fffc7e7d4e1593a25e7b60fc0860c27ba3fdcdeae47483bfe8e19191b0f6036b5c397d03dddc5bceaa817203348f876bf1e021e017a2b

diff --git a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20121202.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20121202.ebuild
deleted file mode 100644 (file)
index 2b36691..0000000
--- a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20121202.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20121202.ebuild,v 1.2 2012/12/25 19:06:15 pacho Exp $
-
-EAPI=5
-inherit emul-linux-x86
-
-LICENSE="APL-1.0 GPL-2 BSD BSD-2 public-domain LGPL-2 MPL-1.1 LGPL-2.1"
-KEYWORDS="-* amd64"
-
-DEPEND=""
-RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
-       ~app-emulation/emul-linux-x86-xlibs-${PV}
-       ~app-emulation/emul-linux-x86-db-${PV}
-       !<=app-emulation/emul-linux-x86-sdl-20081109
-       !<=app-emulation/emul-linux-x86-soundlibs-20110101"
-PDEPEND="~app-emulation/emul-linux-x86-soundlibs-${PV}"
-
-src_prepare() {
-       # Strip out non-free FAAC bits.
-       find "${S}" -name 'libfaac*' -exec rm {} +
-
-       # Include all libv4l libs, bug #348277
-       ALLOWED="${S}/usr/lib32/libv4l/"
-       emul-linux-x86_src_prepare
-}

diff --git a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20130224-r8.ebuild b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20131008-r1.ebuild
similarity index 73%
rename from app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20130224-r8.ebuild
rename to app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20131008-r1.ebuild
index a35a8734d462cb8277dd00e056469c7a791ffe42..c548e2cedfcedffe6b854dfeb49035f86d36e3e7 100644 (file)
--- a/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20130224-r8.ebuild
+++ b/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20131008-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20130224-r8.ebuild,v 1.1 2013/08/01 17:43:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-medialibs/emul-linux-x86-medialibs-20131008-r1.ebuild,v 1.1 2013/10/09 07:14:33 tetromino Exp $
 
 EAPI=5
 inherit emul-linux-x86
@@ -36,6 +36,18 @@ RDEPEND="~app-emulation/emul-linux-x86-baselibs-${PV}
                >=media-libs/libsidplay-1.36.59-r1:1[abi_x86_32(-)]
                >=media-libs/x264-0.0.20130731[abi_x86_32(-)]
                >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)]
+               >=media-libs/a52dec-0.7.4-r7[abi_x86_32(-)]
+               >=media-libs/libmimic-1.0.4-r2[abi_x86_32(-)]
+               >=media-libs/libmms-0.6.2-r1[abi_x86_32(-)]
+               >=media-libs/libvisual-0.4.0-r3:0.4[abi_x86_32(-)]
+               >=media-libs/libmpeg2-0.5.1-r2[abi_x86_32(-)]
+               >=dev-libs/liboil-0.3.17-r2[abi_x86_32(-)]
+               >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)]
+               >=dev-libs/fribidi-0.19.5-r2[abi_x86_32(-)]
+               >=dev-libs/libcdio-0.90-r1[abi_x86_32(-)]
+               >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)]
+               >=media-video/ffmpeg-0.10.8:0.10[abi_x86_32(-)]
+               >=media-libs/libdv-1.0.0-r3[abi_x86_32(-)]
        )
        "
 PDEPEND="~app-emulation/emul-linux-x86-soundlibs-${PV}"

diff --git a/dev-haskell/pointfree/Manifest b/dev-haskell/pointfree/Manifest
deleted file mode 100644 (file)
index 8764fd9..0000000
--- a/dev-haskell/pointfree/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST pointfree-1.0.4.1.tar.gz 19245 RMD160 bdd8e463ddf50f6b3096f582b6a382a35063c573 SHA1 42cbb7acb5440fe8936d3b9c1cf1e2f0f15f89c6 SHA256 b603c8484324e038f8079dbad3e0a2bca257a6b2da6012760947283dbcf2734f
-EBUILD pointfree-1.0.4.1.ebuild 744 RMD160 698e9bacddaf7748ab56cdcd2b5493675347d735 SHA1 f0ef53b4a9b68d353036d46c6c70f3c0789e1a16 SHA256 b8233a93994b65b422662c190b3ec46f0fc785b1c6d69a6608056d3467f60f53

diff --git a/dev-haskell/pointfree/pointfree-1.0.4.1.ebuild b/dev-haskell/pointfree/pointfree-1.0.4.1.ebuild
deleted file mode 100644 (file)
index 6d0a333..0000000
--- a/dev-haskell/pointfree/pointfree-1.0.4.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header:  $
-
-# ebuild generated by hackport 0.2.13
-
-EAPI="3"
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal
-
-DESCRIPTION="Tool for refactoring expressions into pointfree form"
-HOMEPAGE="http://hackage.haskell.org/package/pointfree"
-SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-               >=dev-haskell/cabal-1.6
-               <dev-haskell/mtl-2.1
-               <dev-haskell/parsec-3.2
-               >=dev-lang/ghc-6.12.1"
-
-src_prepare() {
-       sed -e 's@mtl >= 2 && < 2.1@mtl >= 1.1 \&\& < 2.1@' \
-               -i "${S}/${PN}.cabal" || die "Could not loosen dependency on mtl"
-}

diff --git a/dev-qt/qtmotifextension/Manifest b/dev-qt/qtmotifextension/Manifest
new file mode 100644 (file)
index 0000000..57fc597
--- /dev/null
+++ b/dev-qt/qtmotifextension/Manifest
@@ -0,0 +1,2 @@
+DIST qtmotifextension-2.7_1-opensource.tar.gz 119991 SHA256 d0ad573a721052c90f94d1c987cea0925cae3378d3e436b28a3747b4d3d90041 SHA512 2e6458dc74e8a66396e7a8148ce55bc024d91910a1314bffaf22db069fd84e0050cb64b00b174b1d74b93b508c1da0e92e64516cc5653320f36f5b48ad656724 WHIRLPOOL f91f5e2b7b9d445ae2bb696cca7324bda5adec7abef463f6ddf014c334af10f258a83d2d6567d40e1b952e00323cf0c2fc7516a3322e1d9457021b31d0fdb344
+EBUILD qtmotifextension-2.7.1.ebuild 531 SHA256 60895d7eafebcd0f82070f57b827a6f43860a9415c4c0ea7c4bed32c30aca350 SHA512 8cebdbbd6adc4b1e789f647440681d2ce2c10655ae37d869a4e91a72382bc056effa73f7570497ff402dc58da153ebeaee17b5bbe836f174fc3cf900d80e2132 WHIRLPOOL 0d9a3852af70d009c454c25a8ceaf79313d893ca29055add5dadbe640e070a8e86e6bf6ec405d1aef68fc8298b5cb2ae3765c43904d61cb07b660d281a561764

diff --git a/dev-qt/qtmotifextension/qtmotifextension-2.7.1.ebuild b/dev-qt/qtmotifextension/qtmotifextension-2.7.1.ebuild
new file mode 100644 (file)
index 0000000..5295250
--- /dev/null
+++ b/dev-qt/qtmotifextension/qtmotifextension-2.7.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit qt4-r2 versionator
+
+MY_P="${PN}-$(replace_version_separator 2 _)-opensource"
+
+DESCRIPTION="Qt Motif Extension"
+HOMEPAGE=""
+SRC_URI="http://draconx.ca/${MY_P}.tar.gz"
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-qt/qtcore:4
+       dev-qt/qtgui:4"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+       eqmake4 CONFIG+=qtmotifextension-uselib
+}
+
+src_install() {
+       dolib.so lib/*
+}