10 files changed, 14 insertions, 182 deletions
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 2119b436821a..aee05e05a95b 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/gputils/Manifest b/dev-embedded/gputils/Manifest
index 1d6910ee6cb7..155fba096530 100644
--- a/dev-embedded/gputils/Manifest
+++ b/dev-embedded/gputils/Manifest
@@ -1,7 +1,4 @@
-AUX gputils-1.5.0-respect-flags.patch 4608 BLAKE2B 064b50907a9e403e5dedf1bdba947f235d2b66b62104494de2b1b3badcb02bd15f5df3c66dddec6580cacee46ed52bd12292bef8e98fa1da4f27cab25314a271 SHA512 ee63f6ec3a4f44bd10edc35cdb0c2c9f63d63cacd21a3dc5eb531776d0688f2865d1466fe143950fc8f3a878a7e7eb8f40eec343bfd6f77b7baa0eed90a8c7da
 AUX gputils-1.5.2-fix-invalid-operator.patch 908 BLAKE2B 56572734e417ce425542952b0a67aa13dbe0280e026d31b4a6775c7cb9eb8c8dcbb9b07e48719b45b5fa73baa6fba77b0c1b8384e5905a39d2d6c0320e22bdf0 SHA512 81152bb1138902907d496ebe303d06d3534382d0bc277a65fb38f53417cab04fe4f37caa373f281e16a8f8a7d4c522274ce3013e68dedcbe0880e0f09b8ff2de
-DIST gputils-1.5.0.tar.gz 13155377 BLAKE2B 68f6ed2ba93f83eaae0573dde5fe8d3a67ec6cf4349832e5edcab70ec35db7d8210f28d46bf3272a7b7f9b52299b1289792b1ca2a75b952e7ea2fc263448c8b9 SHA512 fc74e92ddfe2c9c7ee272a712a411bf01790358c310afc9a802f503902675fa4717410354bf8791f64da45b63f0b1f562b55fdd7127d3989f4295ebe5f80b645
 DIST gputils-1.5.2.tar.bz2 7231711 BLAKE2B c52bd75ee408b2ff98f63679b18834e8e41b5aea4f2b4b659860acb8fa4dd3f922aa6307f99ae0fc024a4fc6f56d3be262cd873cf112ebac444d41eeca635d3b SHA512 43ed508d164152bf36e4f27b09656e6e3d58fc174806ad57d6415e6e2726a56381b1323be3acfc635f2a05babade695e9777b0db8b5f4b90da00b9d29e75eddc
-EBUILD gputils-1.5.0.ebuild 809 BLAKE2B 55f69b85e0ad845bd1f2ab6bf16d9267e09a66bc7b258b137a541aa0f2096445a528275eb2e2f8eef5a73813f84756ec295209f5baaccd04b313acbd7860d787 SHA512 cc30ee6fe9c71e6a8e2a42f5faf91e385c6713e6833abc25115ab347bff09f64a2729516aa1a56f59d1a265bbfa89c27b7e75c5b88189d01b829f0fe3735ac90
-EBUILD gputils-1.5.2.ebuild 992 BLAKE2B c06150fceaf6b6ccc9f7087f0d8b314e5e74032d12d163f65ab45b47b00a7536a5ff6196fa2b9c436520701ea371407dbbad300613359731bcd1964489b5b567 SHA512 cf747f7892a4357805d9dcd04d16800b7c8a73ad935fb9fdf0d6b4c0765f34991c012958fe4962a10d47a4080a8f32169dbe1f20acf765247f51634830fec2d9
+EBUILD gputils-1.5.2.ebuild 988 BLAKE2B 32cbcfeef61c216bab525a137ab2300f9c683a0397856ca069f82841b34212cf066cd7f995f16de2ccdc20c6fe4bbac43896ec06a96d012a2d9de9d9f2c42191 SHA512 f4f3d04f48e22490a07a065e12b3c94104c2a8edf718992ab6cdfa88f681c0045a0e7c6aab3d3faaae1df5519dec6c57b3ae64f4b19d84435f7937751486b766
 MISC metadata.xml 329 BLAKE2B 34b2d2759758806cc11494ac1ff80f04d307c4f825a7d4fac2c49cdc313f6cef2a73975c110a2ec2b5950d289812f14b3e7af29fb210c6362896054669813f95 SHA512 aa1a82ff6a8fc75841cce40006d7cb8a0a7e6b65b4135b31b69781820b437ac033f2fd32aa056557cf19bf107892fda0dc4e39f2bcaa95a96673c194f4dac776
diff --git a/dev-embedded/gputils/files/gputils-1.5.0-respect-flags.patch b/dev-embedded/gputils/files/gputils-1.5.0-respect-flags.patch
deleted file mode 100644
index 01d13dedab0f..000000000000
--- a/dev-embedded/gputils/files/gputils-1.5.0-respect-flags.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-https://sourceforge.net/p/gputils/code/1288
-https://bugs.gentoo.org/722648
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -160,29 +160,41 @@
- AC_CHECK_FUNCS(strndup, , [IBERTYOBJS="$IBERTYOBJS strndup.o"])
- AC_CHECK_FUNCS(strverscmp, , [IBERTYOBJS="$IBERTYOBJS strverscmp.o"])
- 
--AM_CFLAGS=
-+VERSION_MAJOR=`echo $PACKAGE_VERSION | $AWK 'BEGIN {FS="."} {print $1}'`
-+VERSION_MINOR=`echo $PACKAGE_VERSION | $AWK 'BEGIN {FS="."} {print $2}'`
-+VERSION_MICRO=`echo $PACKAGE_VERSION | $AWK 'BEGIN {FS="."} {print $3}'`
-+
-+AC_DEFINE_UNQUOTED(GPUTILS_VERSION_MAJOR, $VERSION_MAJOR, [gputils major version number])
-+AC_DEFINE_UNQUOTED(GPUTILS_VERSION_MINOR, $VERSION_MINOR, [gputils minor version number])
-+AC_DEFINE_UNQUOTED(GPUTILS_VERSION_MICRO, $VERSION_MICRO, [gputils micro version number])
-+AC_DEFINE_UNQUOTED(GPUTILS_VERSION_STR, "$PACKAGE_VERSION", [gputils version string])
-+
-+AM_GPUTILS_SVN_VERSION="\$(shell \$(top_srcdir)/get_cl_revision.sh \$(top_srcdir)/ChangeLog)"
-+AM_PACKAGE_SVN_VERSION=`./get_cl_revision.sh ChangeLog`
-+
-+AM_CFLAGS="-DGPUTILS_SVN_VERSION=\$(AM_GPUTILS_SVN_VERSION)"
- AM_LDFLAGS=
- 
- # Options for the system on which the package will run.
- case "${host}" in
-   *cygwin* )
-     if test "x$GCC" = "xyes"; then
--      AM_CFLAGS="-Wall -pedantic"
-+      AM_CFLAGS="$AM_CFLAGS -Wall -pedantic"
-       AM_LDFLAGS="-Wl,-warn-common -Wl,-warn-once"
-     fi
-     ;;
-   *darwin* )
-     if test "x$CC" = "xclang"; then
--      AM_CFLAGS="-Wall -pedantic -Wformat -Wtautological-compare -Wimplicit-function-declaration -Wformat-security"
-+      AM_CFLAGS="$AM_CFLAGS -Wall -pedantic -Wformat -Wtautological-compare -Wimplicit-function-declaration -Wformat-security"
-     fi
-     ;;
-   *linux* )
-     if test "x$CC" = "xclang"; then
--      AM_CFLAGS="-Wall -pedantic -Wformat -Wtautological-compare -Wimplicit-function-declaration -Wformat-security"
-+      AM_CFLAGS="$AM_CFLAGS -Wall -pedantic -Wformat -Wtautological-compare -Wimplicit-function-declaration -Wformat-security"
-       AM_LDFLAGS="-Wl,-warn-common -Wl,-warn-once"
-     else
-       if test "x$GCC" = "xyes"; then
--        AM_CFLAGS="-Wall -pedantic -Wformat -Wimplicit-function-declaration -Wformat-security"
-+        AM_CFLAGS="$AM_CFLAGS -Wall -pedantic -Wformat -Wimplicit-function-declaration -Wformat-security"
-         AM_LDFLAGS="-Wl,-warn-common -Wl,-warn-once"
-       fi
-     fi
-@@ -192,33 +204,20 @@
-   *-pc-os2_emx | *-pc-os2-emx )
-     EXEEXT=".exe"
-     if test "x$GCC" = "xyes"; then
--      AM_CFLAGS="-Zcrtdll"
-+      AM_CFLAGS="$AM_CFLAGS -Zcrtdll"
-     fi
-     ;;
-   *sun* )
-     # sunos cc needs the -xCC flag for // comments
-     if test "x$GCC" != "xyes"; then
--      AM_CFLAGS="-xCC" 
-+      AM_CFLAGS="$AM_CFLAGS -xCC" 
-     fi
-     ;;
- esac
--
--VERSION_MAJOR=`echo $PACKAGE_VERSION | $AWK 'BEGIN {FS="."} {print $1}'`
--VERSION_MINOR=`echo $PACKAGE_VERSION | $AWK 'BEGIN {FS="."} {print $2}'`
--VERSION_MICRO=`echo $PACKAGE_VERSION | $AWK 'BEGIN {FS="."} {print $3}'`
--
--AC_DEFINE_UNQUOTED(GPUTILS_VERSION_MAJOR, $VERSION_MAJOR, [gputils major version number])
--AC_DEFINE_UNQUOTED(GPUTILS_VERSION_MINOR, $VERSION_MINOR, [gputils minor version number])
--AC_DEFINE_UNQUOTED(GPUTILS_VERSION_MICRO, $VERSION_MICRO, [gputils micro version number])
--AC_DEFINE_UNQUOTED(GPUTILS_VERSION_STR, "$PACKAGE_VERSION", [gputils version string])
--
--AM_GPUTILS_SVN_VERSION="\$(shell \$(top_srcdir)/get_cl_revision.sh \$(top_srcdir)/ChangeLog)"
--AM_PACKAGE_SVN_VERSION=`./get_cl_revision.sh ChangeLog`
--CFLAGS="-DGPUTILS_SVN_VERSION=\$(AM_GPUTILS_SVN_VERSION)"
- 
- # Host filesystem options.
- case "${host}" in
--  *mingw* | *-pc-os2_emx | *-pc-os2-emx | *djgpp*)
-+  *mingw* | *-pc-os2_emx | *-pc-os2-emx | *djgpp* )
-     AC_DEFINE(HAVE_DOS_BASED_FILE_SYSTEM, 1, 
-       [Define if your host uses a DOS based file system.])
-     ;;
-@@ -231,15 +230,13 @@
- fi
- 
- if test x$enable_gdb_debuginfo = xyes; then
--  CFLAGS="$CFLAGS -ggdb"
-+  AM_CFLAGS="$AM_CFLAGS -ggdb"
- fi
- 
- if test x$enable_gputils_path = xyes; then
-   AC_DEFINE(USE_DEFAULT_PATHS, 1,
-     [Define if you want to add default search paths.])
- fi
--
--LDFLAGS=
- 
- # Substitute configuration variables.
- AC_SUBST(ENABLE_HTML_DOC)
-@@ -248,8 +245,6 @@
- AC_SUBST(AM_PACKAGE_SVN_VERSION)
- AC_SUBST(AM_CFLAGS)
- AC_SUBST(AM_LDFLAGS)
--AC_SUBST(CFLAGS)
--AC_SUBST(LDFLAGS)
- AC_SUBST(GPUTILS_HEADER_PATH)
- AC_SUBST(GPUTILS_LKR_PATH)
- AC_SUBST(GPUTILS_LIB_PATH)
-@@ -301,6 +296,7 @@
-   Source directory:     $srcdir
-   Installation prefix:  $prefix
-   C compiler:           $CC $AM_CFLAGS $CFLAGS
-+  C linker:             $CC $AM_LDFLAGS
-   Location of MPLAB-X:  $DEFAULT_MPLABX_PATH
- 
- ])
diff --git a/dev-embedded/gputils/gputils-1.5.0.ebuild b/dev-embedded/gputils/gputils-1.5.0.ebuild
deleted file mode 100644
index 508c9285573c..000000000000
--- a/dev-embedded/gputils/gputils-1.5.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="Tools including assembler, linker and librarian for PIC microcontrollers"
-HOMEPAGE="https://gputils.sourceforge.io"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-respect-flags.patch
-)
-
-src_prepare() {
-	default
-
-	# Only needed for the flags patch, if a new release ever comes...
-	eautoreconf
-}
-
-src_configure() {
-	# bug #369291, bug #818802
-	tc-ld-disable-gold
-
-	# Their configure script tries to do funky things with default
-	# compiler selection.  Force our own defaults instead.
-	tc-export CC
-
-	econf
-}
-
-src_install() {
-	default
-
-	dodoc doc/gputils.pdf
-}
diff --git a/dev-embedded/gputils/gputils-1.5.2.ebuild b/dev-embedded/gputils/gputils-1.5.2.ebuild
index 11fb1036b9e4..92ff42022c4a 100644
--- a/dev-embedded/gputils/gputils-1.5.2.ebuild
+++ b/dev-embedded/gputils/gputils-1.5.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="doc"
 
 PATCHES=(
diff --git a/dev-embedded/sdcc/Manifest b/dev-embedded/sdcc/Manifest
index 672a94c903ce..cff148df5031 100644
--- a/dev-embedded/sdcc/Manifest
+++ b/dev-embedded/sdcc/Manifest
@@ -11,6 +11,6 @@ DIST sdcc-src-4.2.0.tar.bz2 19662367 BLAKE2B a11d6b3af2552e0508bb1d0644d3e6db385
 EBUILD sdcc-3.8.0-r1.ebuild 3186 BLAKE2B 4a0842eb50c5f77947fef50a36482e47e76c25b4994833f5c14e42018c7b5ea3ab77768df15d49886c1e9250ac19e630a95d78a6241cd87e02bbbdafb4367292 SHA512 147127a0e997cb3ce1a53b0cd0990992d6837016dcde7368bf44a2fd35b6647b43224dbcd309660e454e6bcd26921d41d642530e616e5bc2fec4a0eeef8f8d28
 EBUILD sdcc-4.0.0.ebuild 3469 BLAKE2B 04dcac4dba5a07ad9cdddf14e7d313a27f4b28db7903364af17e1cfdf1ef704cb03ac0d2eba980fc97791f3c0b5ce355fa36cd60e0adae45be41d35f94de790d SHA512 65402da6ea8cbff4101109cb9ee53319f770b0603572488ff7c71e60812ca7a2c7868e19275217738fea161d0babb6c44ace3483276236671ff8d710ea580121
 EBUILD sdcc-4.1.0.ebuild 3625 BLAKE2B 983887350f4251ecf1f6d327fc7630e027804439763ab94e765064356f6edf2274ac2f2de363b57fe3a1cb553bcdc55dfcb3f1c6ed49f6355a9c7bbaa4c00811 SHA512 6870daa87d27afa8f196d96e76e2a81eee2137c523389f1955b4b623750f3372c430cb24dc66adb76bf482b14219a373b9c43441230e45306e2a047243e8b2bd
-EBUILD sdcc-4.2.0.ebuild 4003 BLAKE2B 073c89d4206df22ea4be8893d07249d742e6c217a0f1af358abd659cd0a0578af3e6bf73dc9cbc1fc7717f2ea26128004104fb0ca500dafb7b992e2afb13a617 SHA512 4b0a8e632a72ddcc64642d7f22541bddc0b41627ae78b3316365e6b0ba8e243ed308fa4559ac517f4d56600f38ba71dd08f578f966aa4421808c7996218b6dc6
+EBUILD sdcc-4.2.0.ebuild 4002 BLAKE2B dffa517b324e834d24d662b9e4d6eea3ec42b848f06010989b5ed4a127995d1a61093171f1f9195a55a483e134e64f3fe70de29d70fb3def260895f1d8f9ce0c SHA512 22779f03b4eb84c50091c53ea342941eb506b92f17d6272d9e918ed79ef0c2547a80a77a6ef0b9a77afa0c1e102c0a027df2eaf72e18a6c9c2560559b85b3422
 EBUILD sdcc-9999.ebuild 4003 BLAKE2B 073c89d4206df22ea4be8893d07249d742e6c217a0f1af358abd659cd0a0578af3e6bf73dc9cbc1fc7717f2ea26128004104fb0ca500dafb7b992e2afb13a617 SHA512 4b0a8e632a72ddcc64642d7f22541bddc0b41627ae78b3316365e6b0ba8e243ed308fa4559ac517f4d56600f38ba71dd08f578f966aa4421808c7996218b6dc6
 MISC metadata.xml 3045 BLAKE2B 02b5834889994a4b1426244e087a7593b29de3ac0c29004492e4f466c76980fd448c15258d0bd29cddfd691a5f78ba653fea1bc1f42ad4d5b31afb83ad403b3e SHA512 55ecbf5774eb8b58304d97db64875984d4e016e9ba0476d4a5df94dca28baed1bd4eeead7e54885a33d9b9bd1ebbcb47846ac99f62fca3f11adb03d68880da47
diff --git a/dev-embedded/sdcc/sdcc-4.2.0.ebuild b/dev-embedded/sdcc/sdcc-4.2.0.ebuild
index dc4655403f3d..291623b8d48a 100644
--- a/dev-embedded/sdcc/sdcc-4.2.0.ebuild
+++ b/dev-embedded/sdcc/sdcc-4.2.0.ebuild
@@ -14,7 +14,7 @@ else
 		doc? ( https://downloads.sourceforge.net/project/${PN}/sdcc-doc/${PV}/${PN}-doc-${PV}.tar.bz2 )
 	"
 
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Small device C compiler (for various microprocessors)"
diff --git a/dev-embedded/usbprog/Manifest b/dev-embedded/usbprog/Manifest
index 58e1c7bf0207..b0f32893899f 100644
--- a/dev-embedded/usbprog/Manifest
+++ b/dev-embedded/usbprog/Manifest
@@ -1,4 +1,4 @@
 AUX usbprog-0.3.0_p20140828_versions.xml.patch 837 BLAKE2B b3b13f0292dbaa245c3a43894e66034c5de697c4afac16689658bbf43ecb410590cd59f03607f0dcabf957e4bbe54ef60b25b20f0ba20f17442c8cf4999f83a0 SHA512 d863f34f8e7542f8783030016c7be003af73b6e85aa533b210b4cda61975b17f56ca516b4971c9c8133cbda31ef1e6ea8eb153697acf0b62fb1c584ea17a43da
-DIST usbprog-0.3.0_p20140828.tar.bz2 4211124 BLAKE2B b0b1341e34f6f8c5b59925d115be0c45ce12d69d57a330fd111ce41a8f584f68548485f713ee6386e01facd4b7bf7c86e397194c4202ceda226bf912d94ab079 SHA512 fbc4e4edda36c5633f8459723d147bc02a211ef35d409b9a412ce901f3be1ac59f8183caf2a4f93cbe51b9807f7012986e12274167102fb5d84246f23712cca2
-EBUILD usbprog-0.3.0_p20140828-r1.ebuild 1179 BLAKE2B 2b557db72401710dcda13ab428ff89a3ad762b005e9baa0902f1d2965dc14d9aae74cccd1ea90f023d0e6082cce54d0060249de88e3ff414c25a3b23e3de4476 SHA512 e6221d731929f4519dbc7cf29935409a413e4e635485179acfe93689b73ac1863f3069a3aa1ac02fec5167e78cc68d92076663fb4e22d222e88983b7b9e64f64
-MISC metadata.xml 333 BLAKE2B 2a5f58a2a0d8672b8aebf5533a0f938ca904f3029bdb82e7de9f8468b36376fe6757c770860fd752659ca52b86028831c2356351767f36fb1c9e82732ceb5285 SHA512 b5992d9c2011333c6ca95a607aabb9ce00e912b1427aed6008f411fc55fe48bbaf33b9649fcc07a69970b64a09b631381baa812af180112151e7118e8cabe74a
+DIST usbprog-0.3.0_p20140828.tar.gz 4216305 BLAKE2B 65ea08a9f937f70842af5d4bcb0a3256f539bdba36854a51c25458e8b32aa12ea80342f4cb597148f78a50d440d3af91e67e39ca60e54340bbf75fa679cf52e0 SHA512 31d9d551452305dc495caf0e44823c929d7bd25a9a2dec0fec8e1efaa70736dc45cf45607cf7a655aa4201854bcb19d6e6266ba901d6a51eec7d6b5cbfb5a2db
+EBUILD usbprog-0.3.0_p20140828-r2.ebuild 1185 BLAKE2B eb33042a72cb060fff6a2188fa347fcb5e7c279c04b9bedd5e7ae737e7476683b2bd477a08a8833f16cfa9911517426a60f939ccac0b139a999f0caa5c76848b SHA512 204d8cd9e0bd3a51eb03989137ab9d4dbe7496016e68a5c6dae0066b92ac1179a0a236b269cd0213affdd4892680123d0993c400dfbb0982ed67e2f91f3f116e
+MISC metadata.xml 330 BLAKE2B 4e2fe249fcf0516049db3c8ee4e23357cc72f88598e7e13edae8ae751c3cfd1850c2b3aeefb4dd58c0aab59273fbc0b6ea92e9d48c2da4512c33c38ae7902d32 SHA512 2a84414a9fb05ca3928e40b4c20ecac8976fb437147d2f05834947fb584835630b045509f516a42f6ee5db8bc6bd1079b537045777d6399053bf2389e5408d79
diff --git a/dev-embedded/usbprog/metadata.xml b/dev-embedded/usbprog/metadata.xml
index a98bf499324d..98fa0b02b3a9 100644
--- a/dev-embedded/usbprog/metadata.xml
+++ b/dev-embedded/usbprog/metadata.xml
@@ -6,6 +6,6 @@
 	<name>Embedded Gentoo</name>
 </maintainer>
 <upstream>
-	<remote-id type="bitbucket">bwalle/usbprog-tools</remote-id>
+	<remote-id type="github">bwalle/usbprog-tools</remote-id>
 </upstream>
 </pkgmetadata>
diff --git a/dev-embedded/usbprog/usbprog-0.3.0_p20140828-r1.ebuild b/dev-embedded/usbprog/usbprog-0.3.0_p20140828-r2.ebuild
index 93073fc987fa..a262a146260c 100644
--- a/dev-embedded/usbprog/usbprog-0.3.0_p20140828-r1.ebuild
+++ b/dev-embedded/usbprog/usbprog-0.3.0_p20140828-r2.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake readme.gentoo-r1
 
-REV="293d559bac55"
+REV="293d559bac55f7c7130ea2769c703c68a19d62c2"
 
 DESCRIPTION="flashtool for the multi purpose programming adapter usbprog"
-HOMEPAGE="http://www.aaabbb.de/FirmwareUsbprog/FirmwareUsbprog_en.php https://bitbucket.org/bwalle/usbprog-tools/src/master/"
-SRC_URI="https://bitbucket.org/bwalle/usbprog-tools/get/${REV}.tar.bz2 -> ${P}.tar.bz2"
+HOMEPAGE="https://github.com/bwalle/usbprog-tools https://www.aaabbb.de/FirmwareUsbprog/FirmwareUsbprog_en.php"
+SRC_URI="https://github.com/bwalle/usbprog-tools/archive/${REV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -28,7 +28,7 @@ RDEPEND="
 	virtual/libusb:1
 "
 DEPEND="${RDEPEND}"
-S="${WORKDIR}/bwalle-usbprog-tools-${REV}"
+S="${WORKDIR}/usbprog-tools-${REV}"
 
 PATCHES=(
 	"${FILESDIR}/${P}_versions.xml.patch"