diff options
| author |   Tom Wijsman <tomwij@gentoo.org> | 2013-03-16 22:00:56 +0000 |
|---|---|---|
| committer | Tom Wijsman <tomwij@gentoo.org> | 2013-03-16 22:00:56 +0000 |
| commit | 4f1c59be3590a037db78ca57363eaa0d81380562 (patch) | |
| tree | b65ee137df018ebd6819ae93b44688a0ffbee670 /media-libs | |
| parent | Add patch to fix silent failure with PyQt4-4.10. (diff) | |
| download | historical-4f1c59be3590a037db78ca57363eaa0d81380562.tar.gz historical-4f1c59be3590a037db78ca57363eaa0d81380562.tar.bz2 historical-4f1c59be3590a037db78ca57363eaa0d81380562.zip | |
Made avidemux-core block old versions of avidemux that had the core libraries, this resolves file collisions.
Package-Manager: portage-2.1.11.55/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/avidemux-core/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/avidemux-core/Manifest | 18 | ||||
| -rw-r--r-- | media-libs/avidemux-core/avidemux-core-2.6.2.ebuild | 3 |
3 files changed, 16 insertions, 11 deletions
diff --git a/media-libs/avidemux-core/ChangeLog b/media-libs/avidemux-core/ChangeLog index e66be547fa2b..78244ef1c063 100644 --- a/media-libs/avidemux-core/ChangeLog +++ b/media-libs/avidemux-core/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/avidemux-core # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/ChangeLog,v 1.1 2013/03/16 11:14:55 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/ChangeLog,v 1.2 2013/03/16 22:00:45 tomwij Exp $ + + 16 Mar 2013; Tom Wijsman <TomWij@gentoo.org> avidemux-core-2.6.2.ebuild: + Made avidemux-core block old versions of avidemux that had the core libraries, + this resolves file collisions. *avidemux-core-2.6.2 (16 Mar 2013) diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest index b76d996c9f57..9c36db805fee 100644 --- a/media-libs/avidemux-core/Manifest +++ b/media-libs/avidemux-core/Manifest @@ -2,17 +2,17 @@ Hash: SHA256 DIST avidemux_2.6.2.tar.gz 17009420 SHA256 67c5676692152094033fbab490fbea24af27d8744496578d1c77957ab103fdb6 SHA512 1ba6f1c751732eec9fdceb2b0728122005ceab4c74ac09d213ebeff4c2af2a0b6ce8737d88e7c43970d1b9ca80cb36ad925efc9e4a487c4f463f1435aee328b3 WHIRLPOOL 0c95e87293251fffb773c8a1996ac015ba0d6f9d36d4f5ae01313c0532d2cf020a3ba0704d0f607347bbf0444e10857d7508fcbd968d62e889d7b62b36b85df7 -EBUILD avidemux-core-2.6.2.ebuild 3800 SHA256 99a395f31f63d9d39cf2a9e52a294b3b16e31a308a1a5d32763ec5ed8c226dac SHA512 764d006a52dc1f202e3d8e625a18ea01747444afa3c5ef9056919216504642959a98a0424543448c539d8e94218230d6ca901cea0bc8689e27e143a1dd74e35f WHIRLPOOL 6d01094d09a78f0929bdbfba4fb99ff816e06c33fb7316bd59ef803fd9e26eed2b2f9165cd0b629b3e77e29bfa30549c8e13165266ab7408a615c9126980add1 -MISC ChangeLog 410 SHA256 e8f79a932fbbbecf804a7790f2ab33545c85c34f630eabb554021fd6e979d2e6 SHA512 8842aecc400180769214cb6b0a25cf4c4d720c7cb6fae22580568e68fbd07cd849fe8298e51974caa1d3b611b54d7e08fd501634ae269b7e3f597c47841521b2 WHIRLPOOL 7c9c1454546339352ebb26aca924b5e187c791eb0a8496cebcb3acf875fd0e0e7fae14f93bca912dacc0e9307b7abcd5f6bf616c39b55cb29e7f135773de9c97 +EBUILD avidemux-core-2.6.2.ebuild 3830 SHA256 9316bb5283564a264b41a936c6fdc990db80cbec632c557ee68db7422037dc8f SHA512 38e91f24e225755640aac33359e9d185d74d02f08ee776f4f5c49fb8bc2db6774bc126420c975ff6a2ea8944b7229f0db7d3ffdb4850715ec6af6a0fdac0d2f7 WHIRLPOOL 72816e6619ece94595fa0da97620574a934653705df19e11aa756a982a496d398dc0db52e82bdc2964660c2d918492142783a4cd118e0759aabd4376dbfa1ec7 +MISC ChangeLog 600 SHA256 baf25056e8e013060c1c254716358cbd1c6621fa611196c81a1b5ec2cc4898be SHA512 a00c6c7b5bc11b695be92665d4b1665c33f75d971168147ec806e77f59bca9a911210ba6f852838d1fa81bd9c44b246a3d476ee91adfe533798412400495fa2e WHIRLPOOL 9e9a3253bce1bc162821be1d1615c4fe5192800d2c643229d73a6d2d6f841b490568628cac1ded5084c2868d7564c7cf3967577e6dceabb123a3f53d42db5d26 MISC metadata.xml 531 SHA256 df76d8b7f4994551e675fecc89d6bf8212cc6df6fbf6a6076bd7b550216c112b SHA512 0278ba98d729ab620362485878cd7935c5d1d71c093d4a52777724235f765f049a3f0cae224a7d7da3a278126b93d85ec140c98f42baa2dc19ede7d57458dcdb WHIRLPOOL 15779ddc80f052e428820ed249c971ec4a43bc0dc4a495526c5b48a23bd71ae33283ff3e5c1e8105e9484ae264517f36704a462ff030f3ee35400c1982028d0e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCAAGBQJRRFQfAAoJEJWyH81tNOV9hMMH/3MHQgfjXb/z80PPoX2dvDfp -0AnwkuCgW917RKvn7iB9MBBGdJ01TScekYKo/jQwaVv4Z8Qqcjsgs78vTiEmUT4w -AiQsz7eKjnFAW1hdG1z3kmh/UKoGABSscA47VwA17ar66hFjI7kgxYb+u+iEEU6D -tl8AJBmxB99kPGwfcEkJjCulF8ettTQrKIn38Krrcn/21G7dZrUvJExP4q5iTzAg -RXjzNDUVVznH1Y1ZL/ACRqQhQWYBnQ/5L+RS9NqD4V2X6vOKUJUuDYJruvQ20PJB -IZpgxVJN4k1B81sPX77pAOHj3Z3Hq2/rXqUgBYu9OviG6Orw2AFKm+3mMv1ZRDU= -=bLAf +iQEcBAEBCAAGBQJRROuBAAoJEJWyH81tNOV9qqcH/jOGT29JLReSHSJPR9tJZMCK +J2ZYiEWnDM9/RYTYAnbT5BmnEbiFbJM8we30k4meOsXgiFOvFBJlS5L3yzZU53qB +cPIF4zSPPIl8YvoGBItMDu27DCJ+dmBM0DLdvY2QwMDU+D59Bd8Iaz/rcP/TzItG +LU9RNHHll3IO62hB/ClIRF+17MdWJ1tX5aYCH4MbAWFR1kP70/Zo1K9ElpQWYqBi +gpMG1tGbeCSKbpyw2/42B/YXR0MKkkA2n5c3sq//P22dluO8hdwAL32Q5C56T/r+ +v49JspTKUMZLvSIsuMQ9IiRmjPA12ElsWKZJAqq91iZGc4ySfwHK2nkvNdiqS+U= +=dVtJ -----END PGP SIGNATURE----- diff --git a/media-libs/avidemux-core/avidemux-core-2.6.2.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.2.ebuild index d2b961d4bba5..c358a4185d60 100644 --- a/media-libs/avidemux-core/avidemux-core-2.6.2.ebuild +++ b/media-libs/avidemux-core/avidemux-core-2.6.2.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/media-libs/avidemux-core/avidemux-core-2.6.2.ebuild,v 1.1 2013/03/16 11:14:55 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-core/avidemux-core-2.6.2.ebuild,v 1.2 2013/03/16 22:00:45 tomwij Exp $ EAPI="5" @@ -21,6 +21,7 @@ KEYWORDS="~amd64 ~x86" IUSE="aften a52 alsa amr debug dts fontconfig jack lame libsamplerate mmx oss nls sdl -system-ffmpeg vorbis truetype xvid x264 xv" RDEPEND=" + !<media-video/avidemux-2.6.2 >=dev-lang/spidermonkey-1.5-r2 dev-libs/libxml2 media-libs/libpng |