Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, app-arch/ipkg-utils/files/, app-arch/ipkg-utils/
Date: Wed, 02 Sep 2020 08:10:37
Message-Id: 1599034041.713a629970503c021fa878557f75738cb9ccb127.mgorny@gentoo
1 commit: 713a629970503c021fa878557f75738cb9ccb127
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 2 08:07:01 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 2 08:07:21 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=713a6299
7
8 app-arch/ipkg-utils: Remove last-rited pkg
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 app-arch/ipkg-utils/Manifest | 1 -
13 .../files/ipkg-utils-1.7.050831-hashlib-r2.patch | 25 --------
14 .../ipkg-utils/ipkg-utils-1.7.050831-r3.ebuild | 66 ----------------------
15 app-arch/ipkg-utils/metadata.xml | 12 ----
16 profiles/package.mask | 6 --
17 5 files changed, 110 deletions(-)
18
19 diff --git a/app-arch/ipkg-utils/Manifest b/app-arch/ipkg-utils/Manifest
20 deleted file mode 100644
21 index 18c1fcd9005..00000000000
22 --- a/app-arch/ipkg-utils/Manifest
23 +++ /dev/null
24 @@ -1 +0,0 @@
25 -DIST ipkg-utils-050831.tar.gz 29175 BLAKE2B 4f1d4b5efb7f808e6987a7b62f830463e28fca998c49b4d6683a58c2d2225e24820e6f2b47642e5cceafa34e0ab3ff8172267ef734bbbf1c8f94b8777172efc8 SHA512 7375c4815225eb755699954d3005dfa88bc0f0e6c2678b7bad565f63204a32735d483dbef23e7b9b75c5f0428ff04c13744b8a10e68bb69fedb96a59c069e1aa
26
27 diff --git a/app-arch/ipkg-utils/files/ipkg-utils-1.7.050831-hashlib-r2.patch b/app-arch/ipkg-utils/files/ipkg-utils-1.7.050831-hashlib-r2.patch
28 deleted file mode 100644
29 index 3cdd35bd81c..00000000000
30 --- a/app-arch/ipkg-utils/files/ipkg-utils-1.7.050831-hashlib-r2.patch
31 +++ /dev/null
32 @@ -1,25 +0,0 @@
33 -diff --git i/ipkg.py w/ipkg.py
34 -index 02aab22..145686c 100644
35 ---- i/ipkg.py
36 -+++ w/ipkg.py
37 -@@ -36,10 +36,10 @@ import tempfile
38 - import os
39 - import sys
40 - import glob
41 --import md5
42 - import re
43 - import string
44 - import commands
45 -+from hashlib import md5
46 - from stat import ST_SIZE
47 -
48 - class Version:
49 -@@ -136,7 +136,7 @@ class Package:
50 -
51 - # compute the MD5.
52 - f = open(fn, "r")
53 -- sum = md5.new()
54 -+ sum = md5()
55 - while 1:
56 - data = f.read(1024)
57 - if not data: break
58
59 diff --git a/app-arch/ipkg-utils/ipkg-utils-1.7.050831-r3.ebuild b/app-arch/ipkg-utils/ipkg-utils-1.7.050831-r3.ebuild
60 deleted file mode 100644
61 index 649d7001ed2..00000000000
62 --- a/app-arch/ipkg-utils/ipkg-utils-1.7.050831-r3.ebuild
63 +++ /dev/null
64 @@ -1,66 +0,0 @@
65 -# Copyright 1999-2017 Gentoo Foundation
66 -# Distributed under the terms of the GNU General Public License v2
67 -
68 -EAPI=6
69 -
70 -PYTHON_COMPAT=( python2_7 )
71 -
72 -inherit distutils-r1 eutils toolchain-funcs versionator
73 -
74 -MY_P="${PN}-$(get_version_component_range 3)"
75 -
76 -DESCRIPTION="Tools for working with the ipkg binary package format"
77 -HOMEPAGE="http://www.openembedded.org/"
78 -SRC_URI="http://handhelds.org/download/packages/ipkg-utils/${MY_P}.tar.gz"
79 -
80 -LICENSE="GPL-2"
81 -SLOT="0"
82 -KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~x86"
83 -IUSE="minimal"
84 -
85 -DEPEND="
86 - !minimal? (
87 - app-crypt/gnupg
88 - net-misc/curl
89 - )"
90 -RDEPEND="${DEPEND}"
91 -
92 -S="${WORKDIR}/${MY_P}"
93 -
94 -PATCHES=("${FILESDIR}/${P}-hashlib-r2.patch")
95 -
96 -src_prepare() {
97 - default
98 -
99 - sed '/python setup.py build/d' -i Makefile
100 -
101 - if use minimal; then
102 - elog "ipkg-upload is not installed when the \`minimal' USE flag is set. If you"
103 - elog "need ipkg-upload then rebuild this package without the \`minimal' USE flag."
104 - fi
105 -}
106 -
107 -src_compile() {
108 - distutils-r1_src_compile
109 - emake CC="$(tc-getCC)"
110 -}
111 -
112 -python_install() {
113 - distutils-r1_python_install
114 -
115 - if use minimal; then
116 - rm "${ED}usr/bin/ipkg-upload" \
117 - "${D}$(python_get_scriptdir)/ipkg-upload" || die
118 - fi
119 -}
120 -
121 -src_install() {
122 - distutils-r1_src_install
123 -
124 - dobin ipkg-compare-versions
125 -}
126 -
127 -pkg_postinst() {
128 - elog "Consider installing sys-apps/fakeroot for use with the ipkg-build "
129 - elog "command, that makes it possible to build packages as a normal user."
130 -}
131
132 diff --git a/app-arch/ipkg-utils/metadata.xml b/app-arch/ipkg-utils/metadata.xml
133 deleted file mode 100644
134 index bc97cc574b1..00000000000
135 --- a/app-arch/ipkg-utils/metadata.xml
136 +++ /dev/null
137 @@ -1,12 +0,0 @@
138 -<?xml version="1.0" encoding="UTF-8"?>
139 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
140 -<pkgmetadata>
141 - <maintainer type="person">
142 - <email>jnrowe@×××××.com</email>
143 - <name>James Rowe</name>
144 - </maintainer>
145 - <maintainer type="project">
146 - <email>proxy-maint@g.o</email>
147 - <name>Proxy Maintainers</name>
148 - </maintainer>
149 -</pkgmetadata>
150
151 diff --git a/profiles/package.mask b/profiles/package.mask
152 index 989873395da..f3ca325d461 100644
153 --- a/profiles/package.mask
154 +++ b/profiles/package.mask
155 @@ -719,12 +719,6 @@ sec-policy/selinux-consolekit
156 # Removal in 30 days. Bug #718898
157 dev-python/cloudlib
158
159 -# Aaron Bauman <bman@g.o> (2020-08-01)
160 -# Py2 only. Dead upstream.
161 -# Removal in 30 days. Bug #722060
162 -app-arch/cfv
163 -app-arch/ipkg-utils
164 -
165 # Aaron Bauman <bman@g.o> (2020-08-01)
166 # Py2 only. Last upstream release 2013.
167 # Removal in 30 days. Last 2 have deps on cddb.