Updated oscom ebuild

app-crypt/oscam/oscam-9999.ebuild

@@ -26,17 +26,17 @@ SLOT="0"
 IUSE="cacheex +debug doc ipv6 +ssl systemd"
 
 IUSE_OSCAM_ADDONS="
-	webif touch dvbapi clockfix irdeto_guess anticasc lb cyclecheck
-	lcd led"
+	anticasc clockfix cyclecheck dvbapi irdeto_guess lb lcd led 
+	touch webif"
 IUSE_OSCAM_CARDREADERS="
-	phoenix internal mp35 sc8in1 smargo db2com stinger drecas
-	pcsc smart"
+	db2com drecas internal mp35 pcsc phoenix sc8in1 smargo
+	smart stapi stapi5 stinger"
 IUSE_OSCAM_MODULES="
-	monitor camd33 camd35 camd35_tcp newcamd cccam cccshare gbox
-	radegast serial constcw pandora ghttp scam"
+	camd33 camd35 camd35_tcp cccam cccshare constcw gbox ghttp
+	monitor newcamd pandora radegast scam serial"
 IUSE_OSCAM_READERS="
-	nagra irdeto conax cryptoworks seca viaccess videoguard dre
-	tongfang bulcrypt griffin dgcrypt"
+	bulcrypt conax cryptoworks dgcrypt dre griffin irdeto nagra
+	nagra_merlin seca tongfang viaccess videoguard"
 
 for addon in ${IUSE_OSCAM_ADDONS}; do
 	IUSE="${IUSE} oscam_addons_${addon}"
@@ -65,7 +65,7 @@ src_configure() {
 	my_options=""
 
 	# Generic options
-	use cacheex && my_options="${my_options} CS_CACHEEX"
+	use cacheex && my_options="${my_options} CS_CACHEEX CS_CACHEEX_AIO"
 	use debug && my_options="${my_options} WITH_DEBUG"
 	use ipv6 && my_options="${my_options} IPV6SUPPORT"
 	use ssl && my_options="${my_options} WITH_SSL"
@@ -105,6 +105,8 @@ src_configure() {
 	use oscam_cardreaders_sc8in1 && my_options="${my_options} CARDREADER_SC8IN1"
 	use oscam_cardreaders_smargo && my_options="${my_options} CARDREADER_SMARGO"
 	use oscam_cardreaders_db2com && my_options="${my_options} CARDREADER_DB2COM"
+	use oscam_cardreaders_stapi && my_options="${my_options} CARDREADER_STAPI"
+	use oscam_cardreaders_stapi5 && my_options="${my_options} CARDREADER_STAPI5"
 	use oscam_cardreaders_stinger && my_options="${my_options} CARDREADER_STINGER"
 	use oscam_cardreaders_drecas && my_options="${my_options} CARDREADER_DRECAS"
 	# Smart and PCSC are detected automatically
@@ -113,6 +115,7 @@ src_configure() {
 
 	# Readers
 	use oscam_readers_nagra && my_options="${my_options} READER_NAGRA"
+	use oscam_readers_nagra_merlin && my_options="${my_options} READER_NAGRA_MERLIN"
 	use oscam_readers_irdeto && my_options="${my_options} READER_IRDETO"
 	use oscam_readers_conax && my_options="${my_options} READER_CONAX"
 	use oscam_readers_cryptoworks && my_options="${my_options} READER_CRYPTOWORKS"