From c6bcbc415af18e7bdf26e4fa6c6e122a1a0f0a9f Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Thu, 29 Jan 2015 10:28:48 +0000 Subject: [PATCH] Use gnome2.eclass properly, fix compilation with current zlib (#413623), drop old Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xA188FBD4 --- media-sound/terminatorx/ChangeLog | 13 +++-- media-sound/terminatorx/Manifest | 25 ++++----- .../files/terminatorx-3.84-new-zlib.patch | 19 +++++++ ...3.83.ebuild => terminatorx-3.84-r1.ebuild} | 29 ++++++---- .../terminatorx/terminatorx-3.84.ebuild | 54 ------------------- 5 files changed, 60 insertions(+), 80 deletions(-) create mode 100644 media-sound/terminatorx/files/terminatorx-3.84-new-zlib.patch rename media-sound/terminatorx/{terminatorx-3.83.ebuild => terminatorx-3.84-r1.ebuild} (70%) delete mode 100644 media-sound/terminatorx/terminatorx-3.84.ebuild diff --git a/media-sound/terminatorx/ChangeLog b/media-sound/terminatorx/ChangeLog index 752409be522a..ba0eb11fedf3 100644 --- a/media-sound/terminatorx/ChangeLog +++ b/media-sound/terminatorx/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-sound/terminatorx -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/terminatorx/ChangeLog,v 1.35 2012/05/05 09:02:12 mgorny Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/terminatorx/ChangeLog,v 1.36 2015/01/29 10:28:47 pacho Exp $ + +*terminatorx-3.84-r1 (29 Jan 2015) + + 29 Jan 2015; Pacho Ramos + +files/terminatorx-3.84-new-zlib.patch, +terminatorx-3.84-r1.ebuild, + -terminatorx-3.83.ebuild, -terminatorx-3.84.ebuild: + Use gnome2.eclass properly, fix compilation with current zlib (#413623), drop + old 05 May 2012; Michał Górny terminatorx-3.82.ebuild, terminatorx-3.83.ebuild, terminatorx-3.84.ebuild: @@ -133,4 +141,3 @@ Submitted by Dietrich Heise Thanks Dietrich - diff --git a/media-sound/terminatorx/Manifest b/media-sound/terminatorx/Manifest index d02660492331..696e543fea28 100644 --- a/media-sound/terminatorx/Manifest +++ b/media-sound/terminatorx/Manifest @@ -1,20 +1,17 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -DIST terminatorX-3.82.tar.gz 545693 RMD160 d8d053ba95ec9ac7805a9f7806f0451ca66e28cb SHA1 ebe387109ca90480fe108a587b4934ccc93d0744 SHA256 0021d9eaa60d19f54520828ce93ae36a35e0e6cbfc2b10ae6c9ff7dd574602f0 -DIST terminatorX-3.83.tar.gz 571915 RMD160 20e7a552116f7e31cb352c25b13ddb906e11d1f0 SHA1 578d54dd1c51864cf844f5e4d86500eb96533b52 SHA256 3f50a36963dbbb49f1817269a820caa5287957567f01586e0620e90a8e486ccd -DIST terminatorX-3.84.tar.gz 572143 RMD160 8cee29c5776da892867244cdac4ec512314f4d18 SHA1 f940f2df70ae46dbe514b17dd4a354e342655567 SHA256 0680b94aa3cbe77d1f1193be2b84a7d7b250c213cfa2da68241a2294ac5dfc37 -EBUILD terminatorx-3.82.ebuild 1384 RMD160 cbb9094cd47ce03ec8944e6364a521790803a32a SHA1 09f7b17a7eb26ff92869fd48d449b40a376002a4 SHA256 c1a444c9189dc9d18834ef049c91e0e10ef0cddaecab9684f9401730564f2652 -EBUILD terminatorx-3.83.ebuild 1385 RMD160 33893b37377b3dbae3bfc0aa5a4848c1deb30c8e SHA1 cdbdb284be4de965b10b21b94453620abfd036a7 SHA256 ef4bc2105871f98a2cf6b07d24790c33fa472599073b4c3a62bc7c4755e72e0b -EBUILD terminatorx-3.84.ebuild 1354 RMD160 18e7b24ffc2ab6f3dfccdbe1653206a274e94cd8 SHA1 87318f909c78d1d5314cc8ddcd720fdc5e1d8b94 SHA256 4fa3d024313217f678c335c533fd915650ee0368087c8f5fffdfa8bce2cb330f -MISC ChangeLog 4820 RMD160 bffb39eed698828bd8843beefee20e48e186ee85 SHA1 56a30caccd9d9b1f41e991163820d1ab2eedc46a SHA256 f7a976cf0ba9f8fd99fdc7364820a52e02da7299f5b04e81646bdf8f7c6fc515 -MISC metadata.xml 161 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 SHA1 90201ddb830142147774cc7b7b5178fbd0a9af0c SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e +AUX terminatorx-3.84-new-zlib.patch 549 SHA256 c7bd1455bfe1f3cd1badb6bd284e8f9da8b4487b0b5525574faee30ccc54ff11 SHA512 c0e26dc711ab960929629e49c860631ca1e5d2e6a0b677a65901c2721d05ff0244467b5c7451b764f7757f59364d099f2af6e4d2ac77fa70aa08de9f9d6df4e8 WHIRLPOOL f97124bdd1039efc9eb25d55420a1f7d62a35508f646937be8ce946ddd9d933be657e24952fad573905fef6e61e5f80aaffd2280486e2a5a095597e94af45707 +DIST terminatorX-3.82.tar.gz 545693 SHA256 0021d9eaa60d19f54520828ce93ae36a35e0e6cbfc2b10ae6c9ff7dd574602f0 +DIST terminatorX-3.84.tar.gz 572143 SHA256 0680b94aa3cbe77d1f1193be2b84a7d7b250c213cfa2da68241a2294ac5dfc37 SHA512 9b538007acc98b1dd7bb2e310be53bcf1971a94e5c03ea8ca48c59b05f1a0bddd75bf30ab4cfb03d49165098ba63643eaa3bda117cdf833df2438c29a774db6c WHIRLPOOL 1cf156623ff6ea410a701ac3b5613740b6d55ce9cd40ad22bd75e44fc404241fd6737705beeb75ff7631be0615ab84938f88d6fcb62cc5561be978be66d73290 +EBUILD terminatorx-3.82.ebuild 1384 SHA256 c1a444c9189dc9d18834ef049c91e0e10ef0cddaecab9684f9401730564f2652 SHA512 94215fdb90455aaca6446a7c08710fe9ca2a7d2e3573ad60a7e190f752ae32636d4bc33e8a1d5e052bfeedd37e594bef83c372503dba34ad3e35a857945e4fdc WHIRLPOOL bd721bcf6d097813b501462f92a12e7b73321d812d4812d6b186022279e92a0b40cd3396ca84ee2f955c4b9e8489ed23cb8df829f1c1b9895d042cd6e3ff19dd +EBUILD terminatorx-3.84-r1.ebuild 1548 SHA256 0cd5ed9dfc48477d2f4eb7eaac019f412a26428d9a9c242d19080c8f0d955a55 SHA512 f31dbcbb1e8c82aa27bf03e0625d28d808b334e0071aa054b3ca22baa75a580e658697391329739efb81184e708f04656acbda75e10d79f9208ebe5f18243b98 WHIRLPOOL 66b6815cca13010462318e7ac7ace729beb2139c0f7310a7966ddb97baaeae2832a06ada86892322c03e23a04393ad13f6cf31800cd7b8ec4f04586732f0c557 +MISC ChangeLog 5112 SHA256 bf6410b1f95d6041ddfe8e6c7252fdf526cd41a940444cfee5c611920765a5ca SHA512 954029461daf36287d1bfbf51f19cf39712ee688996a23c610ef8c0a03621e0bb0e1f49ff48f8fbee779da21b19eb35fb1111aed20bea1c5938f9ac8899275cc WHIRLPOOL 132a1e652ccc37f1da9564f47cb0b69cefb7447f33b565a3a0a82e53315d58c97536a47a68cd94042e2e6f383c18a227919c2d008e8116a276fc8d6d0dba81be +MISC metadata.xml 161 SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e SHA512 e9f8695c64d7b6aa86b9b6186490d50b5a75d593ac1c86b9698265c6345899c64fa712acdde3bdbfb2464139e44623efdae29b67b73c1c85bcbedfbd10e874fd WHIRLPOOL c01ec8b583f907a3a62da7d5bf74d09809244709021f437dc3f0064b2d52baa3dd4386369b46a9fd74020146017cf6117ad04b147e8538b1a2c7202e1b4a2dd5 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2 -iJwEAQEIAAYFAk+k7McACgkQfXuS5UK5QB1snwP6A29KyzM2p1zFZFa6fuMnixov -7ko7b/VGhg/pcJxhyavv1q7ahx2xlZ6fvZ1DzAJeSjeib5LZiZbLI+lwGukNH7qu -wyFkbnnoPcsbfogQAVXVWPIyjKOCdGDzmpGe7vwCwUXZ3m5MZGmN9R7e7TbCNrVY -soFVNE7XrTa6Oa3Rzhk= -=TINw +iEYEAREIAAYFAlTKC2AACgkQCaWpQKGI+9TpnwCeK/wYApml+XPzijeiR2od0JhP +DYYAnj2Od5JZanL8ZPfZb9h8RTlj53gf +=75eN -----END PGP SIGNATURE----- diff --git a/media-sound/terminatorx/files/terminatorx-3.84-new-zlib.patch b/media-sound/terminatorx/files/terminatorx-3.84-new-zlib.patch new file mode 100644 index 000000000000..db05d7828d16 --- /dev/null +++ b/media-sound/terminatorx/files/terminatorx-3.84-new-zlib.patch @@ -0,0 +1,19 @@ +Description: Fix FTBFS errors with newer zlib. +Author: Moritz Muehlenhoff +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=663053 +Forwarded: no +--- + src/tX_midiin.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- terminatorx.orig/src/tX_midiin.cc ++++ terminatorx/src/tX_midiin.cc +@@ -447,7 +447,7 @@ gboolean tX_midiin::midi_learn_destroy(G + + void tX_midiin::store_connections(FILE *rc, char *indent) + { +- gzFile *rz=NULL; ++ gzFile rz=NULL; + + tX_store("%s\n", indent); + diff --git a/media-sound/terminatorx/terminatorx-3.83.ebuild b/media-sound/terminatorx/terminatorx-3.84-r1.ebuild similarity index 70% rename from media-sound/terminatorx/terminatorx-3.83.ebuild rename to media-sound/terminatorx/terminatorx-3.84-r1.ebuild index 7d16815ce0e6..5dd776e5c118 100644 --- a/media-sound/terminatorx/terminatorx-3.83.ebuild +++ b/media-sound/terminatorx/terminatorx-3.84-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/terminatorx/terminatorx-3.83.ebuild,v 1.2 2012/05/05 09:02:12 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/terminatorx/terminatorx-3.84-r1.ebuild,v 1.1 2015/01/29 10:28:47 pacho Exp $ -EAPI=2 +EAPI=5 +GCONF_DEBUG="no" inherit gnome2 eutils @@ -14,9 +15,10 @@ SRC_URI="http://www.terminatorx.org/dist/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="alsa mad vorbis sox" +IUSE="alsa debug mad vorbis sox" -RDEPEND="alsa? ( media-libs/alsa-lib ) +RDEPEND=" + alsa? ( media-libs/alsa-lib ) mad? ( media-sound/madplay ) vorbis? ( media-libs/libvorbis ) sox? ( media-sound/sox @@ -30,25 +32,34 @@ RDEPEND="alsa? ( media-libs/alsa-lib ) media-libs/ladspa-sdk media-libs/ladspa-cmt app-text/scrollkeeper - media-libs/liblrdf" + media-libs/liblrdf +" DEPEND="${RDEPEND} virtual/pkgconfig x11-proto/xproto x11-proto/inputproto - x11-proto/xf86dgaproto" + x11-proto/xf86dgaproto +" S=${WORKDIR}/${MY_P} +src_prepare() { + # Patch from debian to compile with recent zlib + epatch "${FILESDIR}"/${PN}-3.84-new-zlib.patch + gnome2_src_prepare +} + src_configure() { - econf \ + gnome2_src_configure \ $(use_enable alsa) \ + $(use_enable debug) \ $(use_enable mad) \ $(use_enable vorbis) \ $(use_enable sox) } src_install() { - emake DESTDIR="${D}" install || die "emake install failed." + gnome2_src_install newicon gnome-support/terminatorX-app.png terminatorX.png make_desktop_entry terminatorX terminatorX terminatorX AudioVideo } diff --git a/media-sound/terminatorx/terminatorx-3.84.ebuild b/media-sound/terminatorx/terminatorx-3.84.ebuild deleted file mode 100644 index 85fe9894e8f1..000000000000 --- a/media-sound/terminatorx/terminatorx-3.84.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/terminatorx/terminatorx-3.84.ebuild,v 1.2 2012/05/05 09:02:12 mgorny Exp $ - -EAPI=4 - -inherit gnome2 eutils - -MY_P=${P/terminatorx/terminatorX} -DESCRIPTION='realtime audio synthesizer that allows you to "scratch" on digitally sampled audio data' -HOMEPAGE="http://www.terminatorx.org/" -SRC_URI="http://www.terminatorx.org/dist/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="alsa mad vorbis sox" - -RDEPEND="alsa? ( media-libs/alsa-lib ) - mad? ( media-sound/madplay ) - vorbis? ( media-libs/libvorbis ) - sox? ( media-sound/sox - media-sound/mpg123 ) - >=x11-libs/gtk+-2.2:2 - >=dev-libs/glib-2.2:2 - x11-libs/libXi - x11-libs/libXxf86dga - dev-libs/libxml2 - media-libs/audiofile - media-libs/ladspa-sdk - media-libs/ladspa-cmt - app-text/scrollkeeper - media-libs/liblrdf" -DEPEND="${RDEPEND} - virtual/pkgconfig - x11-proto/xproto - x11-proto/inputproto - x11-proto/xf86dgaproto" - -S=${WORKDIR}/${MY_P} - -src_configure() { - econf \ - $(use_enable alsa) \ - $(use_enable mad) \ - $(use_enable vorbis) \ - $(use_enable sox) -} - -src_install() { - emake DESTDIR="${D}" install - newicon gnome-support/terminatorX-app.png terminatorX.png - make_desktop_entry terminatorX terminatorX terminatorX AudioVideo -} -- 2.26.2