diff --git a/net-im/spectrum/Manifest b/net-im/spectrum/Manifest
index be0f3662f..4fa5f7044 100644
--- a/net-im/spectrum/Manifest
+++ b/net-im/spectrum/Manifest
@@ -4,12 +4,12 @@ Hash: SHA256
 AUX spectrum.confd 157 BLAKE2B 89464687195a1b63595199d8bea81cccc3855187be60ae598bdd8125dcba524ccbfd93b1895f283d951673790acac4abcd15e44ed2fd35b0c6421f7c7fa6b22f SHA512 511213a0bb4d91b22d3c9ac8e90978248076a9697cbeaa5bfd53eaac3ce1850f78739768dc88f2443519b64dc61f278be32ed408f0c7b2f64f29c01f94fc5fee
 AUX spectrum.initd 552 BLAKE2B 4cd5d0584cdc4731cb8be96ef1f4b7d3747f08c7d8e3d73ad506808ff0688806c2448030f99cfc7163a232c3453658e8e41781f891ac636256898b9acfd979c2 SHA512 ba9b9e690b3e89b879de03ad92e3e02cfe548227d64bc0cb1ed05900d9442b8c874e78dd83f3a982763c77349c3699de69eafd301577b1e3f11546518d804887
 DIST spectrum-2.0.7.tar.gz 840649 BLAKE2B a76417800ccefa43799eede6d4c6c72c45fc52c7f4b53bdac0b768ac454531add626cc184596af840941ada41bf8eeb6b104d99837c3a36bdf00191806dcca29 SHA512 2b2bc753fb8feba1fbb01dba6256732789a8870644cf7dd70b956e9d7a9489ede46b4acd26796096698c8dba28e126fb2182834dfe337ce78bd949a59188eef4
-EBUILD spectrum-2.0.7.ebuild 2389 BLAKE2B 70ab4061cfa80b51aa355faee4f719b8bf913a8e36ed052f854625d80a22bd259a5172cf291332f2d5db491c0566c1db2504344ae5235a702494d2917def40b0 SHA512 56f763af91c6106e1bf6e89f1bb319c8f7576e406f91ba895bb89be814466911492ef07f5a4a06f463d4d7400139fcf259070aa76c9cb9d292745a245ede5a46
+EBUILD spectrum-2.0.7-r1.ebuild 2312 BLAKE2B aa60524ce59d48c994a59d0c70dcaa410926fe9a4c1ac1a57d1747295f9664635c562b158d8baa388c742e31daece174013e52c46a70f798be6d6135d4021f09 SHA512 fa6bb849eeba1f419497739b56995c45f56f7293d00a1f2b86e5730c2ae951841bf878269ee1dbaa9399fd3345844c8e568c9fba621c1d112885c84dd3a23387
 MISC metadata.xml 690 BLAKE2B 61d7805c99f4c8d414ba1dc76a04ef6b4f1d2f00f9005ca128d3c0bf517e97dfd3d5e73a422550f6eb692e0678e0c063a6b144a1f853fbf933a48bff1722b22e SHA512 753f1141261c73e1dd407a572a612ad52edba0f5160a44a65f64a154c10ed4be18dedec90f81185b470563c948c0b178fe907779c956376e6d24876c06045860
 -----BEGIN PGP SIGNATURE-----
 
-iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCW5CHLgAKCRDPw5SX8bJu
-B6uwAP9QZyvXZ+PK6NJ1knEe6gMDrfBYLgGvtfd0OsyylhuGDgD/UMEdGUWaTtoL
-av1uOTBBSb0cD5kMDsOGLmj/q34Ll9o=
-=2ckB
+iHUEAREIAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCW5ESBQAKCRDPw5SX8bJu
+BzzdAP9izE/4FbI9q37q8sjjwy0WePL7vkTL4V8tIvB4nBuz6QD8DOYvxf1Y9gkX
+O8M9ovZW6ESaDxooorjNkLmVERL+Z4M=
+=/X7m
 -----END PGP SIGNATURE-----
diff --git a/net-im/spectrum/spectrum-2.0.7.ebuild b/net-im/spectrum/spectrum-2.0.7-r1.ebuild
similarity index 81%
rename from net-im/spectrum/spectrum-2.0.7.ebuild
rename to net-im/spectrum/spectrum-2.0.7-r1.ebuild
index 05526b61d..fa943f5b4 100644
--- a/net-im/spectrum/spectrum-2.0.7.ebuild
+++ b/net-im/spectrum/spectrum-2.0.7-r1.ebuild
@@ -48,17 +48,17 @@ pkg_setup() {
 
 src_configure() {
 	mycmakeargs=(
-		$(cmake-utils_use_enable mysql MYSQL)
-		$(cmake-utils_use_enable postgres PQXX)
-		$(cmake-utils_use_enable sqlite SQLITE3)
-		$(cmake-utils_use_enable doc DOCS)
-		$(cmake-utils_use_enable frotz FROTZ)
-		$(cmake-utils_use_enable irc IRC)
-		$(cmake-utils_use_enable xmpp SWIFTEN)
-		$(cmake-utils_use_enable purple PURPLE)
-		$(cmake-utils_use_enable sms SMSTOOLS3)
-		$(cmake-utils_use_enable twitter TWITTER)
-		$(cmake-utils_use_enable whatsapp WHATSAPP)
+		-DENABLE_MYSQL="$(usex mysql)"
+		-DENABLE_PQXX="$(usex postgres)"
+		-DENABLE_SQLITE3="$(usex sqlite)"
+		-DENABLE_DOCS="$(usex doc)"
+		-DENABLE_FROTZ="$(usex frotz)"
+		-DENABLE_IRC="$(usex irc)"
+		-DENABLE_SWIFTEN="$(usex xmpp)"
+		-DENABLE_PURPLE="$(usex purple)"
+		-DENABLE_SMSTOOLS3="$(usex sms)"
+		-DENABLE_TWITTER="$(usex twitter)"
+		-DENABLE_WHATSAPP="$(usex whatsapp)"
 	)
 
 	cmake-utils_src_configure