Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/distro-info/, profiles/
Date: Thu, 30 Jun 2022 22:25:17
Message-Id: 1656627860.6a18f4bf82d69546a4242768aafb61bbc8392a2a.sam@gentoo
1 commit: 6a18f4bf82d69546a4242768aafb61bbc8392a2a
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 30 22:24:12 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 30 22:24:20 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a18f4bf
7
8 dev-util/distro-info: treeclean
9
10 Bug: https://bugs.gentoo.org/845936
11 Bug: https://bugs.gentoo.org/786585
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13
14 dev-util/distro-info/Manifest | 1 -
15 dev-util/distro-info/distro-info-1.0.ebuild | 95 -----------------------------
16 dev-util/distro-info/metadata.xml | 5 --
17 profiles/package.mask | 1 -
18 4 files changed, 102 deletions(-)
19
20 diff --git a/dev-util/distro-info/Manifest b/dev-util/distro-info/Manifest
21 deleted file mode 100644
22 index e5fcd4eef0da..000000000000
23 --- a/dev-util/distro-info/Manifest
24 +++ /dev/null
25 @@ -1 +0,0 @@
26 -DIST distro-info_1.0.tar.xz 30908 BLAKE2B 8355e54919d83d09d3eb7983a35151f0e4253c62eefeccf4d1e614cef0bb7cecf466007c7789749c145674aa30324423f9977a26695d5de537f80d5eb069f371 SHA512 2d84b5845ff4e7ce8059fe83e9d64a380d6732e0e85bc889c948068579d27a86fd31f8e6b7d8cc256f4ff4631cd0ffd480835bf290452d3bc28469f5b3be9ddb
27
28 diff --git a/dev-util/distro-info/distro-info-1.0.ebuild b/dev-util/distro-info/distro-info-1.0.ebuild
29 deleted file mode 100644
30 index 6c2ccc45598a..000000000000
31 --- a/dev-util/distro-info/distro-info-1.0.ebuild
32 +++ /dev/null
33 @@ -1,95 +0,0 @@
34 -# Copyright 1999-2022 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=7
38 -
39 -PYTHON_COMPAT=( python3_{7,8,9} )
40 -DISTUTILS_OPTIONAL=true
41 -
42 -inherit distutils-r1
43 -
44 -DESCRIPTION="Provides information about the Debian distributions' releases"
45 -HOMEPAGE="https://debian.org"
46 -SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
47 -
48 -LICENSE="ISC"
49 -SLOT="0"
50 -KEYWORDS="amd64 ~riscv x86"
51 -IUSE="python test"
52 -RESTRICT="!test? ( test )"
53 -
54 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
55 -
56 -COMMON_DEPEND="dev-lang/perl:=
57 - python? ( ${PYTHON_DEPS} )"
58 -DEPEND="${COMMON_DEPEND}
59 - python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
60 - test? (
61 - dev-util/distro-info-data
62 - dev-util/shunit2
63 - dev-python/pylint[${PYTHON_USEDEP}]
64 - )"
65 -RDEPEND="${COMMON_DEPEND}
66 - dev-util/distro-info-data"
67 -
68 -src_prepare() {
69 - default
70 -
71 - # 1. Gentoo do not provides dpkg vendor information
72 - # 2. Strip *FLAGS
73 - # 3. Strip predefined CFLAGS
74 - # 4. Point to correct perl's vendorlib
75 - # 5. Remove python tests - python eclass will be used instead
76 - sed -e "/cd python && python/d" \
77 - -e "/VENDOR/d" \
78 - -e "/dpkg-buildflags/d" \
79 - -e "s/-g -O2//g" \
80 - -e "s:\$(PREFIX)/share/perl5/Debian:\$(PERL_VENDORLIB)/Debian:g" \
81 - -e "/pyversions/d" \
82 - -i "${S}"/Makefile || die
83 -}
84 -
85 -src_configure() {
86 - default
87 -
88 - if use python; then
89 - pushd ./python > /dev/null || die
90 - distutils-r1_src_configure
91 - popd > /dev/null || die
92 - fi
93 -}
94 -
95 -src_compile() {
96 - default
97 -
98 - if use python; then
99 - pushd ./python > /dev/null || die
100 - distutils-r1_src_compile
101 - popd > /dev/null || die
102 - fi
103 -}
104 -
105 -src_install() {
106 - emake PERL_VENDORLIB=$(perl -e 'require Config; print "$Config::Config{'vendorlib'}\n";' || die) \
107 - DESTDIR="${D}" install
108 -
109 - if use python; then
110 - pushd ./python > /dev/null || die
111 - distutils-r1_src_install
112 - popd > /dev/null || die
113 - fi
114 -}
115 -
116 -src_test() {
117 - TZ=UTC default
118 -
119 - if use python; then
120 - python_test() {
121 - esetup.py test
122 - }
123 -
124 - pushd ./python > /dev/null || die
125 - distutils-r1_src_test
126 - popd > /dev/null || die
127 - fi
128 -}
129
130 diff --git a/dev-util/distro-info/metadata.xml b/dev-util/distro-info/metadata.xml
131 deleted file mode 100644
132 index 85e4ed814fa2..000000000000
133 --- a/dev-util/distro-info/metadata.xml
134 +++ /dev/null
135 @@ -1,5 +0,0 @@
136 -<?xml version="1.0" encoding="UTF-8"?>
137 -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
138 -<pkgmetadata>
139 -<!-- maintainer-needed -->
140 -</pkgmetadata>
141
142 diff --git a/profiles/package.mask b/profiles/package.mask
143 index 1cc368e244cf..f132973fab41 100644
144 --- a/profiles/package.mask
145 +++ b/profiles/package.mask
146 @@ -250,7 +250,6 @@ dev-python/chai
147 # Bugs #818847, #845936, #786585.
148 # Removal on 2022-06-30.
149 dev-util/dput-ng
150 -dev-util/distro-info
151
152 # Matt Turner <mattst88@g.o> (2022-05-30)
153 # libwacom-2 broke ABI compatibility; reverse dependencies need to be updated.