commit:     c6b85e8cdc92e2dcda7d26f3d8eedd24f316e47e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 28 03:56:58 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 28 03:56:58 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6b85e8c

net-misc/dhcpcd: drop 10.0.4, 10.0.5

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/dhcpcd/Manifest             |   1 -
 net-misc/dhcpcd/dhcpcd-10.0.4.ebuild | 154 -----------------------------------
 net-misc/dhcpcd/dhcpcd-10.0.5.ebuild | 154 -----------------------------------
 3 files changed, 309 deletions(-)

diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 519e7ce575f1..c7b8244a032f 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,5 +1,4 @@
 DIST dhcpcd-10.0.3.tar.xz 268872 BLAKE2B 
c063fbb44b4a6928ffd84c109c1ed8ae0345c81b732fc75ce1c1aebc51c190fa512de9822c1c6865794db126f4ad2aceef97c4da28d6922cca082b1aeedb4760
 SHA512 
f4437e9aa094ab38f077c455b012f46cc84a39f97a19eae896a0954f24f2064e91407dc7f7be7fae00faf3455a8e50695e94c406f476f88a61b980169a778560
-DIST dhcpcd-10.0.4.tar.xz 269212 BLAKE2B 
770ee398eccff20cd4a37f89b841f8d580d9a42b456d93673ab3bf6ddf1ed0e49feda47ea8c1206a8a8582bccde80f45c3efbf2e1d0e493b06f04e2c6df876af
 SHA512 
8af26c4a42ce63e9cae72de68774807b8739aabd19cc2a0260148f3baa25c587bf34a5a0b80239b54d8ab9b79661744e61b0e316d2c510c4da65615268d3e8cf
 DIST dhcpcd-10.0.5.tar.xz 269696 BLAKE2B 
52435e2afa4fa5563b629af3f69b149b87de75097d20819423429741e8f2d16df136409180c509ff08b28fd060ad74da4d73057556349b8041c716dbeb7dbcc3
 SHA512 
f8213eee93e83c174ce5d2487364400fe07b39bb0f052d072518e12f7189136704f65e1f4467432b477f195d64eebe6ca167aec160aed1575ea9ef551b43eb43
 DIST dhcpcd-10.0.6.tar.xz 269392 BLAKE2B 
4afd08cf7377b2262d33bf3f7ac503e081572a7c1ffd53b285842a92d99d88fae44e7e6384134bbe1eb839001f822fa7fb43718c42f9e8e6d11a05ec66fa2fc6
 SHA512 
403d612080c6f1397003dc6a16f59bb5d1d3d3479e3656c598acde4c4aafe1cfa374725c5ae3dddb4972c0f23ffd55d04c3703b97bed5b7060855b61b7738004
 DIST dhcpcd-9.5.1.tar.xz 258280 BLAKE2B 
355a98d415253608e8f586809d41e7654c1973d956cb3951218e1ff8c928ee414aa1b9854180c78e975898d9eb0f4cb9cc0fe64eefd5690b371989093e1bcb5a
 SHA512 
979c180743d3e01d1996033d42c5606792e3acaef4e600f0ea51c362643a5b2743c6dc2792314c3b66edfa99c3b98d17f46cf3421e2088b37804e6e2167037ee

diff --git a/net-misc/dhcpcd/dhcpcd-10.0.4.ebuild 
b/net-misc/dhcpcd/dhcpcd-10.0.4.ebuild
deleted file mode 100644
index a320e843768a..000000000000
--- a/net-misc/dhcpcd/dhcpcd-10.0.4.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="https://github.com/NetworkConfiguration/dhcpcd.git";
-else
-       MY_P="${P/_alpha/-alpha}"
-       MY_P="${MY_P/_beta/-beta}"
-       MY_P="${MY_P/_rc/-rc}"
-       
SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${MY_P}.tar.xz";
-       S="${WORKDIR}/${MY_P}"
-
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd/ 
https://roy.marples.name/projects/dhcpcd/";
-
-LICENSE="BSD-2 BSD ISC MIT"
-SLOT="0"
-IUSE="debug +embedded ipv6 privsep +udev"
-
-DEPEND="udev? ( virtual/udev )"
-RDEPEND="
-       ${DEPEND}
-       privsep? (
-               acct-group/dhcpcd
-               acct-user/dhcpcd
-       )
-"
-
-src_configure() {
-       local myeconfargs=(
-               --dbdir="${EPREFIX}/var/lib/dhcpcd"
-               --libexecdir="${EPREFIX}/lib/dhcpcd"
-               --localstatedir="${EPREFIX}/var"
-               --prefix="${EPREFIX}"
-               --with-hook=ntp.conf
-               $(use_enable debug)
-               $(use_enable embedded)
-               $(use_enable ipv6)
-               $(use_enable privsep)
-               $(usex elibc_glibc '--with-hook=yp.conf' '')
-               --rundir=$(usex kernel_linux "${EPREFIX}/run/dhcpcd" 
"${EPREFIX}/var/run/dhcpcd")
-               $(usex privsep '--privsepuser=dhcpcd' '')
-               $(usex udev '' '--without-dev --without-udev')
-               CC="$(tc-getCC)"
-       )
-       econf "${myeconfargs[@]}"
-}
-
-src_install() {
-       default
-       keepdir /var/lib/dhcpcd
-       newinitd "${FILESDIR}"/dhcpcd.initd-r1 dhcpcd
-       systemd_newunit "${FILESDIR}"/dhcpcd.service-r1 dhcpcd.service
-}
-
-pkg_postinst() {
-       local dbdir="${EROOT}"/var/lib/dhcpcd old_files=()
-
-       local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid
-       local old_duid="${EROOT}"/etc/dhcpcd.duid
-       local new_duid="${dbdir}"/duid
-       if [[ -e "${old_old_duid}" ]] ; then
-               # Upgrade the duid file to the new format if needed
-               if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
-                       sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
-               fi
-
-               # Move the duid to /etc, a more sensible location
-               if [[ ! -e "${old_duid}" ]] ; then
-                       cp -p "${old_old_duid}" "${new_duid}"
-               fi
-               old_files+=( "${old_old_duid}" )
-       fi
-
-       # dhcpcd-7 moves the files out of /etc
-       if [[ -e "${old_duid}" ]] ; then
-               if [[ ! -e "${new_duid}" ]] ; then
-                       cp -p "${old_duid}" "${new_duid}"
-               fi
-               old_files+=( "${old_duid}" )
-       fi
-       local old_secret="${EROOT}"/etc/dhcpcd.secret
-       local new_secret="${dbdir}"/secret
-       if [[ -e "${old_secret}" ]] ; then
-               if [[ ! -e "${new_secret}" ]] ; then
-                       cp -p "${old_secret}" "${new_secret}"
-               fi
-               old_files+=( "${old_secret}" )
-       fi
-
-       # dhcpcd-7 renames some files in /var/lib/dhcpcd
-       local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
-       local new_rdm="${dbdir}"/rdm_monotonic
-       if [[ -e "${old_rdm}" ]] ; then
-               if [[ ! -e "${new_rdm}" ]] ; then
-                       cp -p "${old_rdm}" "${new_rdm}"
-               fi
-               old_files+=( "${old_rdm}" )
-       fi
-       local lease=
-       for lease in "${dbdir}"/dhcpcd-*.lease*; do
-               [[ -f "${lease}" ]] || continue
-               old_files+=( "${lease}" )
-               local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//")
-               [[ -e "${dbdir}/${new_lease}" ]] && continue
-               cp "${lease}" "${dbdir}/${new_lease}"
-       done
-
-       # Warn about removing stale files
-       if [[ -n "${old_files[@]}" ]] ; then
-               elog
-               elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
-               elog "${EROOT}/etc to ${dbdir}"
-               elog "and copied leases in ${dbdir} to new files with the 
dhcpcd-"
-               elog "prefix dropped."
-               elog
-               elog "You should remove these files if you don't plan on 
reverting"
-               elog "to an older version:"
-               local old_file=
-               for old_file in ${old_files[@]}; do
-                       elog "  ${old_file}"
-               done
-       fi
-
-       if [ -z "${REPLACING_VERSIONS}" ]; then
-               elog
-               elog "dhcpcd has zeroconf support active by default."
-               elog "This means it will always obtain an IP address even if no"
-               elog "DHCP server can be contacted, which will break any 
existing"
-               elog "failover support you may have configured in your net 
configuration."
-               elog "This behaviour can be controlled with the noipv4ll 
configuration"
-               elog "file option or the -L command line switch."
-               elog "See the dhcpcd and dhcpcd.conf man pages for more 
details."
-
-               elog
-               elog "Dhcpcd has duid enabled by default, and this may cause 
issues"
-               elog "with some dhcp servers. For more information, see"
-               elog "https://bugs.gentoo.org/show_bug.cgi?id=477356";
-       fi
-
-       if ! has_version net-dns/bind-tools; then
-               elog
-               elog "If you activate the lookup-hostname hook to look up your 
hostname"
-               elog "using the dns, you need to install net-dns/bind-tools."
-       fi
-}

diff --git a/net-misc/dhcpcd/dhcpcd-10.0.5.ebuild 
b/net-misc/dhcpcd/dhcpcd-10.0.5.ebuild
deleted file mode 100644
index a320e843768a..000000000000
--- a/net-misc/dhcpcd/dhcpcd-10.0.5.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-       inherit git-r3
-       EGIT_REPO_URI="https://github.com/NetworkConfiguration/dhcpcd.git";
-else
-       MY_P="${P/_alpha/-alpha}"
-       MY_P="${MY_P/_beta/-beta}"
-       MY_P="${MY_P/_rc/-rc}"
-       
SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${MY_P}.tar.xz";
-       S="${WORKDIR}/${MY_P}"
-
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd/ 
https://roy.marples.name/projects/dhcpcd/";
-
-LICENSE="BSD-2 BSD ISC MIT"
-SLOT="0"
-IUSE="debug +embedded ipv6 privsep +udev"
-
-DEPEND="udev? ( virtual/udev )"
-RDEPEND="
-       ${DEPEND}
-       privsep? (
-               acct-group/dhcpcd
-               acct-user/dhcpcd
-       )
-"
-
-src_configure() {
-       local myeconfargs=(
-               --dbdir="${EPREFIX}/var/lib/dhcpcd"
-               --libexecdir="${EPREFIX}/lib/dhcpcd"
-               --localstatedir="${EPREFIX}/var"
-               --prefix="${EPREFIX}"
-               --with-hook=ntp.conf
-               $(use_enable debug)
-               $(use_enable embedded)
-               $(use_enable ipv6)
-               $(use_enable privsep)
-               $(usex elibc_glibc '--with-hook=yp.conf' '')
-               --rundir=$(usex kernel_linux "${EPREFIX}/run/dhcpcd" 
"${EPREFIX}/var/run/dhcpcd")
-               $(usex privsep '--privsepuser=dhcpcd' '')
-               $(usex udev '' '--without-dev --without-udev')
-               CC="$(tc-getCC)"
-       )
-       econf "${myeconfargs[@]}"
-}
-
-src_install() {
-       default
-       keepdir /var/lib/dhcpcd
-       newinitd "${FILESDIR}"/dhcpcd.initd-r1 dhcpcd
-       systemd_newunit "${FILESDIR}"/dhcpcd.service-r1 dhcpcd.service
-}
-
-pkg_postinst() {
-       local dbdir="${EROOT}"/var/lib/dhcpcd old_files=()
-
-       local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid
-       local old_duid="${EROOT}"/etc/dhcpcd.duid
-       local new_duid="${dbdir}"/duid
-       if [[ -e "${old_old_duid}" ]] ; then
-               # Upgrade the duid file to the new format if needed
-               if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
-                       sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
-               fi
-
-               # Move the duid to /etc, a more sensible location
-               if [[ ! -e "${old_duid}" ]] ; then
-                       cp -p "${old_old_duid}" "${new_duid}"
-               fi
-               old_files+=( "${old_old_duid}" )
-       fi
-
-       # dhcpcd-7 moves the files out of /etc
-       if [[ -e "${old_duid}" ]] ; then
-               if [[ ! -e "${new_duid}" ]] ; then
-                       cp -p "${old_duid}" "${new_duid}"
-               fi
-               old_files+=( "${old_duid}" )
-       fi
-       local old_secret="${EROOT}"/etc/dhcpcd.secret
-       local new_secret="${dbdir}"/secret
-       if [[ -e "${old_secret}" ]] ; then
-               if [[ ! -e "${new_secret}" ]] ; then
-                       cp -p "${old_secret}" "${new_secret}"
-               fi
-               old_files+=( "${old_secret}" )
-       fi
-
-       # dhcpcd-7 renames some files in /var/lib/dhcpcd
-       local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
-       local new_rdm="${dbdir}"/rdm_monotonic
-       if [[ -e "${old_rdm}" ]] ; then
-               if [[ ! -e "${new_rdm}" ]] ; then
-                       cp -p "${old_rdm}" "${new_rdm}"
-               fi
-               old_files+=( "${old_rdm}" )
-       fi
-       local lease=
-       for lease in "${dbdir}"/dhcpcd-*.lease*; do
-               [[ -f "${lease}" ]] || continue
-               old_files+=( "${lease}" )
-               local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//")
-               [[ -e "${dbdir}/${new_lease}" ]] && continue
-               cp "${lease}" "${dbdir}/${new_lease}"
-       done
-
-       # Warn about removing stale files
-       if [[ -n "${old_files[@]}" ]] ; then
-               elog
-               elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
-               elog "${EROOT}/etc to ${dbdir}"
-               elog "and copied leases in ${dbdir} to new files with the 
dhcpcd-"
-               elog "prefix dropped."
-               elog
-               elog "You should remove these files if you don't plan on 
reverting"
-               elog "to an older version:"
-               local old_file=
-               for old_file in ${old_files[@]}; do
-                       elog "  ${old_file}"
-               done
-       fi
-
-       if [ -z "${REPLACING_VERSIONS}" ]; then
-               elog
-               elog "dhcpcd has zeroconf support active by default."
-               elog "This means it will always obtain an IP address even if no"
-               elog "DHCP server can be contacted, which will break any 
existing"
-               elog "failover support you may have configured in your net 
configuration."
-               elog "This behaviour can be controlled with the noipv4ll 
configuration"
-               elog "file option or the -L command line switch."
-               elog "See the dhcpcd and dhcpcd.conf man pages for more 
details."
-
-               elog
-               elog "Dhcpcd has duid enabled by default, and this may cause 
issues"
-               elog "with some dhcp servers. For more information, see"
-               elog "https://bugs.gentoo.org/show_bug.cgi?id=477356";
-       fi
-
-       if ! has_version net-dns/bind-tools; then
-               elog
-               elog "If you activate the lookup-hostname hook to look up your 
hostname"
-               elog "using the dns, you need to install net-dns/bind-tools."
-       fi
-}

Reply via email to