gentoo resync : 20.03.2022

5 files changed, 58 insertions, 57 deletions

diff --git a/app-doc/linux-device-drivers/Manifest b/app-doc/linux-device-drivers/Manifest
index dc6127a12350..ee3ff0bbfbd8 100644
--- a/app-doc/linux-device-drivers/Manifest
+++ b/app-doc/linux-device-drivers/Manifest
@@ -2,6 +2,6 @@ DIST LDD3-examples.tar.gz 77780 BLAKE2B 76774a4c6ce91b7332b4b5fa92b8e2309a24c83d
 DIST ldd2-samples-1.0.1.tar.gz 123791 BLAKE2B 5cbfe4925af42688e10af86d341be6d8cba2c4093f2ce293705f9e72f5b2b65f4ffd5809cea00e1065351aea8314a38b3d2c0eec3c41ac3a55903a9c8b6f8c34 SHA512 c6d1c72f0b71806cc719f758b62f3ee2a5bc1c66b63399f2765c0b4edfb2f89945e1248607faae1a88c9278d74c1edfa42f4c4408d926883b1c82a650ebbdd6f
 DIST ldd3_pdf.tar.bz2 11553208 BLAKE2B 539903963d62cbbf15399726a6dbf795cefc0909d10f0383183dd3ee4408c6616c4548331f3cc9cff2b1c6ded6a84d378278bc4e2774df18bd50980ebc406c0f SHA512 46e9f9c2c4e5ce5d325e071f4638ebee772fb55c7c3c0f4a303a35e7ca3576dfccf655bbbe6ef8cf6be0558a1c84addf6a4b59b6c50b621c495f3b75184653a4
 DIST ldd_book_pdf.zip 6971754 BLAKE2B 161ec5b96bedba16958521b7b8605a515d7152eb75c661b2a66d27adeda6235de30fec437016c4f9fef559c27dfac4a9c4d0bee8b6eef89da3af30a9c745a158 SHA512 f30675ff5279df6c689cf4f936aa6bd50f6aab8254e557a6a3be87217efb2c6bc30de8efd489ea5c86f86ebebe2b3ac119b0965fd567caf757e9d6d67d02676c
-EBUILD linux-device-drivers-2.ebuild 635 BLAKE2B 95c03d74dfef55edccedace697506b56175f774d065f680213adcbdd9c735f975772f46a738b467513fa55f28d81ec43830041421b2771ba1edb1447b5edfa89 SHA512 3adc30efd8b86f48bd463878c1c38e91879e5fa908d1f2800ffbea61da500221cf21a2e122d395db5da9b4d3a7b5291290cbf1082dc17594c95579e2e1294c28
-EBUILD linux-device-drivers-3.ebuild 754 BLAKE2B bbdf72e0aaa76b72abbd8721814b0ad8a42de46f8b5b77086855613ed33c9b008cc62f959656f04a7162577b4a453142fc92edc19b557180eb02613fbedb0ba0 SHA512 6f3ccb319b86b5ece29b007d60b7373600887a7db2917a7fb9a4851511826fb3b1affc94844bbe4b7853dd6450939f4b946829dcec55e10e19cb3b023d2004de
+EBUILD linux-device-drivers-2-r1.ebuild 696 BLAKE2B e0082efa53cacd3942e8d2cb38fa006c426f03c1e2b36705dc1364f70e77f2ce391f40252a4d139fb1b3f6a8156854cac74cb5e864957fd4b1a67d965910364d SHA512 ab65f18a66f47f7b0985f4b0a6eea352ffb68fce03554050a5dac0eec2eded4649edfaf2c0e56b038f9634363e6717950e1ada1a1bca86d7a7d3e4f22f8fd6ed
+EBUILD linux-device-drivers-3-r1.ebuild 670 BLAKE2B eb26100bc566b3423e4bc87cf976b334d4fee69ed1ee9aeae663a31053394acdfaa99d5172b7a12be65529924436ce8fbc2c1adc1088f904b79eac7820a4399c SHA512 d9745831ccf35308f25442dfb04b486fc7a86b91a7f216c265089f500fbd2402a5b95a6ee083f9459b5f6ac8dbfe749261c6031fee4de18e001f014b9dfac8f8
 MISC metadata.xml 190 BLAKE2B d559575e12e34a66fec07e2f63236ea9b6284ca73aafb2471715d08329f5fad685b5e6f81ee446a4377efd3ca5785827306e491391dcf1789a7bafbe2b506a56 SHA512 5ee7503a2f18cc27f052203ffd239180eb796dda5425690a03a43b51a6d09262141d0108bdc64bad0fcdbedad3ea884e4187ab581a63e5ea2e73e057a5eba0d0
diff --git a/app-doc/linux-device-drivers/linux-device-drivers-2-r1.ebuild b/app-doc/linux-device-drivers/linux-device-drivers-2-r1.ebuild
new file mode 100644
index 000000000000..02389ad129be
--- /dev/null
+++ b/app-doc/linux-device-drivers/linux-device-drivers-2-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+EGIT_COMMIT="9780596000080"
+MY_PN="ldd2-samples"
+MY_PV="1.0.1"
+
+DESCRIPTION="Howto write linux device drivers (updated for Linux 2.4)"
+HOMEPAGE="https://www.oreilly.com/catalog/linuxdrive2/"
+SRC_URI="
+	https://resources.oreilly.com/examples/${EGIT_COMMIT}/-/blob/master/${MY_PN}-${MY_PV}.tar.gz
+	https://www.xml.com/ldd/chapter/book/pdf/ldd_book_pdf.zip
+"
+S="${WORKDIR}"
+
+LICENSE="FDL-1.1"
+SLOT="2"
+KEYWORDS="amd64 arm hppa ~ia64 ppc ~s390 x86"
+
+BDEPEND="app-arch/unzip"
+
+src_install() {
+	dodoc *.pdf
+	docinto samples
+	dodoc -r ldd2-samples-*/.
+	docompress -x /usr/share/doc/${PF}
+}
diff --git a/app-doc/linux-device-drivers/linux-device-drivers-2.ebuild b/app-doc/linux-device-drivers/linux-device-drivers-2.ebuild
deleted file mode 100644
index b9f14bca98b9..000000000000
--- a/app-doc/linux-device-drivers/linux-device-drivers-2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="howto write linux device drivers (updated for Linux 2.4)"
-HOMEPAGE="http://www.oreilly.com/catalog/linuxdrive2/"
-SRC_URI="http://www.xml.com/ldd/chapter/book/pdf/ldd_book_pdf.zip
-	ftp://ftp.oreilly.com/examples/linuxdrive2/ldd2-samples-1.0.1.tar.gz"
-
-LICENSE="FDL-1.1"
-SLOT="2"
-KEYWORDS="amd64 arm hppa ~ia64 ppc ~s390 x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S=${WORKDIR}
-
-src_install() {
-	insinto /usr/share/doc/${PF}
-	doins *.pdf
-	insinto /usr/share/doc/${PF}/samples
-	doins -r ldd2-samples-*/*
-}
diff --git a/app-doc/linux-device-drivers/linux-device-drivers-3-r1.ebuild b/app-doc/linux-device-drivers/linux-device-drivers-3-r1.ebuild
new file mode 100644
index 000000000000..e3bbbd96aeec
--- /dev/null
+++ b/app-doc/linux-device-drivers/linux-device-drivers-3-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+EGIT_COMMIT="9780596005900"
+
+DESCRIPTION="Howto write linux device drivers (updated for Linux 2.6)"
+HOMEPAGE="
+	https://www.oreilly.com/catalog/linuxdrive3/
+	https://lwn.net/Kernel/LDD3/
+"
+SRC_URI="
+	https://resources.oreilly.com/examples/${EGIT_COMMIT}/-/blob/master/examples.tar.gz -> LDD3-examples.tar.gz
+	https://lwn.net/images/pdf/LDD3/ldd3_pdf.tar.bz2
+"
+S="${WORKDIR}"
+
+LICENSE="CC-BY-SA-2.0"
+SLOT="3"
+KEYWORDS="amd64 arm hppa ~ia64 ppc ~riscv ~s390 x86"
+
+src_install() {
+	dodoc ldd3_pdf/*.pdf
+	dodoc -r examples
+	docompress -x /usr/share/doc/${PF}
+}
diff --git a/app-doc/linux-device-drivers/linux-device-drivers-3.ebuild b/app-doc/linux-device-drivers/linux-device-drivers-3.ebuild
deleted file mode 100644
index 73d58ce3d6c9..000000000000
--- a/app-doc/linux-device-drivers/linux-device-drivers-3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="howto write linux device drivers (updated for Linux 2.6)"
-HOMEPAGE="http://www.oreilly.com/catalog/linuxdrive3/ http://lwn.net/Kernel/LDD3/"
-SRC_URI="http://lwn.net/images/pdf/LDD3/ldd3_pdf.tar.bz2
-	mirror://gentoo/LDD3-examples.tar.gz"
-# original URL is this:
-# http://examples.oreilly.com/linuxdrive3/examples.tar.gz
-# but 'examples.tar.gz' is waaaaaay too generic
-
-LICENSE="CC-BY-SA-2.0"
-SLOT="3"
-KEYWORDS="amd64 arm hppa ~ia64 ppc ~riscv ~s390 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}
-
-src_install() {
-	insinto /usr/share/doc/${PF}
-	doins ldd3_pdf/*.pdf
-	insinto /usr/share/doc/${PF}/examples
-	doins -r examples/*
-}