From: Ben de Groot Date: Fri, 20 Feb 2015 15:09:15 +0000 (+0000) Subject: Update to EAPI=5 (bug #540800) and fix underlinking with patch by Ted Tanberry (bug... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0abcc01b4e1cd688d87fa03358b8861715073330;p=gentoo.git Update to EAPI=5 (bug #540800) and fix underlinking with patch by Ted Tanberry (bug #499718) Package-Manager: portage-2.2.17/cvs/Linux x86_64 RepoMan-Options: --force Manifest-Sign-Key: 0x4FDF9CFD2FAC514E! --- diff --git a/media-sound/specimen/ChangeLog b/media-sound/specimen/ChangeLog index e9915f95d5c9..05716113eea1 100644 --- a/media-sound/specimen/ChangeLog +++ b/media-sound/specimen/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-sound/specimen -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/specimen/ChangeLog,v 1.21 2012/05/05 08:52:46 mgorny Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/specimen/ChangeLog,v 1.22 2015/02/20 15:09:07 yngwin Exp $ + +*specimen-0.5.2_rc3-r1 (20 Feb 2015) + + 20 Feb 2015; Ben de Groot + +files/specimen-0.5.2_rc3-underlinking.patch, +specimen-0.5.2_rc3-r1.ebuild, + -specimen-0.5.2_rc3.ebuild: + Update to EAPI=5 (bug #540800) and fix underlinking with patch by Ted Tanberry + (bug #499718) 05 May 2012; Michał Górny specimen-0.5.2_rc3.ebuild: dev-util/pkgconfig -> virtual/pkgconfig @@ -83,4 +91,3 @@ 29 Jun 2004; Frank van de Pol : New ebuild donated by mikael soderholm , closing bug #55340. - diff --git a/media-sound/specimen/Manifest b/media-sound/specimen/Manifest index 77adb293ffea..953efa1da1ff 100644 --- a/media-sound/specimen/Manifest +++ b/media-sound/specimen/Manifest @@ -1,17 +1,28 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX specimen-0.5.2_rc3-jackmidi.patch 1075 RMD160 1e9281dd1725077a38bed9f18d191a50b51def91 SHA1 7a40c48132b0addf0c48f7029454af7f028498eb SHA256 f97a797b9dde8330e9b781822560fae23169060af046297516c49ed8fd9cf8cf -DIST specimen-0.5.2-rc3.tar.gz 267948 RMD160 845547c3fdd02d9a99cafb7dc9c3ee2bf065a3d3 SHA1 d6c8b51c09ab2ec9c0a180c53088401035560e0a SHA256 249cf434ee81828b46c383dbf6b1873564f227f2461c9956b539be0a3c2feb72 -EBUILD specimen-0.5.2_rc3.ebuild 1242 RMD160 c52eeefd8cd69ac89deb97437eb333b1e00ada95 SHA1 e9e31fa15d6155c7326019cbcce75803ef8d1f31 SHA256 c9890693600c5f34386b18d724376870da5440637ed7b1303b2a4878136f1c36 -MISC ChangeLog 3116 RMD160 29d77ba37a08208cb37f79ae5dcb8d49e514f262 SHA1 43a4e6042fbe9158f83a325aff860c8ff2f7061a SHA256 4e97e5b19d5a58b1f51787c9da5c8d0a9e2d2a06a4fb14f126587d466afdeb27 -MISC metadata.xml 375 RMD160 c13b113856be56b0a8e85484abb96cfec5a5caf4 SHA1 8d2fd5d01a95b48863a454e8a0077fc1a6beaf2b SHA256 e57914851e6aa04e1e6774a1273d66119fec777f82bb34571b69f3d9ea58eaa9 +AUX specimen-0.5.2_rc3-jackmidi.patch 1075 SHA256 f97a797b9dde8330e9b781822560fae23169060af046297516c49ed8fd9cf8cf SHA512 14f223e0f19cf0697529048f60b84324689983e5b2799d235e0257e2fdfe1e2698e2bbe5a32a90c372300f70869f4cd1f460d3731636a3b45f9424e3add3f2e5 WHIRLPOOL 4691cb7e02f6464bd688e11768f7f0888f4e1b813a1e46764e084a23f4ede4c71a0b441b1eea0726d1ac18842e6aa1629a5e2694ce9b589c3f1c69bd752a4d14 +AUX specimen-0.5.2_rc3-underlinking.patch 1880 SHA256 7665335f5c77b5183101c40e264c2d928117b685de7a6314cac76c9fc2d601fc SHA512 0f8dc254ee18f761b6c7c3b03580d7b4b867ad61c753f88e22846494ef3bf1c6495face274152e23d6d335fdf3cf71b2467a25084b023281559ef90ea1dcf030 WHIRLPOOL 0a5d7badacb769086a9f08462df1db69cff59415728ff8151fbb0badf1c941a62a6cb7a7592975646998863c8333fcc4dc2984e07bb2962be94863815d0a7489 +DIST specimen-0.5.2-rc3.tar.gz 267948 SHA256 249cf434ee81828b46c383dbf6b1873564f227f2461c9956b539be0a3c2feb72 SHA512 0fbe298ef9652b8f8535fc4382ec71457c882a7fb05412cb1621e7aa566a293b71f4a2600eaaa4336093ec73b9dd6bb53371565ef0f02d7e400d497718c384f4 WHIRLPOOL dbf93e766280d1f8459f1a08189ebe939c121d89771cab2d5127d8e352d3c143885d371b9c4c468a15b85ffdfa988c781e57671ff33386b757a86799dbda0e81 +EBUILD specimen-0.5.2_rc3-r1.ebuild 1150 SHA256 93615694983bf387cb072fd1083a8c8c254a2f5a91bdb43f7dfd8363a73f6454 SHA512 9be03e5c190e0ecd8f0e7f3653c66726dd6777f963d27a2cf10cc0d4855c2b92b0f6c72327b85fd37a5a9725b2ab10aca8aa323d898d78620a7c0c4eb7f178e5 WHIRLPOOL ea1932a17da44b63ad04ecbaf8c1f99c798070251606190dd8e338cb8751ae44649f31e136479211487257e76d2cb86dbf11a6a3debbb7fc7dfe72c957f530bb +MISC ChangeLog 3408 SHA256 1a1464afece473117f01daad34f2062a10264ffd1f39eab3251152f532450802 SHA512 d169bb96e4c052b2dce41dce38430475e46ebc7f9eba7477106961ebae969b753d4bb3e0ddb0c168353d2caaf0c06f828cf57bcb67fa967455c0b9f0e9b72c58 WHIRLPOOL 28b6faea2a0be367d6c2fde3a7bd531753e71c35b58d652c612bc8f5ddd37877d27da5f0d1f52df85ad167165f79e0e5eb66f5400a485ae50f30a2e843e91bc8 +MISC metadata.xml 375 SHA256 e57914851e6aa04e1e6774a1273d66119fec777f82bb34571b69f3d9ea58eaa9 SHA512 114a1efb18556994372d96af34dae86ec582a95041b51159671c25056aeb03d2c3397b37a2f179f7ba9bdab893f12fbaa05daa5b2e923ba517fff6074eb501da WHIRLPOOL afe033beabfacc60eb137eec5084274f6cd5c88c774f94c824bd2a361e57119c97caf1ac35517c921d5e50b60718ade8eaf310e4d107346f96a22d699ec331ed -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0 -iJwEAQEIAAYFAk+k6pQACgkQfXuS5UK5QB3QUQP/fIRySBIV1sfFmO93r5G3rHn5 -NCRiu2Va3dmRZVTyvLuxKa0UZ6WSN3xhO9wD/79Cs1tRXej5+O0S/bIrSCu7JN5I -6jP1ethROv5HC7CnTSX0ix/bWYDl5D+CA8mozzN8S30XEK+KgO6i0tuB7idQrskr -joWyloyy/rt93HDYKEY= -=7dea +iQJ8BAEBCABmBQJU504ZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ5MTlDREQ0NUU5Mjc4RkU2RjJDNTAyNzU0 +RkRGOUNGRDJGQUM1MTRFAAoJEE/fnP0vrFFOmmQP/iKfN9sXs1/Evi2XBWUXPzG/ +dM9etTdkrKuB8jeIVcwZhT51YYPPAWo5ReEVdmF5D6ES0CyYGK+znMvAjbL56MIV +t9Z1HT2HUO6QdyyAUoslhPQYMZvSLPqo3HyoaLwt9lVNGKW7Pr2cr4cMQ2CkPh7p +Zx0anbL1ZkJH8zq6ZT43xZrBvtgto4E2+GVoSKpOE/ccvH91CgnBDiz7ZslTt04j +RR7h7YzbWVlHVlGlrAiAHGxO++3Qu/wyiYFMbYXtnDJdhrUSCIIgkzb8QPzlRcs2 +m4j2dh7xvXCQR8ImisdfkPNq5zeKtNsnuKmxutA2B6pSWZ3W/d0B2ivH3aGPKHxz +aCIOJFIwTf4Vf/DDJsepYezzYgA7vmP5Xw7DXioR9MI0N+JvfbK4MRsAONPkaYaM +dNa1oveSiUkv1saVMNnTSHq3TAPYFs5Jui8ZFWDzrNCs0+EtB6TxS+bdl8yWtYu6 +1wIYSgOqjEnmBeYR4zTKFdhOpe0MCIdg4QPfZ5WThcjEyqucnDVrBY0x+rZNulr+ +3x0PRx89YOQweQaTim+lU7ow4Kj4GWlAoloZN+GCxWmlnMcOry7MHy7OwZzBkvR8 +wDqbmLVaUiHhJ4itBsadQMbOlT53jYMCJGVAXDig22V7p+2sOgVm29E4G0Muan4I +ahkaGJV8MWb44dP/DVOl +=JkqN -----END PGP SIGNATURE----- diff --git a/media-sound/specimen/files/specimen-0.5.2_rc3-underlinking.patch b/media-sound/specimen/files/specimen-0.5.2_rc3-underlinking.patch new file mode 100644 index 000000000000..6267d7ad572d --- /dev/null +++ b/media-sound/specimen/files/specimen-0.5.2_rc3-underlinking.patch @@ -0,0 +1,79 @@ +--- configure.ac ++++ configure.ac +@@ -1,10 +1,10 @@ + # -*- autoconf -*- + # Process this file with autoconf to produce a configure script. + +-AC_INIT(configure.ac) +-AM_INIT_AUTOMAKE(specimen, 0.5.2-rc3) +-AM_CONFIG_HEADER(src/config.h) +- ++AC_INIT([specimen], [0.5.2-rc3]) ++AC_CONFIG_HEADERS([src/config.h]) ++AM_INIT_AUTOMAKE ++m4_include([acx_pthread.m4]) + + # compilation + with_debug="no" +@@ -13,9 +13,7 @@ + [enable debugging information, accepting a performance penalty (default is NO)])], + [if test x$enable_debug = xyes; then with_debug=yes ; fi]) + +-if test x$with_debug = xno; then +- CFLAGS="-O3" +-else ++if test x$with_debug != xno; then + AC_DEFINE(DEBUG, 1, [[whether to display debugging output or not]]) + fi + +@@ -48,13 +46,14 @@ + AC_FUNC_MALLOC + AC_CHECK_FUNCS([floor gettimeofday pow strchr strdup]) + ++dnl Check for libm for sin() ++AC_SEARCH_LIBS([sin], [m], [], [ ++ AC_MSG_ERROR([unable to find the sin() function]) ++]) ++ + # pthreads + ACX_PTHREAD + +-SPECIMEN_CFLAGS="-Wall -Werror" +-AC_SUBST(SPECIMEN_CFLAGS) +-CFLAGS="$SPECIMEN_CFLAGS $CFLAGS" +- + config_error="no" + + # gtk + +--- src/Makefile.am ++++ src/Makefile.am +@@ -11,7 +11,7 @@ + specimen_SOURCES += lashdriver.c lashdriver.h + endif + +-INCLUDES = \ ++AM_CPPFLAGS = \ + @ALSA_CFLAGS@ \ + @JACK_CFLAGS@ \ + @LIBSAMPLERATE_CFLAGS@ \ + +--- src/gui/Makefile.am ++++ src/gui/Makefile.am +@@ -12,14 +12,14 @@ + paramselector.c paramselector.h patchlist.c patchlist.h midisection.c \ + midisection.h channelsection.c channelsection.h + +-INCLUDES = \ ++AM_CPPFLAGS = \ + -l.. \ + @GTK_CFLAGS@ \ + @LIBGNOMECANVAS_CFLAGS@ \ + @PHAT_CFLAGS@ + + if HAVE_LASH +-INCLUDES += @LASH_CFLAGS@ ++AM_CPPFLAGS += @LASH_CFLAGS@ + endif + + libgui_a_CFLAGS = $(CFLAGS) -I.. -DINSTALLDIR=\"$(datadir)\" diff --git a/media-sound/specimen/specimen-0.5.2_rc3.ebuild b/media-sound/specimen/specimen-0.5.2_rc3-r1.ebuild similarity index 70% rename from media-sound/specimen/specimen-0.5.2_rc3.ebuild rename to media-sound/specimen/specimen-0.5.2_rc3-r1.ebuild index 8aca98ff7cf4..f89648cf9e9b 100644 --- a/media-sound/specimen/specimen-0.5.2_rc3.ebuild +++ b/media-sound/specimen/specimen-0.5.2_rc3-r1.ebuild @@ -1,9 +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/specimen/specimen-0.5.2_rc3.ebuild,v 1.7 2012/05/05 08:52:46 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/specimen/specimen-0.5.2_rc3-r1.ebuild,v 1.1 2015/02/20 15:09:07 yngwin Exp $ -EAPI=1 -inherit eutils +EAPI=5 +inherit autotools eutils MY_P=${P/_/-} @@ -30,20 +30,18 @@ DEPEND="${RDEPEND} S="${WORKDIR}"/${MY_P} -src_unpack() { - unpack ${A} - cd "${S}" - sed -e "s:-Werror::" -e "s:-O3:${CFLAGS}:" -i configure - epatch "${FILESDIR}/${P}-jackmidi.patch" +src_prepare() { + epatch "${FILESDIR}/${P}-jackmidi.patch" \ + "${FILESDIR}/${P}-underlinking.patch" + eautoreconf } -src_compile() { +src_configure() { econf $(use_enable lash) - emake || die "emake failed." } src_install() { - emake DESTDIR="${D}" install || die "emake install failed." + default dodoc AUTHORS BUGS ChangeLog NEWS PROFILE \ README ROADMAP TODO STYLE TODO WISHLIST doicon pixmaps/${PN}.png