From 1236b85c223c61dd90fa806ac82fdb51196dfe89 Mon Sep 17 00:00:00 2001 From: Micha Glave Date: Tue, 2 Feb 2021 08:54:12 +0100 Subject: [PATCH] cleanup obsolete ebuilds. --- dev-python/genshi/Manifest | 3 - .../files/ticket566-genshi-0.6.x-r1238.diff | 41 ---- dev-python/genshi/genshi-0.7.ebuild | 44 ---- dev-python/glue/Manifest | 2 - dev-python/glue/glue-0.9.4.ebuild | 21 -- sci-geosciences/mapserver/Manifest | 3 - .../mapserver-7.0.0-no-applicable-code.patch | 34 --- .../mapserver/mapserver-7.4.2.ebuild | 219 ------------------ 8 files changed, 367 deletions(-) delete mode 100644 dev-python/genshi/Manifest delete mode 100644 dev-python/genshi/files/ticket566-genshi-0.6.x-r1238.diff delete mode 100644 dev-python/genshi/genshi-0.7.ebuild delete mode 100644 dev-python/glue/Manifest delete mode 100644 dev-python/glue/glue-0.9.4.ebuild delete mode 100644 sci-geosciences/mapserver/Manifest delete mode 100644 sci-geosciences/mapserver/files/mapserver-7.0.0-no-applicable-code.patch delete mode 100644 sci-geosciences/mapserver/mapserver-7.4.2.ebuild diff --git a/dev-python/genshi/Manifest b/dev-python/genshi/Manifest deleted file mode 100644 index d05ff43..0000000 --- a/dev-python/genshi/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -AUX ticket566-genshi-0.6.x-r1238.diff 1537 SHA256 c58e53c7b2d6183512d83a7f98bf413dc7ac627d4485ce33a5cec37db4eb5390 SHA512 ec22d941d03ecab9f6cc08baf15fa46e36c99e42600c51e9d6d530ad58a29a2105d2fe653185cf9b7d62759a17c61eeaef49d221149e0a39ad23a2b2818c035a WHIRLPOOL e063e94e681fb757f16e8d52982535e2af9d3d61c72a1e4c7c92a9eaec541eabce7eca7f9f17b5371057054f23fa748140443b83b51cef8d81864dceb2bab634 -DIST Genshi-0.7.tar.gz 491579 SHA256 1d154402e68bc444a55bcac101f96cb4e59373100cc7a2da07fbf3e5cc5d7352 SHA512 2d0042d4da4566725ddd80b73c5b7be09f479f5529e4aa69903edc2a98905ff6de42a0d5a6f02986d7962deb7740c4a3acf6955a8b77fdb42d3cf4ca037de6bf WHIRLPOOL 5e1a7af061d28a581c8a028ae7343a2b80697eb8bca01c8609345a3f2146db190a596d3488c0bde5aa132ac930d591ff1babd033ccb532c7cac7d2931751f906 -EBUILD genshi-0.7.ebuild 973 SHA256 7bc6a89b1335fefe0fad8f4b5cddba5e24fc2b531396a573a97f75f867f48459 SHA512 686460a114b1e2322d2670f01804202e08fbd70401de26ed4c2a8de726afc480ae8d851df8bcc9e8bf08cd49c7a1913f7d1720c0975b47b66794a016fb32c068 WHIRLPOOL 6edb001637a00107449bda1a2ca8c46a75fa0b4e091b209be631164cc8b4aad358aba3fb96ac288cc38e8253b26f971de56cc893c6b320938e91f34c3fff0eb1 diff --git a/dev-python/genshi/files/ticket566-genshi-0.6.x-r1238.diff b/dev-python/genshi/files/ticket566-genshi-0.6.x-r1238.diff deleted file mode 100644 index 6d1cad7..0000000 --- a/dev-python/genshi/files/ticket566-genshi-0.6.x-r1238.diff +++ /dev/null @@ -1,41 +0,0 @@ -Index: genshi/filters/i18n.py -=================================================================== ---- genshi/filters/i18n.py (revision 1238) -+++ genshi/filters/i18n.py (working copy) -@@ -1041,7 +1041,11 @@ - - while parts: - order, string = parts.pop(0) -- events = self.events[order].pop(0) -+ events = self.events[order] -+ if events: -+ events = events.pop(0) -+ else: -+ events = [(None, -1, -1)] - parts_counter[order].pop() - - for event in events: -Index: genshi/filters/tests/i18n.py -=================================================================== ---- genshi/filters/tests/i18n.py (revision 1238) -+++ genshi/filters/tests/i18n.py (working copy) -@@ -906,7 +906,19 @@ - """

""", - tmpl.generate(first="FIRST", second="SECOND").render()) - -+ def test_translate_i18n_msg_ticket_404_regression(self): -+ tmpl = MarkupTemplate(""" -+

text $name

-+ """) -+ gettext = lambda s: u'head [1:%(name)s] tail' -+ translator = Translator(gettext) -+ translator.setup(tmpl) -+ self.assertEqual(""" -+

head NAME tail

-+ """, tmpl.generate(name='NAME').render()) - -+ - class ChooseDirectiveTestCase(unittest.TestCase): - - def test_translate_i18n_choose_as_attribute(self): diff --git a/dev-python/genshi/genshi-0.7.ebuild b/dev-python/genshi/genshi-0.7.ebuild deleted file mode 100644 index 8b696b2..0000000 --- a/dev-python/genshi/genshi-0.7.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) - -inherit distutils-r1 - -MY_P="Genshi-${PV}" - -DESCRIPTION="Python toolkit for stream-based generation of output for the web." -HOMEPAGE="http://genshi.edgewall.org/ https://pypi.python.org/pypi/Genshi" -SRC_URI="http://ftp.edgewall.com/pub/genshi/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" -IUSE="doc examples" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - epatch "${FILESDIR}/ticket566-genshi-0.6.x-r1238.diff" -} - -python_test() { - "${PYTHON}" setup.py test -} - -python_install_all() { - if use doc; then - dodoc doc/*.txt - dohtml -r doc/* - fi - if use examples; then - insinto /usr/share/doc/${PF} - doins -r examples - fi - distutils-r1_python_install_all -} diff --git a/dev-python/glue/Manifest b/dev-python/glue/Manifest deleted file mode 100644 index 0106729..0000000 --- a/dev-python/glue/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST glue-0.9.4.tar.gz 293425 SHA256 40b5b8ac5a495c17ceac99688de01ea38f2cb4a0729d90ede494a4adf54bd3d7 SHA512 97383daa814546d5a328b0225b9a397d2e01cb8ca563ef859fccc9825ed8de45320644053cba8af396130e0da07884468b779f13dfe3e68b59fe44821cc896c1 WHIRLPOOL 0290b82181fe4f656c172370ba4465c9c5a95ef465a560f8c574ef867eaedd0f86c7567e7c927d3c97f4233a0506ab3f1be440a77535df1382087c2aac176ed1 -EBUILD glue-0.9.4.ebuild 578 SHA256 10e4c421a532cffe5d05389f61c897da6a7a41161331ca12e800444a51a73ee8 SHA512 d93d88a951d75a3af367e80a2f9323c607dfa2f7254b3ee590e3c7151e72665630abe66abfb25348169957c77c48de51a59c82c9bbd799f2a05f024b42cc81a0 WHIRLPOOL 0e321aad6857ec74cead5ce5ec04bba905a81d868ab2a209b8afd000191a6b5a7576459a5f1882e0eb71261421b911ddf096ce92c8c64e57d8bf7de858073f7b diff --git a/dev-python/glue/glue-0.9.4.ebuild b/dev-python/glue/glue-0.9.4.ebuild deleted file mode 100644 index e053c1b..0000000 --- a/dev-python/glue/glue-0.9.4.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/PyPDF2/PyPDF2-1.24.ebuild,v 1.3 2015/03/08 23:38:15 pacho Exp $ - -EAPI="5" -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -DESCRIPTION="Glue is a simple command line tool to generate sprites" -HOMEPAGE="http://glue.readthedocs.org" -SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/pillow - dev-python/jinja" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="amd64 x86" - diff --git a/sci-geosciences/mapserver/Manifest b/sci-geosciences/mapserver/Manifest deleted file mode 100644 index 9734bc4..0000000 --- a/sci-geosciences/mapserver/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -AUX mapserver-7.0.0-no-applicable-code.patch 812 BLAKE2B b3946628fc518dd37111e6f2293391fb6ddca7ba7ceb019a764c528d3c6e450e3ef5941fa2201995b40efe39e63c78c14a4e321f49f96c811541a99e90e83a71 SHA512 dab7c98095791b369c52d10e6737ac65f60ff7e02b8fcb5bceb2440025fa0552a936a16593aaa66b35434db0659184b667cc54962274510b062690029778a44c -DIST mapserver-7.4.2.tar.gz 2688497 BLAKE2B 36c13931c19546495ca9bb78c19a926a41c1b8405bbc4b48afebb817ee104a262f1a18c915f3dfd6251b46c399827de583d18c9583f76fd060c27aaee53ced9a SHA512 b1de8849f710c57fa3c48b42138ac0528b9b37a9f45df2ed86c85c6ae434073f7c6b584d16283b8a03a9ca18d4592366b02f4fafced9d3bda35fe672fffdfbf4 -EBUILD mapserver-7.4.2.ebuild 4992 BLAKE2B 3b5318b5862b82cfb1e232f3e98995b2da993587de120e30830bf2988b3764f6e70541847a35ce1fd1bbbc5e5b9ccd7724095726906b0751782be5ef1dbdb696 SHA512 af8ffa363cae5ac8b63cd5fa51499f4cec0a65b05fb535e36003bbca5f4efac6cafb71c97bb19ae03807e00048dcdbb9468a35f182758be769cfb759bb69f941 diff --git a/sci-geosciences/mapserver/files/mapserver-7.0.0-no-applicable-code.patch b/sci-geosciences/mapserver/files/mapserver-7.0.0-no-applicable-code.patch deleted file mode 100644 index f438bec..0000000 --- a/sci-geosciences/mapserver/files/mapserver-7.0.0-no-applicable-code.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/mapwfs11.c b/mapwfs11.c -index 20ab164..4dc15fc 100755 ---- a/mapwfs11.c -+++ b/mapwfs11.c -@@ -29,12 +29,12 @@ - - #include "mapserver.h" - #include "mapows.h" -+#include "mapowscommon.h" - - - - #if defined(USE_WFS_SVR) && defined(USE_LIBXML2) - #include "maplibxml2.h" --#include "mapowscommon.h" - #include "mapogcfilter.h" - - /************************************************************************/ -diff --git a/mapwfs20.c b/mapwfs20.c -index 710d444..cf69ee3 100755 ---- a/mapwfs20.c -+++ b/mapwfs20.c -@@ -29,10 +29,10 @@ - - #include "mapserver.h" - #include "mapows.h" -+#include "mapowscommon.h" - - #if defined(USE_WFS_SVR) && defined(USE_LIBXML2) - #include "maplibxml2.h" --#include "mapowscommon.h" - #include "mapogcfilter.h" - - #define MS_OWS_11_NAMESPACE_PREFIX MS_OWSCOMMON_OWS_NAMESPACE_PREFIX diff --git a/sci-geosciences/mapserver/mapserver-7.4.2.ebuild b/sci-geosciences/mapserver/mapserver-7.4.2.ebuild deleted file mode 100644 index 100ef05..0000000 --- a/sci-geosciences/mapserver/mapserver-7.4.2.ebuild +++ /dev/null @@ -1,219 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_P="${PN}-${PV/_/-}" - -PHP_EXT_OPTIONAL_USE="php" -PHP_EXT_NAME="php_mapscript" -PHP_EXT_S="${WORKDIR}/${MY_P}/mapscript/php/" -PHP_EXT_SKIP_PHPIZE="no" -USE_PHP="php5-6" - -PYTHON_COMPAT=( python2_7 ) - -#USE_RUBY="ruby18 ruby19" -#RUBY_OPTIONAL="yes" - -WEBAPP_MANUAL_SLOT=yes -WEBAPP_OPTIONAL=yes - -inherit cmake-utils depend.apache distutils-r1 eutils flag-o-matic multilib perl-module php-ext-source-r3 webapp # ruby-ng - -DESCRIPTION="Development environment for building spatially enabled webapps" -HOMEPAGE="https://mapserver.org/" -SRC_URI="https://download.osgeo.org/mapserver/${MY_P}.tar.gz" - -LICENSE="MIT" -KEYWORDS="~amd64 ~x86" -SLOT="0" -# force default gdal and proj if not cause compilation problem -IUSE="apache bidi cairo fastcgi +gdal geos mysql opengl oracle perl php postgis +proj python svg threads tiff xml xslt" # ruby php tcl - -REQUIRED_USE=" - php? ( php_targets_php5-6 ) - xslt? ( xml )" - -RDEPEND=" - dev-libs/expat - >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib] - media-libs/giflib - net-misc/curl - virtual/jpeg:= - virtual/libiconv - x11-libs/agg - fastcgi? ( dev-libs/fcgi ) - apache? ( app-admin/webapp-config ) - bidi? ( dev-libs/fribidi - media-libs/harfbuzz ) - cairo? ( x11-libs/cairo ) - gdal? ( - sci-libs/gdal:=[oracle?] - dev-libs/protobuf-c - ) - geos? ( sci-libs/geos ) - mysql? ( virtual/mysql ) - opengl? ( - media-libs/ftgl - media-libs/mesa[X(+)] - ) - oracle? ( - dev-db/oracle-instantclient:= - ) - perl? ( dev-lang/perl:= ) - postgis? ( dev-db/postgis ) - proj? ( sci-libs/proj net-misc/curl ) - tiff? ( - media-libs/tiff:= - sci-libs/libgeotiff - ) - xml? ( dev-libs/libxml2:2 ) - xslt? ( dev-libs/libxslt[crypt] ) -" -DEPEND="${RDEPEND} - perl? ( >=dev-lang/swig-2.0 ) - python? ( >=dev-lang/swig-2.0 )" - -want_apache2 apache - -PATCHES=( - "${FILESDIR}/${PN}-7.0.0-no-applicable-code.patch" -) - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - if use apache ; then - webapp_pkg_setup - fi - use perl && perl_set_version - #use ruby && ruby-ng_pkg_setup -} - -src_unpack() { - default - # HACK: Make symlinks for php targets - local slot - for slot in $(php_get_slots); do - ln -s "${PHP_EXT_S}" "${WORKDIR}/${slot}" || die - done -} - -src_prepare() { - local glibdir="${EPREFIX}/usr/include/glib-2.0" - local usrglibdir="${EPREFIX}/usr/$(get_libdir)/glib-2.0/include" - - sed -e "s:^include_directories(:&${glibdir})\ninclude_directories(:" \ - -i "${S}/CMakeLists.txt" || die - sed -e "s:include_directories(:&${usrglibdir})\ninclude_directories(:" \ - -i "${S}/CMakeLists.txt" || die - - # For enable compilation with proj-6 - if use proj ; then - append-cppflags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1 - fi - - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - "-DCMAKE_SKIP_RPATH=ON" - "-DWITH_SDE=OFF" - "-DWITH_ICONV=ON" - "-DWITH_GD=ON" - "-DWITH_GIF=ON" - "-DWITH_CURL=ON" - "-DINSTALL_LIB_DIR=${ROOT}usr/$(get_libdir)" - "-DWITH_APACHE_MODULE=$(usex apache ON OFF)" - "-DWITH_PROJ=$(usex proj ON OFF)" - "-DWITH_WMS=$(usex proj ON OFF)" - "-DWITH_KML=$(usex xml ON OFF)" - "-DWITH_FCGI=$(usex fastcgi ON OFF)" - "-DWITH_GEOS=$(usex geos ON OFF)" - "-DWITH_GDAL=$(usex gdal ON OFF)" - "-DWITH_OGR=$(usex gdal ON OFF)" - "-DWITH_ORACLESPATIAL=$(usex oracle ON OFF)" - "-DWITH_POSTGIS=$(usex postgis ON OFF)" - "-DWITH_MYSQL=$(usex mysql ON OFF)" - "-DWITH_LIBXML2=$(usex xml ON OFF)" - "-DWITH_XMLMAPFILE=$(usex xslt ON OFF)" - "-DWITH_FRIBIDI=$(usex bidi ON OFF)" - "-DWITH_HARFBUZZ=$(usex bidi ON OFF)" - "-DWITH_CAIRO=$(usex cairo ON OFF)" - "-DWITH_SVGCAIRO=$(usex svg OFF ON)" - "-DWITH_RSVG=$(usex svg ON OFF)" - "-DWITH_PHP=$(usex php ON OFF)" - "-DWITH_PYTHON=$(usex python ON OFF)" - "-DWITH_PERL=$(usex perl ON OFF)" - "-DWITH_PROTOBUFC=$(usex gdal ON OFF)" - ) - - if use gdal && use proj ; then - mycmakeargs+=( "-DWITH_WFS=ON" - "-DWITH_WCS=ON" - "-DWITH_CLIENT_WMS=ON" - "-DWITH_CLIENT_WFS=ON" - "-DWITH_SOS=$(usex xml ON OFF)" - ) - else - mycmakeargs+=( "-DWITH_WFS=OFF" - "-DWITH_WCS=OFF" - "-DWITH_CLIENT_WMS=OFF" - "-DWITH_CLIENT_WFS=OFF" - "-DWITH_SOS=OFF" - ) - fi - - if use php ; then - local slot - for slot in $(php_get_slots); do - local php_config="${EPREFIX}/usr/$(get_libdir)/${slot}/bin/php-config" - [[ -x ${php_config} ]] \ - || die "php-config '${php_config}' not valid or not executable" - - local php_include_dir=$(${php_config} --include-dir) - [[ -d ${php_include_dir} ]] || die "PHP Include dir not found or not valid" - - mycmakeargs+=( - -DPHP5_CONFIG_EXECUTABLE="${php_config}" - -DPHP5_INCLUDES="${php_include_dir}" - ) - done - fi - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - if use apache ; then - webapp_src_preinst - fi - - cmake-utils_src_install - - if use php ; then - php-ext-source-r3_createinifiles - fi - - if use apache ; then - webapp_src_install - fi -} - -pkg_postinst() { - if use apache ; then - webapp_pkg_postinst - fi -} - -pkg_prerm() { - if use apache ; then - webapp_pkg_prerm - fi -}