diff --git a/dev-libs/libsolv/libsolv-0.7.30.ebuild b/dev-libs/libsolv/libsolv-0.7.30-r1.ebuild
similarity index 86%
rename from dev-libs/libsolv/libsolv-0.7.30.ebuild
rename to dev-libs/libsolv/libsolv-0.7.30-r1.ebuild
index 7011d39648..7708c73b88 100644
--- a/dev-libs/libsolv/libsolv-0.7.30.ebuild
+++ b/dev-libs/libsolv/libsolv-0.7.30-r1.ebuild
@@ -28,6 +28,12 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+src_prepare() {
+	# remove forced CFLAGS -g -O2; bug 936869
+	sed "/CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE^^}/d" -i CMakeLists.txt || die
+	cmake_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_COMPLEX_DEPS=ON