Removed obsolete stuff
This commit is contained in:
parent
50c0c74cb0
commit
b241ecf526
@ -1,4 +0,0 @@
|
|||||||
AUX pytzdata-2020.1-system-zoneinfo.patch 3482 BLAKE2B 26c62593303e02d4037aba6e7b4ec7645610f3e73eadef9fcf483db5567e31d407efe92859d4157e672ce9683d135c2fcf2e63d427898d8bab1b0ead8db09299 SHA512 707afdd4bff5fb70f3bc4e20c88a1962f3fd56c15b3ff3e5896446d1eff55aaceefd53509fef1b4941d797e2c2aea41b72a87276fa64e562ad71609fa717a78e
|
|
||||||
DIST tzdata-2022.1.tar.gz 178166 BLAKE2B baefa7e5591c6790d68786eb01cd1107ae055e731757e94ce7aea3c4efabe334782759850af4921de553b33f3c2713951e992fa1b7ca63a9756cbeb5820c1e5e SHA512 2f495955dd14d0b064f8e9d49e589bf3c75d0753f2cf55819fe86317acb1ec041a22692ed94ed3c9a7f680c0f046c095c2059de3a1901fbb12258a44bdc13e8b
|
|
||||||
EBUILD tzdata-2022.1.ebuild 495 BLAKE2B 19a49fcfedb8fdf8493d712f772647ecc2154e55f0a28fa37e90370afd3d853661b09d574a94356701e0cc344d91e261c16af733fd49bfb3f3bd12b7449b763f SHA512 cd263f1d1296d25ebb06cc672b24fd45e83e6e806258f939ebf36f9d306bf7390011c74432ac149e3c18ed2c1e05991953e43542800e8feaae180543d1413b54
|
|
||||||
MISC metadata.xml 414 BLAKE2B 4b6e7f935a42ed815b92d7fec75b4db6fd3fa46386b5055462bb317bb6ac8526e3a965c803d6e207382ec396bc132d514ef083af91c9ac45ad2eaf67998b0b9e SHA512 80c0e415716770a0f18bd237e9039f72bdab0056c11e98ad2359431b14d0b239ae7a88840d774aa6d3b390fbc86bcf30e42a4981e52acda8e99666219982f445
|
|
||||||
@ -1,115 +0,0 @@
|
|||||||
From f0d2c5fd28dbe2aa9ecb59e140ab42b11d677a33 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
|
|
||||||
Date: Fri, 9 Jul 2021 10:15:51 +0200
|
|
||||||
Subject: [PATCH] Use system zoneinfo database by default
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Signed-off-by: Michał Górny <mgorny@gentoo.org>
|
|
||||||
---
|
|
||||||
pytzdata/__init__.py | 2 +-
|
|
||||||
tests/test_set_directory.py | 8 +++-----
|
|
||||||
tests/test_tz_file.py | 5 ++---
|
|
||||||
tests/test_tz_path.py | 5 ++---
|
|
||||||
4 files changed, 8 insertions(+), 12 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/pytzdata/__init__.py b/pytzdata/__init__.py
|
|
||||||
index 22940da..6c3bcb9 100644
|
|
||||||
--- a/pytzdata/__init__.py
|
|
||||||
+++ b/pytzdata/__init__.py
|
|
||||||
@@ -8,7 +8,7 @@ from ._compat import FileNotFoundError
|
|
||||||
|
|
||||||
|
|
||||||
DEFAULT_DIRECTORY = os.path.join(
|
|
||||||
- os.path.dirname(__file__),
|
|
||||||
+ '/usr/share',
|
|
||||||
'zoneinfo'
|
|
||||||
)
|
|
||||||
|
|
||||||
diff --git a/tests/test_set_directory.py b/tests/test_set_directory.py
|
|
||||||
index 430d239..6c078e6 100644
|
|
||||||
--- a/tests/test_set_directory.py
|
|
||||||
+++ b/tests/test_set_directory.py
|
|
||||||
@@ -2,7 +2,7 @@
|
|
||||||
|
|
||||||
import os
|
|
||||||
import pytest
|
|
||||||
-from pytzdata import set_directory, tz_path, TimezoneNotFound
|
|
||||||
+from pytzdata import set_directory, tz_path, TimezoneNotFound, DEFAULT_DIRECTORY
|
|
||||||
|
|
||||||
|
|
||||||
fixtures_path = os.path.join(os.path.dirname(__file__), 'fixtures', 'tz')
|
|
||||||
@@ -30,9 +30,8 @@ def test_set_directory():
|
|
||||||
with pytest.raises(TimezoneNotFound):
|
|
||||||
tz_path('America/New_York')
|
|
||||||
|
|
||||||
- here = os.path.realpath(os.path.dirname(__file__))
|
|
||||||
filepath = os.path.realpath(
|
|
||||||
- os.path.join(here, '..', 'pytzdata', 'zoneinfo', 'America', 'New_York')
|
|
||||||
+ os.path.join(DEFAULT_DIRECTORY, 'America', 'New_York')
|
|
||||||
)
|
|
||||||
|
|
||||||
set_directory()
|
|
||||||
@@ -51,9 +50,8 @@ def test_env_variable():
|
|
||||||
|
|
||||||
del os.environ['PYTZDATA_TZDATADIR']
|
|
||||||
|
|
||||||
- here = os.path.realpath(os.path.dirname(__file__))
|
|
||||||
filepath = os.path.realpath(
|
|
||||||
- os.path.join(here, '..', 'pytzdata', 'zoneinfo', 'America', 'New_York')
|
|
||||||
+ os.path.join(DEFAULT_DIRECTORY, 'America', 'New_York')
|
|
||||||
)
|
|
||||||
|
|
||||||
set_directory()
|
|
||||||
diff --git a/tests/test_tz_file.py b/tests/test_tz_file.py
|
|
||||||
index 8b912b5..b20c08b 100644
|
|
||||||
--- a/tests/test_tz_file.py
|
|
||||||
+++ b/tests/test_tz_file.py
|
|
||||||
@@ -3,7 +3,7 @@
|
|
||||||
import os
|
|
||||||
import pytest
|
|
||||||
|
|
||||||
-from pytzdata import tz_file, set_directory
|
|
||||||
+from pytzdata import tz_file, set_directory, DEFAULT_DIRECTORY
|
|
||||||
from pytzdata.exceptions import TimezoneNotFound
|
|
||||||
|
|
||||||
|
|
||||||
@@ -22,9 +22,8 @@ def teardown_module(module):
|
|
||||||
|
|
||||||
|
|
||||||
def test_tz_file():
|
|
||||||
- here = os.path.realpath(os.path.dirname(__file__))
|
|
||||||
filepath = os.path.realpath(
|
|
||||||
- os.path.join(here, '..', 'pytzdata', 'zoneinfo', 'Europe', 'Paris')
|
|
||||||
+ os.path.join(DEFAULT_DIRECTORY, 'Europe', 'Paris')
|
|
||||||
)
|
|
||||||
|
|
||||||
with open(filepath) as f1:
|
|
||||||
diff --git a/tests/test_tz_path.py b/tests/test_tz_path.py
|
|
||||||
index fd4db48..77c8c74 100644
|
|
||||||
--- a/tests/test_tz_path.py
|
|
||||||
+++ b/tests/test_tz_path.py
|
|
||||||
@@ -3,7 +3,7 @@
|
|
||||||
import os
|
|
||||||
import pytest
|
|
||||||
|
|
||||||
-from pytzdata import tz_path, set_directory
|
|
||||||
+from pytzdata import tz_path, set_directory, DEFAULT_DIRECTORY
|
|
||||||
from pytzdata.exceptions import TimezoneNotFound
|
|
||||||
|
|
||||||
|
|
||||||
@@ -22,9 +22,8 @@ def teardown_module(module):
|
|
||||||
|
|
||||||
|
|
||||||
def test_tz_path():
|
|
||||||
- here = os.path.realpath(os.path.dirname(__file__))
|
|
||||||
filepath = os.path.realpath(
|
|
||||||
- os.path.join(here, '..', 'pytzdata', 'zoneinfo', 'Europe', 'Paris')
|
|
||||||
+ os.path.join(DEFAULT_DIRECTORY, 'Europe', 'Paris')
|
|
||||||
)
|
|
||||||
|
|
||||||
assert filepath == tz_path('Europe/Paris')
|
|
||||||
--
|
|
||||||
2.32.0
|
|
||||||
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
|
||||||
<pkgmetadata>
|
|
||||||
<maintainer type="person">
|
|
||||||
<email>jsmolic@gentoo.org</email>
|
|
||||||
<name>Jakov Smolić</name>
|
|
||||||
</maintainer>
|
|
||||||
<stabilize-allarches/>
|
|
||||||
<upstream>
|
|
||||||
<remote-id type="github">sdispater/pytzdata</remote-id>
|
|
||||||
<remote-id type="pypi">pytzdata</remote-id>
|
|
||||||
</upstream>
|
|
||||||
</pkgmetadata>
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
# Copyright 2022 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=8
|
|
||||||
|
|
||||||
DISTUTILS_USE_SETUPTOOLS=pyproject.toml
|
|
||||||
PYTHON_COMPAT=( python3_{8..10} )
|
|
||||||
inherit distutils-r1
|
|
||||||
|
|
||||||
DESCRIPTION="Python package wrapping the IANA time zone database"
|
|
||||||
HOMEPAGE="https://github.com/python/tzdata"
|
|
||||||
SRC_URI="https://github.com/python/tzdata/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
|
||||||
LICENSE="Apache-2.0"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
|
|
||||||
|
|
||||||
distutils_enable_tests pytest
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
DIST turbovnc-3.0beta1.tar.gz 8619273 BLAKE2B 87f78c7e0f13d6f651505dac9a61fcba5aa85e810a5e5fd10fd11b804c08300c6348582122d3dc66f86aeae45eebefb03f50d55f3bda058dc3d290fe9cdad81e SHA512 6865a8bc987bbd43acbd51e3cf6058ca9c02191d28e462b2ba60c82fb718625ee196bcc067dda1fca2d1e1ccaee40408a3b2a4a2050ae75217e5af43bd3a8189
|
|
||||||
EBUILD turbovnc-3.0_beta1.ebuild 2249 BLAKE2B 551d6c1fafb2e0cf8067b151e44804e91b681a2c0f22298116678ca1c0469177ba5068b1466fac56cd56cf9fe06a0836233a8483ccc7c21ba4057c92001eef6a SHA512 ceea4716a5bb08942b6cadf14bcd5e0045e60be4377a901295cbbffd3d42a593c362f6348dfda93b441c1988c34d53b59e5317df121f57ebf2135fe636ebc72d
|
|
||||||
MISC metadata.xml 784 BLAKE2B 55a8bba421a15da5ed9401949b8e056b9c376030875bac0b28dece1a71f50c07010949bf82792129db82df98068061959a80c31093c8e91afb94cbdee0b2f020 SHA512 1e15fc8d88a46e7027eec5cdb8f8f7d6973f2ff1ea586ba6cf2d46a6d09050c6ba0ba94eaa9f59a8624a9885b8b25ec7a2977f1f4d71c02517bd8f681c05bec9
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
|
||||||
<pkgmetadata>
|
|
||||||
<maintainer type="person" proxied="yes">
|
|
||||||
<email>ceamac.paragon@gmail.com</email>
|
|
||||||
<name>Viorel Munteanu</name>
|
|
||||||
</maintainer>
|
|
||||||
<maintainer type="person">
|
|
||||||
<email>sam@gentoo.org</email>
|
|
||||||
<name>Sam James</name>
|
|
||||||
</maintainer>
|
|
||||||
<maintainer type="project" proxied="proxy">
|
|
||||||
<email>proxy-maint@gentoo.org</email>
|
|
||||||
<name>Proxy Maintainers</name>
|
|
||||||
</maintainer>
|
|
||||||
<longdescription>
|
|
||||||
TurboVNC is a derivative of VNC (Virtual Network Computing) that is tuned to provide peak performance for 3D and video workloads.
|
|
||||||
By The VirtualGL Project.
|
|
||||||
</longdescription>
|
|
||||||
<upstream>
|
|
||||||
<remote-id type="github">TurboVNC/turbovnc</remote-id>
|
|
||||||
</upstream>
|
|
||||||
</pkgmetadata>
|
|
||||||
@ -1,108 +0,0 @@
|
|||||||
# Copyright 1999-2021 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=7
|
|
||||||
|
|
||||||
inherit desktop cmake java-pkg-opt-2
|
|
||||||
|
|
||||||
MY_PV=${PV/_/}
|
|
||||||
MY_P=${PN}-${MY_PV}
|
|
||||||
|
|
||||||
DESCRIPTION="A fast replacement for TigerVNC"
|
|
||||||
HOMEPAGE="https://www.turbovnc.org/"
|
|
||||||
SRC_URI="https://github.com/TurboVNC/${PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
|
|
||||||
|
|
||||||
LICENSE="GPL-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~amd64"
|
|
||||||
IUSE="gnutls +ssl"
|
|
||||||
|
|
||||||
DEPEND="
|
|
||||||
app-arch/bzip2
|
|
||||||
media-libs/freetype
|
|
||||||
>=media-libs/libjpeg-turbo-2.0.0[java?]
|
|
||||||
sys-libs/zlib
|
|
||||||
virtual/jdk:1.8
|
|
||||||
virtual/opengl
|
|
||||||
x11-libs/libfontenc
|
|
||||||
x11-libs/libX11
|
|
||||||
x11-libs/libXau
|
|
||||||
x11-libs/libXdmcp
|
|
||||||
x11-libs/libXext
|
|
||||||
x11-libs/libXfont2
|
|
||||||
x11-libs/libxkbfile
|
|
||||||
x11-libs/pixman
|
|
||||||
ssl? (
|
|
||||||
!gnutls? ( dev-libs/openssl:= )
|
|
||||||
gnutls? ( net-libs/gnutls:= )
|
|
||||||
)
|
|
||||||
!net-misc/tigervnc
|
|
||||||
"
|
|
||||||
RDEPEND="
|
|
||||||
${DEPEND}
|
|
||||||
x11-apps/xkbcomp
|
|
||||||
"
|
|
||||||
|
|
||||||
S="${WORKDIR}/${MY_P}"
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
use java && java-pkg-opt-2_src_prepare
|
|
||||||
cmake_src_prepare
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
local mycmakeargs=(
|
|
||||||
-DTVNC_SYSTEMX11=ON
|
|
||||||
-DTVNC_SYSTEMLIBS=ON
|
|
||||||
-DTVNC_BUILDJAVA=$(usex java)
|
|
||||||
-DTVNC_BUILDNATIVE=ON
|
|
||||||
-DXKB_BIN_DIRECTORY=/usr/bin
|
|
||||||
-DXKB_DFLT_RULES=base
|
|
||||||
)
|
|
||||||
|
|
||||||
if use ssl ; then
|
|
||||||
# We prefer OpenSSL, so default to that if SSL is enabled
|
|
||||||
if use gnutls ; then
|
|
||||||
mycmakeargs+=( -DTVNC_USETLS=GnuTLS )
|
|
||||||
else
|
|
||||||
# Link properly against OpenSSL to ensure
|
|
||||||
# we catch e.g. ABI change
|
|
||||||
# (i.e. don't dlopen it)
|
|
||||||
mycmakeargs+=(
|
|
||||||
-DTVNC_USETLS=OpenSSL
|
|
||||||
-DTVNC_DLOPENSSL=OFF
|
|
||||||
)
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
mycmakeargs+=( -DTVNC_USETLS=OFF )
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use java ; then
|
|
||||||
export JAVACFLAGS="$(java-pkg_javac-args)"
|
|
||||||
export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
|
|
||||||
|
|
||||||
mycmakeargs+=(
|
|
||||||
-DTJPEG_JAR="${EPREFIX}/usr/share/java/turbojpeg.jar"
|
|
||||||
-DTJPEG_JNILIBRARY="${EPREFIX}/usr/$(get_libdir)/libturbojpeg.so"
|
|
||||||
)
|
|
||||||
fi
|
|
||||||
|
|
||||||
cmake_src_configure
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
cmake_src_install
|
|
||||||
|
|
||||||
if use java ; then
|
|
||||||
java-pkg_dojar "${BUILD_DIR}"/java/VncViewer.jar
|
|
||||||
make_desktop_entry vncviewer "TurboVNC Viewer" /usr/share/icons/hicolor/48x48/apps/${PN}.png
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Don't install incompatible init script
|
|
||||||
rm -rf "${ED}"/etc/init.d/ || die
|
|
||||||
rm -rf "${ED}"/etc/sysconfig/ || die
|
|
||||||
|
|
||||||
find "${ED}"/usr/share/man/man1/ -name Xserver.1\* -print0 | xargs -0 rm || die
|
|
||||||
|
|
||||||
einstalldocs
|
|
||||||
}
|
|
||||||
Loading…
x
Reference in New Issue
Block a user