From dc45b83b28fb83e9659492066e347b8dc60bc9e3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 4 Feb 2018 12:30:23 +0000 Subject: gentoo resync 04.02.2018 --- media-sound/grip/Manifest | 8 +--- .../files/grip-3.3.1-implicit-declaration.patch | 32 ------------- .../grip/files/grip-3.3.1-invalid-genre-size.patch | 30 ------------- media-sound/grip/grip-3.3.1-r3.ebuild | 52 ---------------------- media-sound/grip/grip-3.6.1.ebuild | 52 ---------------------- media-sound/grip/grip-3.6.3.ebuild | 52 ++++++++++++++++++++++ 6 files changed, 54 insertions(+), 172 deletions(-) delete mode 100644 media-sound/grip/files/grip-3.3.1-implicit-declaration.patch delete mode 100644 media-sound/grip/files/grip-3.3.1-invalid-genre-size.patch delete mode 100644 media-sound/grip/grip-3.3.1-r3.ebuild delete mode 100644 media-sound/grip/grip-3.6.1.ebuild create mode 100644 media-sound/grip/grip-3.6.3.ebuild (limited to 'media-sound/grip') diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest index 6928ddc01e78..209ef340c5ac 100644 --- a/media-sound/grip/Manifest +++ b/media-sound/grip/Manifest @@ -1,13 +1,9 @@ -AUX grip-3.3.1-implicit-declaration.patch 673 BLAKE2B 7bbaa45fe03fbaacc888ed147c0c9c2bf5644362bb67c92e2f10478b9fd4eb2ca840dbf95fec7a36fbef53e71ab51edaf21c4ff76132c44ad9c2473eda123a1a SHA512 be7ba1b7250ebeffbb4b5e5aa64baed994441030e0af5a2937c9e26e91a718c59ba32782487e5e71df04acf3241ad6ec99d4d1302c44c4ba3abe20472fec107b -AUX grip-3.3.1-invalid-genre-size.patch 697 BLAKE2B daa0fd81bcee051647fce7ea5b40924791ad03a3fa2f8ce6b55eedaf3ed8f97ec02a8b8b7dda38c52b39ffe49a21b555aac0934682b642a86ae9170cfff5c05c SHA512 80f0df873b4721b0d4c74e5d17a0dcf0f35988041be5f8e30c9fa73fe2e125bde83ab3d943894675a7b2a07d7ecd38a1f2c7c1edf6be81e4a37db302ae05b51f -DIST grip-3.3.1.tar.gz 812562 BLAKE2B 7aa7cdb0d9c4b60d42e5af108299923466f69df1b14ecbe06b1b56b7a8719e12389c90d1478328c5e05f14cb65f7da23486c8467a7707bee35f33fa51e8e40ea SHA512 380e36cb4e58180e543e1d293d38108f4879842ed63106da875e00747e98c2c06da1e706cfaf4ff26f481bba0ca941eb1201f430de04b0f313b1307ddd7e88d3 DIST grip-3.4.3.tar.gz 740870 BLAKE2B d6b703d4ba08bf976a53e70772977a6b0fd5cd231fc16bf6a387497ad6db8e0ba2226ebe05d77135e7ec55911af0d3cd6cb7608da1452083335f9f8f46cbc182 SHA512 e7690cfe375de525f7dde7cc4d64ac9577f702a58bbd2cc1aa318dba58b208a8affe9e8e07078d6a16ba1340b0bd17edce1c8cf750631c8d677a3bd2679bb361 DIST grip-3.5.2.tar.gz 952153 BLAKE2B e82ccb50636e68ab9862d2004a4dbe59399372b76a835b33350e539a186fed516e7b4961fe930b3beb5168554324a5bebeee5ef03d1cb7731d7f9d7c1fd1feb9 SHA512 25fbc1aadfcbab57ae585afe0a6663d9640a3614c1b655abd238f272116eccf524e4de465784265cd1f12b48c4cdeb9fdd318f989052400a0bfc9855a5420421 -DIST grip-3.6.1.tar.gz 958967 BLAKE2B 2355312f26bb1bf503dedf0bea07e7a0ea1ede1a90cfa215188a4c0396c2b50315ff8e6579c66a5d1284622f80022a5b6681559a169fe2eff21e1f3226466799 SHA512 ebb0945833189b17d814fee9a68acf25786f83fa7d1e47523512b25c1ef9d146d5d218c8422c7b37fbb7cf63558cc093795ef4078639f8e35c9947d76d6d2fcf DIST grip-3.6.2.tar.gz 959393 BLAKE2B 09f7c6bbd5e82ada26795f082feb0d35cd21e14bac0e5881502c65d1e64f501eb086d5843b5120408186435ce6a95771bcf94972881fc449d4c4c2130f929066 SHA512 8aba6dbf4cb374dbe76fb5358f4b550187840a1248f9a60d8441a123ad5abe49d6fe4bcd491047d19432dd90a6dbd9060737f9e2ba19fa60e5e4c50ec5fd8cf8 -EBUILD grip-3.3.1-r3.ebuild 1353 BLAKE2B b7b3afd31cfe23537df761d566b221f3f762ff807d5d3fa87b2b4524d15eaa7828d30ee5e80fd14f3e63d719ab777c50241013a6f5423c6b3e578cdc1f237ef7 SHA512 964b99dd264dda5e9309c47a998308ac4b6dc770847d14ae0d60e768ef5038ffd41ea3a0bd87cd5de1130f79d5ceaf5040588724db59516ab1a1e3acf92b9154 +DIST grip-3.6.3.tar.gz 960255 BLAKE2B 9aad33c04e98f60e5f7871e36f2e4bf616a16486482e7363d165ae7d9fc5343a52583e490b9b9757d31b051e6e96165d35931370e2681d727db7abb0854db2d5 SHA512 f94c5dc24a1355a024833992d05a7c05d84367a004607c9d6c7aa6d4bc24dd93b11e0a061689eb521a8abe637472011a1a4c8e968c48ac8447457cffc4d2957d EBUILD grip-3.4.3.ebuild 1208 BLAKE2B 02a70b62576c3c42717e1492e3f2592a5e694722c4f527f5a34c39868df1b5307f812905d7c8d7e072cad9a0a2fa1138a198fde7e872394010dbac5d7ed8381f SHA512 7d9b2282e8c4ff9570fe382c2e8e99ae81505007a2da45379fc83682dcec1324efaf34d695effac0486563dad46a3e7cee8e007f2361e9c480a74e8d9fb6b88e EBUILD grip-3.5.2.ebuild 1214 BLAKE2B bc9c0ff5cd0ae7969eb7ceaa3b328ffacf090c3e76d828d0e9135bf57b50b872dbf9fa0da9abc0b33aae27e045361d306a1c990af424032d15a326a74cafbe11 SHA512 6da4ad712b0da1f19b2e851a4b6ea7122b97bfd77cc5e5a2393888cccf1a241b0cde2359bebd9486885df15cf890802993655370d404c4d8e31756f4e8191b92 -EBUILD grip-3.6.1.ebuild 1214 BLAKE2B bc9c0ff5cd0ae7969eb7ceaa3b328ffacf090c3e76d828d0e9135bf57b50b872dbf9fa0da9abc0b33aae27e045361d306a1c990af424032d15a326a74cafbe11 SHA512 6da4ad712b0da1f19b2e851a4b6ea7122b97bfd77cc5e5a2393888cccf1a241b0cde2359bebd9486885df15cf890802993655370d404c4d8e31756f4e8191b92 EBUILD grip-3.6.2.ebuild 1214 BLAKE2B bc9c0ff5cd0ae7969eb7ceaa3b328ffacf090c3e76d828d0e9135bf57b50b872dbf9fa0da9abc0b33aae27e045361d306a1c990af424032d15a326a74cafbe11 SHA512 6da4ad712b0da1f19b2e851a4b6ea7122b97bfd77cc5e5a2393888cccf1a241b0cde2359bebd9486885df15cf890802993655370d404c4d8e31756f4e8191b92 +EBUILD grip-3.6.3.ebuild 1214 BLAKE2B 9f83fc44a41fea6a509a0c1f85f8f46d7a7bba8f0e161152dbd31f180ed1336a498d506057a6d7e40a2200b61fdf5d0f5185d4f7d0f9b7aef8dfbea9c9ed39b5 SHA512 ad6bfc7cee3c25c7c6ab4c274b8c98744f8cf6c5d28b0b7d8c88b1699c45a50cc93dcc73559bbb758d39bb339cc2f0a839d7a2e9c263739bcecb8f0e4120424a MISC metadata.xml 327 BLAKE2B 3e97916828952f228021896112537b6fa34d2dd248200e76de94e1bb2bb072b6ffb8d97ff69616ebd0d778cffe1aab456bdebea17ec4b93cdbf2cc273c8ed9bf SHA512 3daf9c932bd4e3392751cb3c89ffbaf77b4da1eb3acc20a5cc30bfb8a1d0bc054fe1012ed76499f3c24ca0b599fbdafe9357a7ed1f26b8c4e924a48ffeb8bf14 diff --git a/media-sound/grip/files/grip-3.3.1-implicit-declaration.patch b/media-sound/grip/files/grip-3.3.1-implicit-declaration.patch deleted file mode 100644 index 2319b772a9b0..000000000000 --- a/media-sound/grip/files/grip-3.3.1-implicit-declaration.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- grip-3.3.1/src/status_window.c -+++ grip-3.3.1/src/status_window.c -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include - #include - #include "status_window.h" ---- grip-3.3.1/src/tray.c -+++ grip-3.3.1/src/tray.c -@@ -20,6 +20,9 @@ - * USA - */ - -+#include "cdplay.h" -+#include "common.h" -+#include "rip.h" - #include "tray.h" - #include "../pixmaps/rip1.xpm" - #include "../pixmaps/menuplay.xpm" ---- grip-3.3.1/src/cdplay.c -+++ grip-3.3.1/src/cdplay.c -@@ -28,6 +28,7 @@ - #include "cddev.h" - #include "discedit.h" - #include "dialog.h" -+#include "tray.h" - #include "rip.h" - #include "grip_id3.h" - diff --git a/media-sound/grip/files/grip-3.3.1-invalid-genre-size.patch b/media-sound/grip/files/grip-3.3.1-invalid-genre-size.patch deleted file mode 100644 index c826fc6e2e80..000000000000 --- a/media-sound/grip/files/grip-3.3.1-invalid-genre-size.patch +++ /dev/null @@ -1,30 +0,0 @@ -http://bugs.gentoo.org/285105 - ---- grip-3.3.1/src/id3.c -+++ grip-3.3.1/src/id3.c -@@ -252,8 +252,8 @@ - - if ( frames[ i ] ) { - char *c_data = NULL; -- char gen[ 5 ] = "( )"; -- char trk[ 4 ] = " "; -+ char gen[ 6 ] = "( )"; /* max unsigned char: 255 */ -+ char trk[ 3 ] = " "; /* max CDDA tracks: 99 */ - - switch( frameids[ i ] ) { - case ID3FID_TITLE: -@@ -278,12 +278,12 @@ - - case ID3FID_CONTENTTYPE: - c_data = gen; -- sprintf( gen, "(%d)", genre ); /* XXX */ -+ snprintf( gen, 6, "(%d)", genre ); - break; - - case ID3FID_TRACKNUM: - c_data = trk; -- sprintf( trk, "%d", tracknum ); /* XXX */ -+ snprintf( trk, 3, "%d", tracknum ); - break; - - default: diff --git a/media-sound/grip/grip-3.3.1-r3.ebuild b/media-sound/grip/grip-3.3.1-r3.ebuild deleted file mode 100644 index 9c72bbab7740..000000000000 --- a/media-sound/grip/grip-3.3.1-r3.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=2 -inherit eutils flag-o-matic toolchain-funcs libtool - -DESCRIPTION="GTK+ based Audio CD Player/Ripper" -HOMEPAGE="https://sourceforge.net/projects/grip/" -SRC_URI="mirror://sourceforge/grip/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="nls vorbis" - -RDEPEND=">=x11-libs/gtk+-2.2:2 - x11-libs/vte:0 - media-sound/lame - media-sound/cdparanoia - >=media-libs/id3lib-3.8.3 - >=gnome-base/libgnomeui-2.2.0 - >=gnome-base/orbit-2 - net-misc/curl - vorbis? ( media-sound/vorbis-tools )" -# gnome-extra/yelp, see bug 416843 -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext )" - -src_prepare() { - epatch "${FILESDIR}"/${P}-implicit-declaration.patch - epatch "${FILESDIR}"/${P}-invalid-genre-size.patch #285105 - # fix include syntax for newer versions of bash - sed -i '/[.] conftest[.]id3/s: c: ./c:' configure || die - elibtoolize -} - -src_configure() { - # Bug #69536 - [[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse" - - strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nl pl_PL pt_BR ru zh_CN zh_HK zh_TW - - econf \ - --disable-dependency-tracking \ - $(use_enable nls) -} - -src_install () { - emake DESTDIR="${D}" install || die - dodoc AUTHORS CREDITS ChangeLog README TODO -} diff --git a/media-sound/grip/grip-3.6.1.ebuild b/media-sound/grip/grip-3.6.1.ebuild deleted file mode 100644 index 5f7555472651..000000000000 --- a/media-sound/grip/grip-3.6.1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils flag-o-matic toolchain-funcs libtool - -DESCRIPTION="GTK+ based Audio CD Player/Ripper" -HOMEPAGE="https://sourceforge.net/projects/grip/" -SRC_URI="mirror://sourceforge/grip/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="vorbis" - -# lame and vorbis-tools are no real RDEPENDs. But without them -# grip cannot convert ripped files to any format. So use them as -# a sane default. -RDEPEND=" - gnome-base/libgnome - >=gnome-base/libgnomeui-2.2.0 - >=media-libs/id3lib-3.8.3 - media-sound/cdparanoia - media-sound/lame - net-misc/curl - >=x11-libs/gtk+-2.2:2 - x11-libs/libX11 - x11-libs/pango - x11-libs/vte:0 - vorbis? ( media-sound/vorbis-tools ) -" -# gnome-extra/yelp, see bug 416843 -DEPEND=" - ${RDEPEND} - sys-devel/gettext - virtual/pkgconfig -" - -src_prepare() { - default - - sed '/^Icon/s@grip\b@gripicon@' -i grip.desktop || die -} - -src_configure() { - # Bug #69536 - [[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse" - - strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nb nl pl_PL pt_BR ru sr vi zh_CN zh_HK zh_TW - - econf -} diff --git a/media-sound/grip/grip-3.6.3.ebuild b/media-sound/grip/grip-3.6.3.ebuild new file mode 100644 index 000000000000..b664cc4ecb4e --- /dev/null +++ b/media-sound/grip/grip-3.6.3.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit eutils flag-o-matic toolchain-funcs libtool + +DESCRIPTION="GTK+ based Audio CD Player/Ripper" +HOMEPAGE="https://sourceforge.net/projects/grip/" +SRC_URI="mirror://sourceforge/grip/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="vorbis" + +# lame and vorbis-tools are no real RDEPENDs. But without them +# grip cannot convert ripped files to any format. So use them as +# a sane default. +RDEPEND=" + gnome-base/libgnome + >=gnome-base/libgnomeui-2.2.0 + >=media-libs/id3lib-3.8.3 + media-sound/cdparanoia + media-sound/lame + net-misc/curl + >=x11-libs/gtk+-2.2:2 + x11-libs/libX11 + x11-libs/pango + x11-libs/vte:0 + vorbis? ( media-sound/vorbis-tools ) +" +# gnome-extra/yelp, see bug 416843 +DEPEND=" + ${RDEPEND} + sys-devel/gettext + virtual/pkgconfig +" + +src_prepare() { + default + + sed '/^Icon/s@grip\b@gripicon@' -i grip.desktop || die +} + +src_configure() { + # Bug #69536 + [[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse" + + strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nb nl pl_PL pt_BR ru sr vi zh_CN zh_HK zh_TW + + econf +} -- cgit v1.2.3