diff --git a/dev-util/hip/files/hip-6.4.1-no-glibcxx-assert.patch b/dev-util/hip/files/hip-6.4.1-no-glibcxx-assert.patch
index b73c5cad8dbb..9a3c673a92e6 100644
--- a/dev-util/hip/files/hip-6.4.1-no-glibcxx-assert.patch
+++ b/dev-util/hip/files/hip-6.4.1-no-glibcxx-assert.patch
@@ -13,7 +13,7 @@ Bug: https://bugs.gentoo.org/955623
  #define __HIP_HAS_GET_PCH ${_pchStatus}\n
 +
 +// Workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=115740
-+#if defined(__has_include) && defined(__cplusplus) && defined(__HIP__)
++#if defined(__has_include) && defined(__cplusplus) && defined(__HIP__) && !defined(__HIPCC_RTC__)
 +  #if __has_include(\"bits/c++config.h\")
 +    #include <bits/c++config.h>
 +    #undef __glibcxx_assert
diff --git a/dev-util/hip/hip-6.4.3-r1.ebuild b/dev-util/hip/hip-6.4.3-r2.ebuild
similarity index 100%
rename from dev-util/hip/hip-6.4.3-r1.ebuild
rename to dev-util/hip/hip-6.4.3-r2.ebuild
diff --git a/dev-util/hip/hip-7.0.2.ebuild b/dev-util/hip/hip-7.0.2-r1.ebuild
similarity index 100%
rename from dev-util/hip/hip-7.0.2.ebuild
rename to dev-util/hip/hip-7.0.2-r1.ebuild
diff --git a/dev-util/hip/hip-7.1.0.ebuild b/dev-util/hip/hip-7.1.0-r1.ebuild
similarity index 100%
rename from dev-util/hip/hip-7.1.0.ebuild
rename to dev-util/hip/hip-7.1.0-r1.ebuild