gentoo auto-resync : 25:08:2022 - 02:49:03

3 files changed, 2 insertions, 76 deletions

diff --git a/dev-embedded/avrdude/Manifest b/dev-embedded/avrdude/Manifest
index f6fb069ea5fc..cf7c3c324d5d 100644
--- a/dev-embedded/avrdude/Manifest
+++ b/dev-embedded/avrdude/Manifest
@@ -3,6 +3,5 @@ DIST avrdude-7.0.tar.gz 2354082 BLAKE2B 44cc6cb82abd4e44f9e7f72901cd9b2a13c9e763
 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-7.0.ebuild 1774 BLAKE2B 760745080df899d433b3a33ce17d256f7c897ead5d2d8c4c34cc2f1af7cc07fcd1ef4ed615a1c2563b7f7f3b91c7d7b8ec98ba19fa100382fe35472fb4c4b1c3 SHA512 327f700f8354ef2858a3306c93731e936f85a4cd18139b0c7773edc8fd5818ba066e741f75bbb340f80c37aecef1eae9e3d16dbadcaa9f5f81b04d389da2de5d
-EBUILD avrdude-9999.ebuild 1609 BLAKE2B 155fc4a9215f1e17f2ce9543a039a551caa918137b318d0f2d5ffd10ff86563df51b2bb729b0a49b28bf4fd425baaaf8b5f5f73e6762286ca2cd4df6d44dd02d SHA512 cb02fd8b464d8a2bf4f2e2696c2aed1e4e334a668a53db79d268a13d193041929b00c09bfbcfd839b16c89a1f155df7fd98d062cc29be0afdddb84cf5e1d71f4
+EBUILD avrdude-7.0.ebuild 1779 BLAKE2B f3c51c5cd49d0d21390c0e15fc026a7b2d2b25b251fa84d60126979911b57f790ed7d6d1d94c4b06271ff3d0d463deccf51446c97a94f813b34a42b0f4b23328 SHA512 72af13b0b033df7a7e1cd4a02405c4f628ccecdcee77bc54a0cc0216fd9b10681e4a298066e350c803b8cee993629ff0b937edbf82863281c2eef89b52b721c3
 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
index 325229736abe..2e55c2bf668e 100644
--- a/dev-embedded/avrdude/avrdude-7.0.ebuild
+++ b/dev-embedded/avrdude/avrdude-7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/avrdudes/avrdude/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="ftdi readline"
 
 RDEPEND="
diff --git a/dev-embedded/avrdude/avrdude-9999.ebuild b/dev-embedded/avrdude/avrdude-9999.ebuild
deleted file mode 100644
index 701d5da2a71a..000000000000
--- a/dev-embedded/avrdude/avrdude-9999.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_DOC_PV=6.3
-DESCRIPTION="AVR Downloader/UploaDEr"
-HOMEPAGE="https://savannah.nongnu.org/projects/avrdude"
-
-if [[ ${PV} == *9999* ]] ; then
-	ESVN_REPO_URI="svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude"
-	inherit autotools subversion
-else
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-fi
-
-SRC_URI+=" doc? (
-	mirror://nongnu/${PN}/${PN}-doc-${MY_DOC_PV}.tar.gz
-	mirror://nongnu/${PN}/${PN}-doc-${MY_DOC_PV}.pdf
-)"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc ftdi ncurses readline"
-
-RDEPEND="
-	virtual/libelf
-	virtual/libusb:1
-	virtual/libusb:0
-	ftdi? ( dev-embedded/libftdi:= )
-	ncurses? ( sys-libs/ncurses:0= )
-	readline? ( sys-libs/readline:0= )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	[[ ${PV} == *9999* ]] && eautoreconf
-}
-
-src_configure() {
-	# somehow this doesnt get set when cross-compiling and breaks build
-	tc-export AR
-
-	export ac_cv_lib_ftdi_ftdi_usb_get_strings=$(usex ftdi)
-	export ac_cv_lib_ncurses_tputs=$(usex ncurses)
-	export ac_cv_lib_readline_readline=$(usex readline)
-
-	econf --disable-static
-}
-
-src_compile() {
-	# The automake target for these files does not use tempfiles or create
-	# these atomically, confusing a parallel build. So we force them first.
-	emake lexer.c config_gram.c config_gram.h
-	emake
-}
-
-src_install() {
-	default
-
-	if use doc ; then
-		newdoc "${DISTDIR}/${PN}-doc-${MY_DOC_PV}.pdf" avrdude.pdf
-		dodoc -r "${WORKDIR}/avrdude-html/"
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}