summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Bauman <bman@gentoo.org>2020-07-28 14:45:29 -0400
committerAaron Bauman <bman@gentoo.org>2020-07-28 14:45:29 -0400
commit3831172264494f42d621e760593f4d066900d922 (patch)
tree3a31692fd34affb4b8b80d14ac9029f7162213eb /media-gfx
parentupdates/2Q2018: drop slotmove for netmail/getmail (diff)
downloadgentoo-3831172264494f42d621e760593f4d066900d922.tar.gz
gentoo-3831172264494f42d621e760593f4d066900d922.tar.bz2
gentoo-3831172264494f42d621e760593f4d066900d922.zip
*/*: Drop more Py2 last-rited pkgs
Bug: https://bugs.gentoo.org/715966 Closes: https://bugs.gentoo.org/714628 Closes: https://bugs.gentoo.org/606680 Closes: https://bugs.gentoo.org/686238 Closes: https://bugs.gentoo.org/710214 Closes: https://bugs.gentoo.org/710028 Closes: https://bugs.gentoo.org/710032 Closes: https://bugs.gentoo.org/656934 Closes: https://bugs.gentoo.org/592718 Closes: https://bugs.gentoo.org/446122 Closes: https://bugs.gentoo.org/547210 Closes: https://bugs.gentoo.org/359785 Closes: https://bugs.gentoo.org/571396 Closes: https://bugs.gentoo.org/600754 Closes: https://bugs.gentoo.org/677830 Closes: https://bugs.gentoo.org/710716 Closes: https://bugs.gentoo.org/651940 Closes: https://bugs.gentoo.org/695132 Closes: https://bugs.gentoo.org/708978 Closes: https://bugs.gentoo.org/710058 Signed-off-by: Aaron Bauman <bman@gentoo.org>
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/fontypython/Manifest1
-rw-r--r--media-gfx/fontypython/files/0001-Do-not-crash-on-empty-pogs-list.patch21
-rw-r--r--media-gfx/fontypython/files/0002-Removed-unused-code-which-causes-crash-with-wx-3.0.patch134
-rw-r--r--media-gfx/fontypython/files/0003-Adapt-to-wxpython-3.0-which-enforces-assertions-on-L.patch28
-rw-r--r--media-gfx/fontypython/files/fontypython-pillow.patch41
-rw-r--r--media-gfx/fontypython/fontypython-0.4.4-r3.ebuild38
-rw-r--r--media-gfx/fontypython/metadata.xml8
-rw-r--r--media-gfx/fr0st/Manifest1
-rw-r--r--media-gfx/fr0st/files/fr0st-1.4-colour.patch9
-rw-r--r--media-gfx/fr0st/fr0st-1.4-r2.ebuild57
-rw-r--r--media-gfx/fr0st/metadata.xml8
11 files changed, 0 insertions, 346 deletions
diff --git a/media-gfx/fontypython/Manifest b/media-gfx/fontypython/Manifest
deleted file mode 100644
index 9500d7555f6c..000000000000
--- a/media-gfx/fontypython/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST fontypython-0.4.4.tar.gz 361335 BLAKE2B 9e9f3f0e3b67509851fbf0c061af5754991d4087d7f4a5b9ec0ca176690c4f0125fab82546cdbddd39e0d1f2b4631396628df7c9d09a0dabadd9f3f2651bce6c SHA512 a89c654c9dcd8fc89d3ad91772f856d2d2570a96b3b60f52eed9db217f45e91a55f3044f0e4d1736c5402cde3a6598a353ae59285c892e80034f7baba15f9825
diff --git a/media-gfx/fontypython/files/0001-Do-not-crash-on-empty-pogs-list.patch b/media-gfx/fontypython/files/0001-Do-not-crash-on-empty-pogs-list.patch
deleted file mode 100644
index b652053596c6..000000000000
--- a/media-gfx/fontypython/files/0001-Do-not-crash-on-empty-pogs-list.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Pietro Battiston <me@pietrobattiston.it>
-Date: Sun, 21 Dec 2014 11:50:28 +0100
-Subject: Do not crash on empty pogs list
-
----
- fontypythonmodules/gui_PogChooser.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/fontypythonmodules/gui_PogChooser.py b/fontypythonmodules/gui_PogChooser.py
-index 94b7f2e..f233529 100644
---- a/fontypythonmodules/gui_PogChooser.py
-+++ b/fontypythonmodules/gui_PogChooser.py
-@@ -80,7 +80,7 @@ class PogChooser(wx.ListCtrl) :
- i = self.FindItem(-1, select)
- self.indexselected = i # Set this to help initial icon settings.
- self.Select(i, True)
-- else:
-+ elif self.__poglistCopy:
- self.Select(0, False)
- self.indexselected = -1
-
diff --git a/media-gfx/fontypython/files/0002-Removed-unused-code-which-causes-crash-with-wx-3.0.patch b/media-gfx/fontypython/files/0002-Removed-unused-code-which-causes-crash-with-wx-3.0.patch
deleted file mode 100644
index e6f8fb634e83..000000000000
--- a/media-gfx/fontypython/files/0002-Removed-unused-code-which-causes-crash-with-wx-3.0.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From: Pietro Battiston <me@pietrobattiston.it>
-Date: Sun, 21 Dec 2014 09:14:19 +0100
-Subject: Removed unused code which causes crash with wx 3.0
-
----
- fontypython | 2 --
- fontypythonmodules/dialogues.py | 4 ----
- fontypythonmodules/gui_Left.py | 4 ----
- fontypythonmodules/gui_Middle.py | 5 -----
- fontypythonmodules/gui_PogChooser.py | 4 ----
- fontypythonmodules/gui_Right.py | 4 ----
- fontypythonmodules/gui_ScrolledFontView.py | 4 ----
- fontypythonmodules/wxgui.py | 4 ----
- 8 files changed, 31 deletions(-)
-
-diff --git a/fontypython b/fontypython
-index a05290f..e46e34e 100755
---- a/fontypython
-+++ b/fontypython
-@@ -72,8 +72,6 @@ else: # err code -11
-
- ## Setup wxPython to access translations : enables the stock buttons.
- localedir = "fontypythonmodules/locales"
-- langid = wx.LANGUAGE_DEFAULT
-- mylocale = wx.Locale( langid )
-
- iPC = PC.PathControl()
-
-diff --git a/fontypythonmodules/dialogues.py b/fontypythonmodules/dialogues.py
-index 1fbff5f..eba7ab3 100644
---- a/fontypythonmodules/dialogues.py
-+++ b/fontypythonmodules/dialogues.py
-@@ -23,10 +23,6 @@ import wx
- import wx.html as html
-
-
--## Setup wxPython to access translations : enables the stock buttons.
--langid = wx.LANGUAGE_DEFAULT # Picks this up from $LANG
--mylocale = wx.Locale( langid )
--
- ## langcode = locale.getlocale()[0] # I must not use getlocale...
- ## This is suggested by Martin:
- loc = locale.setlocale(locale.LC_CTYPE) # use *one* of the categories (not LC_ALL)
-diff --git a/fontypythonmodules/gui_Left.py b/fontypythonmodules/gui_Left.py
-index 5451f39..7b1f0c6 100644
---- a/fontypythonmodules/gui_Left.py
-+++ b/fontypythonmodules/gui_Left.py
-@@ -17,10 +17,6 @@
-
- import wx, os
-
--## Setup wxPython to access translations : enables the stock buttons.
--langid = wx.LANGUAGE_DEFAULT # Picks this up from $LANG
--mylocale = wx.Locale( langid )
--
-
- from pubsub import *
- from wxgui import ps
-diff --git a/fontypythonmodules/gui_Middle.py b/fontypythonmodules/gui_Middle.py
-index 470e3ea..9af3f9f 100644
---- a/fontypythonmodules/gui_Middle.py
-+++ b/fontypythonmodules/gui_Middle.py
-@@ -19,11 +19,6 @@ import wx
- import wx.lib.stattext
- import wx.lib.buttons as buttons
-
--## Setup wxPython to access translations : enables the stock buttons.
--langid = wx.LANGUAGE_DEFAULT # Picks this up from $LANG
--mylocale = wx.Locale( langid )
--
--
- from pubsub import *
- from wxgui import ps
-
-diff --git a/fontypythonmodules/gui_PogChooser.py b/fontypythonmodules/gui_PogChooser.py
-index f233529..c679191 100644
---- a/fontypythonmodules/gui_PogChooser.py
-+++ b/fontypythonmodules/gui_PogChooser.py
-@@ -17,10 +17,6 @@
-
- import wx, locale
-
--## Setup wxPython to access translations : enables the stock buttons.
--langid = wx.LANGUAGE_DEFAULT # Picks this up from $LANG
--mylocale = wx.Locale( langid )
--
- from pubsub import *
- from wxgui import ps
-
-diff --git a/fontypythonmodules/gui_Right.py b/fontypythonmodules/gui_Right.py
-index adefa1d..ea5062b 100644
---- a/fontypythonmodules/gui_Right.py
-+++ b/fontypythonmodules/gui_Right.py
-@@ -17,10 +17,6 @@
-
- import wx
-
--## Setup wxPython to access translations : enables the stock buttons.
--langid = wx.LANGUAGE_DEFAULT # Picks this up from $LANG
--mylocale = wx.Locale( langid )
--
- from pubsub import *
- from wxgui import ps
-
-diff --git a/fontypythonmodules/gui_ScrolledFontView.py b/fontypythonmodules/gui_ScrolledFontView.py
-index d7b3d2f..3e35d62 100644
---- a/fontypythonmodules/gui_ScrolledFontView.py
-+++ b/fontypythonmodules/gui_ScrolledFontView.py
-@@ -20,10 +20,6 @@ import wx.lib.scrolledpanel
-
- from pubsub import *
-
--## Setup wxPython to access translations : enables the stock buttons.
--langid = wx.LANGUAGE_DEFAULT # Picks this up from $LANG
--mylocale = wx.Locale( langid )
--
- import fpsys # Global objects
-
- from gui_Fitmap import * #Also brings in 'ps' variable
-diff --git a/fontypythonmodules/wxgui.py b/fontypythonmodules/wxgui.py
-index da80d17..6e6716a 100644
---- a/fontypythonmodules/wxgui.py
-+++ b/fontypythonmodules/wxgui.py
-@@ -23,10 +23,6 @@ import fpversion
- ## Now, bring in all those big modules
- import wx
-
--## Setup wxPython to access translations : enables the stock buttons.
--langid = wx.LANGUAGE_DEFAULT # Picks this up from $LANG
--mylocale = wx.Locale( langid )
--
- ## Fetch my own pubsub stuff
- from pubsub import *
- ps = CPubsub()
diff --git a/media-gfx/fontypython/files/0003-Adapt-to-wxpython-3.0-which-enforces-assertions-on-L.patch b/media-gfx/fontypython/files/0003-Adapt-to-wxpython-3.0-which-enforces-assertions-on-L.patch
deleted file mode 100644
index 4875a15ff050..000000000000
--- a/media-gfx/fontypython/files/0003-Adapt-to-wxpython-3.0-which-enforces-assertions-on-L.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Pietro Battiston <me@pietrobattiston.it>
-Date: Sun, 21 Dec 2014 11:50:09 +0100
-Subject: Adapt to wxpython 3.0, which enforces assertions on ListItems ids.
-
----
- fontypythonmodules/gui_PogChooser.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/fontypythonmodules/gui_PogChooser.py b/fontypythonmodules/gui_PogChooser.py
-index c679191..4cdf772 100644
---- a/fontypythonmodules/gui_PogChooser.py
-+++ b/fontypythonmodules/gui_PogChooser.py
-@@ -200,6 +200,7 @@ class PogChooser(wx.ListCtrl) :
- li.SetImage(i)
- li.SetText(p)
- id = wx.NewId()
-+ li.SetId(id)
- PogChooser.__poglistCopy[id] = p # record the pog name
- row = self.InsertItem( li )
- self.SetItemData( row, id ) # associate back to __poglistCopy
-@@ -214,6 +215,7 @@ class PogChooser(wx.ListCtrl) :
- li.SetImage(0)
- li.SetText(pogname)
- id = wx.NewId()
-+ li.SetId(id)
- self.__poglistCopy[id] = pogname
- row = self.InsertItem(li)
- self.SetItemData( row, id )
diff --git a/media-gfx/fontypython/files/fontypython-pillow.patch b/media-gfx/fontypython/files/fontypython-pillow.patch
deleted file mode 100644
index 9b7966f55061..000000000000
--- a/media-gfx/fontypython/files/fontypython-pillow.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=471524
-
-diff --git a/fontypythonmodules/fontcontrol.py b/fontypythonmodules/fontcontrol.py
-index e156758..cff34f5 100644
---- a/fontypythonmodules/fontcontrol.py
-+++ b/fontypythonmodules/fontcontrol.py
-@@ -16,7 +16,7 @@
- ## along with Fonty Python. If not, see <http://www.gnu.org/licenses/>.
-
- import os, sys, locale, glob, errno
--import Image, ImageFont, ImageDraw
-+from PIL import Image, ImageFont, ImageDraw
- import fontybugs, fpsys
- from pathcontrol import *
-
-diff --git a/fontypythonmodules/fpsys.py b/fontypythonmodules/fpsys.py
-index f9572ae..fa1a98f 100644
---- a/fontypythonmodules/fpsys.py
-+++ b/fontypythonmodules/fpsys.py
-@@ -159,7 +159,7 @@ def checkFonts( dirtocheck, printer ):
- global segfonts
-
- code = """
--import ImageFont
-+from PIL import ImageFont
- try:
- font=ImageFont.truetype("%s", 24, 0)
- dud=font.getname()
-diff --git a/fontypythonmodules/sanitycheck.py b/fontypythonmodules/sanitycheck.py
-index cf4fcc1..7e46e9a 100644
---- a/fontypythonmodules/sanitycheck.py
-+++ b/fontypythonmodules/sanitycheck.py
-@@ -24,7 +24,7 @@ import imp
-
- ## PIL : Is it there?
- try:
-- import Image, ImageFont, ImageDraw
-+ from PIL import Image, ImageFont, ImageDraw
- except:
- print strings.PILError
- raise SystemExit
diff --git a/media-gfx/fontypython/fontypython-0.4.4-r3.ebuild b/media-gfx/fontypython/fontypython-0.4.4-r3.ebuild
deleted file mode 100644
index ca9ebc36f3c3..000000000000
--- a/media-gfx/fontypython/fontypython-0.4.4-r3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-WX_GTK_VER=3.0
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 multilib wxwidgets
-
-DESCRIPTION="Font preview application"
-HOMEPAGE="https://savannah.nongnu.org/projects/fontypython"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# Crashes w/ debug build of wxGTK (#201315)
-DEPEND="dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/wxpython:${WX_GTK_VER}[${PYTHON_USEDEP}]
- x11-libs/wxGTK:${WX_GTK_VER}[-debug]"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-pillow.patch"
- "${FILESDIR}"/0001-Do-not-crash-on-empty-pogs-list.patch
- "${FILESDIR}"/0002-Removed-unused-code-which-causes-crash-with-wx-3.0.patch
- "${FILESDIR}"/0003-Adapt-to-wxpython-3.0-which-enforces-assertions-on-L.patch )
-
-src_prepare() {
- distutils-r1_src_prepare
- need-wxwidgets unicode
-}
-
-src_install() {
- distutils-r1_src_install
- doman "${S}"/fontypython.1
-}
diff --git a/media-gfx/fontypython/metadata.xml b/media-gfx/fontypython/metadata.xml
deleted file mode 100644
index cc081897d48c..000000000000
--- a/media-gfx/fontypython/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>fonts@gentoo.org</email>
- <name>Fonts</name>
- </maintainer>
-</pkgmetadata>
diff --git a/media-gfx/fr0st/Manifest b/media-gfx/fr0st/Manifest
deleted file mode 100644
index 74904a76c4fb..000000000000
--- a/media-gfx/fr0st/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST fr0st-1.4-src.tgz 1535978 BLAKE2B 1d1700665f6747d0665594e255d8604b1fad576aae21b73a435aa95174ef199bce0fe6d436ee3f5072fe5474657995533675bf7c9b16e6787523b1db4bb189d6 SHA512 d4ececca724bef264097466328e98699efbf82d999107a1ed8b21b938fd5025b888197f021ac56c7fb008226f0230bd058cb94efec61bb59d67f2263d3140ec5
diff --git a/media-gfx/fr0st/files/fr0st-1.4-colour.patch b/media-gfx/fr0st/files/fr0st-1.4-colour.patch
deleted file mode 100644
index 9fb17aadaab7..000000000000
--- a/media-gfx/fr0st/files/fr0st-1.4-colour.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- fr0stlib/gui/canvas.py~ 2011-05-14 19:58:25.000000000 +0200
-+++ fr0stlib/gui/canvas.py 2016-02-20 17:47:25.853322560 +0100
-@@ -79,7 +79,7 @@
-
- def SetBrush(self, FillColor, FillStyle):
- r,g,b = FillColor
-- c = wx.Color(r,g,b, self.Opacity)
-+ c = wx.Colour(r,g,b, self.Opacity)
- self.Brush = wx.Brush(c)
diff --git a/media-gfx/fr0st/fr0st-1.4-r2.ebuild b/media-gfx/fr0st/fr0st-1.4-r2.ebuild
deleted file mode 100644
index 2e138ef92e15..000000000000
--- a/media-gfx/fr0st/fr0st-1.4-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-WX_GTK_VER="3.0"
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils multilib python-single-r1 wxwidgets
-
-DESCRIPTION="A fractal flame editor"
-HOMEPAGE="https://fr0st.wordpress.com/"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}.0/+download/${P}-src.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- dev-python/wxpython:${WX_GTK_VER}
- >=media-gfx/flam3-3.0.1
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}-src"
-
-pkg_setup() {
- fr0st_libdir="/usr/$(get_libdir)/fr0st"
- fr0st_sharedir="/usr/share/fr0st"
-
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-colour.patch #564106
- python_fix_shebang .
- need-wxwidgets unicode
-}
-
-src_install() {
- insinto "${fr0st_sharedir}"
- doins -r icons samples
-
- insinto "${fr0st_libdir}"
- doins -r fr0stlib
-
- exeinto "${fr0st_libdir}"
- doexe fr0st.py
-
- dosym "${fr0st_libdir}"/fr0st.py /usr/bin/fr0st
- dosym "${fr0st_sharedir}"/icons/fr0st.png /usr/share/pixmaps/fr0st.png
-
- make_desktop_entry fr0st fr0st
-
- dodoc changelog.txt
-}
diff --git a/media-gfx/fr0st/metadata.xml b/media-gfx/fr0st/metadata.xml
deleted file mode 100644
index d8b5cf01c15e..000000000000
--- a/media-gfx/fr0st/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="launchpad">fr0st</remote-id>
- </upstream>
-</pkgmetadata>