From a1392efe64137262023d92492396ca9156d22396 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 13 Sep 2019 17:45:37 +0100 Subject: gentoo resync : 13.09.2019 --- media-gfx/mypaint/Manifest | 5 -- .../files/mypaint-1.1.0-build-env-vars.patch | 53 -------------- .../mypaint/files/mypaint-1.1.0-desktop.patch | 24 ------ .../mypaint/files/mypaint-1.1.0-json-c-0.11.patch | 15 ---- media-gfx/mypaint/mypaint-1.1.0-r2.ebuild | 85 ---------------------- 5 files changed, 182 deletions(-) delete mode 100644 media-gfx/mypaint/files/mypaint-1.1.0-build-env-vars.patch delete mode 100644 media-gfx/mypaint/files/mypaint-1.1.0-desktop.patch delete mode 100644 media-gfx/mypaint/files/mypaint-1.1.0-json-c-0.11.patch delete mode 100644 media-gfx/mypaint/mypaint-1.1.0-r2.ebuild (limited to 'media-gfx/mypaint') diff --git a/media-gfx/mypaint/Manifest b/media-gfx/mypaint/Manifest index 9cb8f384520c..754b62999fb2 100644 --- a/media-gfx/mypaint/Manifest +++ b/media-gfx/mypaint/Manifest @@ -1,8 +1,3 @@ -AUX mypaint-1.1.0-build-env-vars.patch 1812 BLAKE2B 4af7b90bdcd19dafd712631abe8282d9092caf55ea964511888c299188e28f952c3990feb6ce26f83dd327568ce315801dbdbcd3a3b0df3036f7027704a1be0d SHA512 336a9c838ac9e51f929f9727008feab8251ab9defd106d7161fe5d5b5150460573c66873b88f202d616e4668d3bf272b8dc8305e367ef7c450620b6a48330fe9 -AUX mypaint-1.1.0-desktop.patch 626 BLAKE2B efe635fc8c58d91935be0491c5847a69da1bd78b8a83e9e6ff110d1d69c17dbde91a36f9a2baa5fc97b8a0d81ee47759e040e319a5ca7f43fa6626228a61c425 SHA512 77f267ad6a12b6d18fa955b5b9f8ef3a3eb6fed832745eda4db539d75c49056bb7fd6474ee904e6ac7cab12ae286beb48617e4825b826ca77a439764873e8d75 -AUX mypaint-1.1.0-json-c-0.11.patch 403 BLAKE2B 1608cb7706d85cb84284cc58bb78921c063bf1e1d04d32eb11c7abdc61e3d03eabbe014f66f9c43f13ff8b0a583f900c85fe24fc17bdf4cf3c7ff0ebaccaf37b SHA512 554d0f0cc8c9cb4a48b1f9c57532247461e9705ad819c52f2e264ea238783fe60728af3e51e01667dc0c60883375727624811a48d1603436ad9970282a682605 -DIST mypaint-1.1.0.tar.bz2 37416388 BLAKE2B 4ced9087a51b855ad943d104801d06a03a6f78dfd39eba975cbdeddd304c12ffb0ccd48267fcf31f3608acc069b88bc3f07ed2ab750d77eb31bd64df2f6492a9 SHA512 a3eef378ddcaa0a33f9afc49cc587489ecfff6f3e46e2238aab83f89d682f2407e2760e6029eaac3591f0a8955c95280c12839adcb42ec452cefbcdb142ab9b9 DIST mypaint-1.2.1.tar.xz 37897196 BLAKE2B 2d8f6b03f710febae1c2d617a6e542543786be384585ae8a973604da2eba8a0fb770d185aa3d2dfc6f794adf29ffb9c217356a96ab27d677ebb57816f62fae9c SHA512 1783765e495b9535669a83a29d27ba684e6201fdfe0875bdd2c167b1dab8af05993b19025767fe0b2770ed9e578e4709f75d8a4820ac945812cba85609f9eb9b -EBUILD mypaint-1.1.0-r2.ebuild 1927 BLAKE2B e0d4354567a619e5d259fcb50820186fc8b6f4f6f7108c0676059da9a3065830b504b68a2f9e575032fb30e0b5b6e8e71de23d4e4f778cc28bb0d8e3220282ae SHA512 356a6bef73fb283b0e7953be068bdd8feec0d92a3e06a1fdf0fbe1d80fe6225a777cf95c6ae198afa40269bad9d25f8762c9ac318a8b2e4a3763912b40127477 EBUILD mypaint-1.2.1-r3.ebuild 1838 BLAKE2B 142ff5c4619f973055f9db2fab1535ec6f7be72e64876a94b657f850f4dd23678c1f51ba43f60a128e660c6382f9f24c48f14015f356913a703f318c922cb73d SHA512 85dbdf683e5f415e89f1199f44220f708ba75f177aee0c1272b18b7871d32f74723e1846ac200f390deb274154ba3b5b625bb2cec5314f49e2c80e8dd84e1a74 MISC metadata.xml 247 BLAKE2B 3a8d267e6befd2f46c41982b7196470f32b4fcf5dc6a42ead10b13e81bdcb7975ea998a51d0deb2c3c1a49f00b5f9216d8e43ad7e6dd0aea0f3352b19532d0a0 SHA512 21b957bb801d29dfed1d0aeceac553c9ba039a7fe94ebf899e7ab5c3316bbad116c7bd63a07ccbbb8277d2ce19f27b964499d2ccd942028290519e465e989dbb diff --git a/media-gfx/mypaint/files/mypaint-1.1.0-build-env-vars.patch b/media-gfx/mypaint/files/mypaint-1.1.0-build-env-vars.patch deleted file mode 100644 index 7d7ac3e36359..000000000000 --- a/media-gfx/mypaint/files/mypaint-1.1.0-build-env-vars.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 516d184b5db8ebdd8b184ef871050c3ab3f03fdf Mon Sep 17 00:00:00 2001 -From: Andrew Chadwick -Date: Sun, 21 Apr 2013 22:51:05 +0100 -Subject: [PATCH] SConstruct: support standard build environ vars - -Support the standard build environment vars CC, CXX, CFLAGS, CXXFLAGS, -CPPFLAGS, and LDFLAGS everywhere. - -Partially addresses https://gna.org/bugs/?20754 ---- - SConstruct | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) - -diff --git a/SConstruct b/SConstruct -index 0b55da1..ef39b9e 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -1,6 +1,7 @@ - import os, sys - from os.path import join, basename - from SCons.Script.SConscript import SConsEnvironment -+import SCons.Util - - EnsureSConsVersion(1, 0) - -@@ -45,6 +46,24 @@ print('using %r (use scons python_config=xxx to change)' % env['python_config']) - if sys.platform == "win32": - # remove this mingw if trying VisualStudio - env = Environment(tools=tools + ['mingw'], ENV=os.environ, options=opts) -+ -+# Respect some standard build environment stuff -+if os.environ.has_key('CC'): -+ env['CC'] = os.environ['CC'] -+if os.environ.has_key('CFLAGS'): -+ env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS']) -+if os.environ.has_key('CXX'): -+ env['CXX'] = os.environ['CXX'] -+if os.environ.has_key('CXXFLAGS'): -+ env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS']) -+if os.environ.has_key('CPPFLAGS'): -+ env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CPPFLAGS']) -+ env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CPPFLAGS']) -+if os.environ.has_key('LDFLAGS'): -+ env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS']) -+if "$CCFLAGS" in env['CXXCOM']: -+ env['CXXCOM'] = env['CXXCOM'].replace("$CCFLAGS","") -+ - opts.Update(env) - - env.Append(CXXFLAGS=' -Wall -Wno-sign-compare -Wno-write-strings') --- -1.7.10.4 - diff --git a/media-gfx/mypaint/files/mypaint-1.1.0-desktop.patch b/media-gfx/mypaint/files/mypaint-1.1.0-desktop.patch deleted file mode 100644 index b992131bf29e..000000000000 --- a/media-gfx/mypaint/files/mypaint-1.1.0-desktop.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Andrew Chadwick -Date: Tue, 8 Jan 2013 13:53:01 +0000 -Subject: desktop: remove deprecated Encoding key - -The Encoding key is deprecated as of 1.0 of the Desktop Entry Specification -(8 Jan 2012) - -http://standards.freedesktop.org/desktop-entry-spec/1.0/apc.html ---- - desktop/mypaint.desktop | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/desktop/mypaint.desktop b/desktop/mypaint.desktop -index 9850b54..24383db 100644 ---- a/desktop/mypaint.desktop -+++ b/desktop/mypaint.desktop -@@ -1,6 +1,5 @@ - [Desktop Entry] - Version=1.0 --Encoding=UTF-8 - Name=MyPaint - TryExec=mypaint - Exec=mypaint %f --- diff --git a/media-gfx/mypaint/files/mypaint-1.1.0-json-c-0.11.patch b/media-gfx/mypaint/files/mypaint-1.1.0-json-c-0.11.patch deleted file mode 100644 index f2aa9b9a0edf..000000000000 --- a/media-gfx/mypaint/files/mypaint-1.1.0-json-c-0.11.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=467322 -Patch-by: Helmut Jarausch -Fixes pkgconfig name for new json-c (since 0.11) - ---- brushlib/SConscript.ORIG 2012-12-31 18:03:38.000000000 +0100 -+++ brushlib/SConscript 2013-04-26 11:47:27.008232199 +0200 -@@ -73,7 +73,7 @@ - - env.Append(CPPPATH='./') - --pkg_deps = ['json'] -+pkg_deps = ['json-c'] - libs = ['m'] - linkflags = [] - diff --git a/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild b/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild deleted file mode 100644 index 8c81ae609842..000000000000 --- a/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit fdo-mime gnome2-utils multilib scons-utils toolchain-funcs python-single-r1 - -DESCRIPTION="fast and easy graphics application for digital painters" -HOMEPAGE="http://mypaint.intilinux.com/" -SRC_URI="http://download.gna.org/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -LANGS="cs de en_CA en_GB es fr hu id it ja ko nb nn_NO pl pt_BR ro ru sl sv uk zh_CN zh_TW" - -RDEPEND=" - dev-python/pygtk:2[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - >=dev-python/pycairo-1.4[${PYTHON_USEDEP}] - dev-python/protobuf-python[${PYTHON_USEDEP}] - >=dev-libs/json-c-0.11:= - media-libs/lcms:2 - media-libs/libpng:0= - ${PYTHON_DEPS} -" -DEPEND="${RDEPEND} - dev-lang/swig - virtual/pkgconfig" - -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_prepare() { - # multilib support - sed -i -e "s:lib\/${PN}:$(get_libdir)\/${PN}:" \ - SConstruct SConscript || die - # respect CXXFLAGS,CXX,LDFLAGS - epatch "${FILESDIR}"/${P}-build-env-vars.patch - # fix mypaint.desktop - epatch "${FILESDIR}"/${P}-desktop.patch - # pkgconfig patch for json-c-0.11. 467322 - epatch "${FILESDIR}"/${P}-json-c-0.11.patch -} - -src_compile() { - #workaround scons bug with locales. Bug #352700 - export LANG="en_US.UTF-8" - tc-export CC CXX - escons -} - -src_install () { - escons prefix="${D}/usr" install - newicon pixmaps/${PN}_logo.png ${PN}.png - for x in ${LANGS}; do - if ! has ${x} ${LINGUAS}; then - rm -rf "${ED}"/usr/share/locale/${x} || die - fi - done - - python_optimize "${D}"usr/share/${PN} - # not used and broken - rm -rf "${ED}"/usr/{include/,lib/libmypaint.a,lib/pkgconfig/} || die -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update -} -- cgit v1.2.3