4 files changed, 70 insertions, 1 deletions
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index f7f5e76522fe..5365c3b69d9a 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/avrdude/Manifest b/dev-embedded/avrdude/Manifest
index ae0830ab8683..08fc8550117a 100644
--- a/dev-embedded/avrdude/Manifest
+++ b/dev-embedded/avrdude/Manifest
@@ -1,7 +1,9 @@
 DIST avrdude-6.3.tar.gz 909744 BLAKE2B 3c253571a50c423989fc3fd9c5d6fe11b67fad9ca0d94f4bee0de7309fc22ccfe64102fff74fad47ffcb1874870c0aafd0c003df63285bd05c30efd384f5ef9e SHA512 b671008388d6a552e71066fec46429bc7f6639e8eac41113bcbba5a56212b78be31fcf04956b31e11c6b14888b0f6e825f7458395b9ff4fc28406074c7ded2b2
+DIST avrdude-7.0.tar.gz 2354082 BLAKE2B 44cc6cb82abd4e44f9e7f72901cd9b2a13c9e7635582993ea9a01ea482709ca6a8a3454980446d1196a67cec19a021133d5821731618350336f81fce09d7c049 SHA512 ca3338e6f2f0efc102e70f72531efbd237c5f7bc282d8db5530038f9e20b18a7c2682343bb2baff08c81f8959b066323a444dd64c2362a340a9d9708f90770e0
 DIST avrdude-doc-6.3.pdf 255521 BLAKE2B 3b6a3485b996f0923c00c54970e86c3ab9f40e8a5bd962f5d3e4f87c23c90b61f002b46af9766cc0f117583a54d519c5d8739cb5f8bca0776320243679989716 SHA512 f33b15f6a9247f6646ba8a861f1e86f5d43b1b44438fb95bd53764a73f0c450f669dcb43b6b587390ddbc22dafa02758ddc330a7aab1651ccca7c8da8e00b755
 DIST avrdude-doc-6.3.tar.gz 39823 BLAKE2B 170ad1eab743435eb414a2d6547be6c86e4d75aed83836eb29285a8d11a43f7eb878104b3b7a70b528522a415a96a841686d07e82b151fc6f726c1f56d54e801 SHA512 b7abd9d0068d2933a1907655832930c455093b4ffbdc2b6fb2405a821cad0ba1c4de3aa5fa0ea7c9b53d06cfa6d5b5658d30a18a4f5c3884d0e15c171a097b29
 EBUILD avrdude-6.3-r1.ebuild 1604 BLAKE2B ee08eb332a7c39e4c6fe962b385feed5194ce7ccbf3fee00735e71525f9034de3cb501cb2073ceb27cdfc9c6e1bd8d0d33971f0b126cf336e304d353ab460230 SHA512 cff807fb969f08f298692ca01d62420f76c59a36b986c58c951e0625384077857f6ce7e3516b6a4622709f2c0655302a378f92ba4fcfde01844eb172ed8ada0e
 EBUILD avrdude-6.3.ebuild 1502 BLAKE2B 514c81ae042089508addc0799707b8c42b3ed042d94a5d301b2d80a8f390a653dce24f770dae0d13a0837a7df37ad237ac8d8625429019537e5038cfd78e8c0e SHA512 9b4e51be693bb57def7829575bf828c8932c7d957152fd3e624a608d0aee2a632026d376fbbe73ef7c1fc4cd8d79fe529b9804693654791719670588a28597d3
+EBUILD avrdude-7.0.ebuild 1757 BLAKE2B b68ffa56d1ee92eabcd40ef6d1f970cce0ef3108c8926c9f73b9bc359420ee22dc87b4e9268a5210f648d92fca6cfa9825a28f8453e43f412be7c4dff58305c6 SHA512 e5ef9a966e0f937c15899d82d1f1423c8981bb6c23cdd122120597eaf408a8c0f9c2c800ff64214cf6086075ee94541be1c9da7a8d523ca63e98799fa3ca1243
 EBUILD avrdude-9999.ebuild 1609 BLAKE2B 155fc4a9215f1e17f2ce9543a039a551caa918137b318d0f2d5ffd10ff86563df51b2bb729b0a49b28bf4fd425baaaf8b5f5f73e6762286ca2cd4df6d44dd02d SHA512 cb02fd8b464d8a2bf4f2e2696c2aed1e4e334a668a53db79d268a13d193041929b00c09bfbcfd839b16c89a1f155df7fd98d062cc29be0afdddb84cf5e1d71f4
-MISC metadata.xml 364 BLAKE2B de7d28e39ecb3d05075b85fd66181ffe3a874623efd4cb9a99f9a16b467ca0c1a3d8fa7895b7e33c75162428b08774f5f89474e5b6f167817f5a384b8d9ceb88 SHA512 d15e0de55e3b8e8878ffdcde4fd7a6ae06a8fcd2e30ed0aa7fc5480a8b987edadafa6fc20e4b683c4c8d121192284c7daba4ace47f39c0713f4f0e6fe728924c
+MISC metadata.xml 445 BLAKE2B 022417895def5659b262f5b522881b7c3cd9d45129e3adb8bfe598b8301591f6367595ec529ad812c3d814e801939a0f7b41d7dedf101cdd487741f43a2d5a72 SHA512 2d68e3db08f4a8d74b03cdac07ad45c00fe37794fd7cdaeb8ccd0a9dd0972fb0a60e37c8f37f4801b657ee415f4966d591854fc7176a4e274e9ad60b3cbba012
diff --git a/dev-embedded/avrdude/avrdude-7.0.ebuild b/dev-embedded/avrdude/avrdude-7.0.ebuild
new file mode 100644
index 000000000000..be2345c4ae9f
--- /dev/null
+++ b/dev-embedded/avrdude/avrdude-7.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="AVR Downloader/UploaDEr"
+HOMEPAGE="https://avrdudes.github.io/avrdude https://github.com/avrdudes/avrdude"
+SRC_URI="https://github.com/avrdudes/avrdude/archive/refs/tags/v${PV}.tar.gz -> avrdude-${PV}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="ftdi readline"
+
+RDEPEND="
+	dev-libs/hidapi
+	virtual/libelf:=
+	virtual/libusb:0
+	virtual/libusb:1
+	ftdi? ( dev-embedded/libftdi:1= )
+	readline? ( sys-libs/readline:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
+
+src_prepare() {
+	cmake_src_prepare
+
+	# CMAKE_INSTALL_LIBDIR is not respected. Fixed in the next release.
+	sed -i "s@DESTINATION lib@DESTINATION $(get_libdir)@g" \
+		src/CMakeLists.txt || die
+
+	# For some reason 'TYPE SYSCONF' and 'CMAKE_INSTALL_SYSCONFDIR'
+	# prepends '/usr' so the config ends up getting installed as
+	# '/usr/etc/avrdude.conf' which is not correct.
+	sed -i 's@TYPE SYSCONF@DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}@' \
+		src/CMakeLists.txt || die
+}
+
+src_configure() {
+	# Optional libraries like libftdi aren't gated behind options and
+	# find_package calls, but find_library is called directly
+	# instead.
+	#
+	# Set the cache variable to an empty string if we do not want a
+	# library to be automatically detected.
+	local mycmakeargs=(
+		-DBUILD_DOC=OFF # This currently does nothing...
+		-DBUILD_SHARED_LIBS=ON
+		-DDEBUG_CMAKE=ON
+		-DHAVE_LIBFTDI=''
+		-DHAVE_LIBHID=''
+		-DHAVE_LINUXGPIO=ON # Seems like there is no reason to have this off.
+		-DHAVE_LINUXSPI=ON # Ditto.
+	)
+	use ftdi || mycmakeargs+=( -DHAVE_LIBFTDI1='' )
+	use readline || mycmakeargs+=( -DHAVE_LIBREADLINE='' )
+	cmake_src_configure
+}
diff --git a/dev-embedded/avrdude/metadata.xml b/dev-embedded/avrdude/metadata.xml
index 130f6cdf00c7..b9a0b133cefe 100644
--- a/dev-embedded/avrdude/metadata.xml
+++ b/dev-embedded/avrdude/metadata.xml
@@ -8,4 +8,7 @@
 	<use>
 		<flag name="ftdi">Enable support for USB FTDI chips via <pkg>dev-embedded/libftdi</pkg></flag>
 	</use>
+	<upstream>
+		<remote-id type="github">avrdudes/avrdude</remote-id>
+	</upstream>
 </pkgmetadata>