1 files changed, 54 insertions, 45 deletions

diff --git a/deskutils/calibre/pkg-plist b/deskutils/calibre/pkg-plist
index fc6ab4cb5e17..40aea6e1c66f 100644
--- a/deskutils/calibre/pkg-plist
+++ b/deskutils/calibre/pkg-plist
@@ -972,32 +972,19 @@ share/calibre/images/mimetypes/txt.png
 share/calibre/images/mimetypes/unknown.png
 share/calibre/images/mimetypes/zero.png
 share/calibre/images/mimetypes/zip.png
-share/calibre/images/news/eluniverso_ec.png
-share/calibre/images/news/howtogeek.png
-share/calibre/images/news/jpost_fr.png
-share/calibre/images/news/science_news_recent_issues.png
-share/calibre/images/news/ajc.png
-share/calibre/images/news/boortz.png
-share/calibre/images/news/fronda.png
-share/calibre/images/news/gazeta_pomorska.png
-share/calibre/images/news/journalgazette.png
-share/calibre/images/news/kstar.png
-share/calibre/images/news/legeartis.png
-share/calibre/images/news/popscience.png
-share/calibre/images/news/rmf24_ESKN.png
-share/calibre/images/news/rmf24_fakty.png
-share/calibre/images/news/walrusmag.png
 share/calibre/images/news/24sata.png
 share/calibre/images/news/24sata_rs.png
 share/calibre/images/news/abc_py.png
 share/calibre/images/news/ad.png
 share/calibre/images/news/adventuregamers.png
 share/calibre/images/news/aif_ru.png
+share/calibre/images/news/ajc.png
 share/calibre/images/news/akter.png
 share/calibre/images/news/alo_novine.png
 share/calibre/images/news/ambito.png
 share/calibre/images/news/american_thinker.png
 share/calibre/images/news/amspec.png
+share/calibre/images/news/anandtech.png
 share/calibre/images/news/ars_technica.png
 share/calibre/images/news/atlantic.png
 share/calibre/images/news/axxon_news.png
@@ -1011,6 +998,7 @@ share/calibre/images/news/beta.png
 share/calibre/images/news/beta_en.png
 share/calibre/images/news/biggovernment.png
 share/calibre/images/news/blic.png
+share/calibre/images/news/boortz.png
 share/calibre/images/news/borba.png
 share/calibre/images/news/business_standard.png
 share/calibre/images/news/businessworldin.png
@@ -1063,6 +1051,7 @@ share/calibre/images/news/elsevier.png
 share/calibre/images/news/eltiempo_hn.png
 share/calibre/images/news/eluniversal.png
 share/calibre/images/news/eluniversal_ve.png
+share/calibre/images/news/eluniverso_ec.png
 share/calibre/images/news/emg_en.png
 share/calibre/images/news/emg_rs.recipe
 share/calibre/images/news/endgadget.png
@@ -1079,6 +1068,7 @@ share/calibre/images/news/fleshbot.png
 share/calibre/images/news/foreignaffairs.png
 share/calibre/images/news/foxnews.png
 share/calibre/images/news/freakonomics.png
+share/calibre/images/news/fronda.png
 share/calibre/images/news/fstream.png
 share/calibre/images/news/ftd.png
 share/calibre/images/news/fudzilla.png
@@ -1086,6 +1076,7 @@ share/calibre/images/news/futurismic.png
 share/calibre/images/news/gamasutra_fa.png
 share/calibre/images/news/gamasutra_news.png
 share/calibre/images/news/gawker.png
+share/calibre/images/news/gazeta_pomorska.png
 share/calibre/images/news/gizmodo.png
 share/calibre/images/news/glas_srpske.png
 share/calibre/images/news/glasjavnosti.png
@@ -1101,6 +1092,7 @@ share/calibre/images/news/hln_be.png
 share/calibre/images/news/hna.png
 share/calibre/images/news/hotair.png
 share/calibre/images/news/houston_chronicle-2.png
+share/calibre/images/news/howtogeek.png
 share/calibre/images/news/hrt.png
 share/calibre/images/news/ieco.png
 share/calibre/images/news/infobae.png
@@ -1117,8 +1109,10 @@ share/calibre/images/news/jb_online.png
 share/calibre/images/news/jezebel.png
 share/calibre/images/news/joelonsoftware.png
 share/calibre/images/news/joop.png
+share/calibre/images/news/journalgazette.png
 share/calibre/images/news/jp_dk.png
 share/calibre/images/news/jpost.png
+share/calibre/images/news/jpost_fr.png
 share/calibre/images/news/jutarnji.png
 share/calibre/images/news/kamerabild.png
 share/calibre/images/news/kitsapun.png
@@ -1126,6 +1120,7 @@ share/calibre/images/news/kommersant.png
 share/calibre/images/news/kotaku.png
 share/calibre/images/news/krstarica.png
 share/calibre/images/news/krstarica_en.png
+share/calibre/images/news/kstar.png
 share/calibre/images/news/kurier.png
 share/calibre/images/news/la_cuarta.png
 share/calibre/images/news/la_jornada.png
@@ -1138,6 +1133,7 @@ share/calibre/images/news/laprensa_ni.png
 share/calibre/images/news/latribuna.png
 share/calibre/images/news/le_monde.png
 share/calibre/images/news/ledevoir.png
+share/calibre/images/news/legeartis.png
 share/calibre/images/news/legitymizm.png
 share/calibre/images/news/lemonde_dip.png
 share/calibre/images/news/liberation.png
@@ -1183,6 +1179,7 @@ share/calibre/images/news/pobjeda.png
 share/calibre/images/news/politico.png
 share/calibre/images/news/politika.png
 share/calibre/images/news/politiken_dk.png
+share/calibre/images/news/popscience.png
 share/calibre/images/news/portfolio.png
 share/calibre/images/news/praguemonitor.png
 share/calibre/images/news/pressonline.png
@@ -1190,9 +1187,13 @@ share/calibre/images/news/propublica.png
 share/calibre/images/news/radikal_tr.png
 share/calibre/images/news/readitlater.png
 share/calibre/images/news/ria_ru.png
+share/calibre/images/news/rmf24_ESKN.png
+share/calibre/images/news/rmf24_fakty.png
 share/calibre/images/news/rts.png
+share/calibre/images/news/rusiahoy.png
 share/calibre/images/news/sanjosemercurynews.png
 share/calibre/images/news/sarajevo_x.png
+share/calibre/images/news/science_news_recent_issues.png
 share/calibre/images/news/sciencedaily.png
 share/calibre/images/news/scott_hanselman.png
 share/calibre/images/news/seattle_times.png
@@ -1238,6 +1239,7 @@ share/calibre/images/news/vecernji_list.png
 share/calibre/images/news/vijesti.png
 share/calibre/images/news/virtualshackles.png
 share/calibre/images/news/vreme.png
+share/calibre/images/news/walrusmag.png
 share/calibre/images/news/wapo_cartoons.png
 share/calibre/images/news/welt.png
 share/calibre/images/news/wikinews_en.png
@@ -1375,21 +1377,6 @@ share/calibre/localization/locales/zh_TW/LC_MESSAGES/qt.qm
 share/calibre/localization/stats.pickle
 share/calibre/metadata_sqlite.sql
 share/calibre/quick_start.epub
-share/calibre/recipes/bbc_sport.recipe
-share/calibre/recipes/cinebel_be.recipe
-share/calibre/recipes/dhnet_be.recipe
-share/calibre/recipes/eluniverso_ec.recipe
-share/calibre/recipes/howtogeek.recipe
-share/calibre/recipes/jpost_fr.recipe
-share/calibre/recipes/lalibre_be.recipe
-share/calibre/recipes/lameuse_be.recipe
-share/calibre/recipes/lavenir_be.recipe
-share/calibre/recipes/lesoir_be.recipe
-share/calibre/recipes/oriental_daily.recipe
-share/calibre/recipes/revista_muy.recipe
-share/calibre/recipes/rmf24_opinie.recipe
-share/calibre/recipes/science_news_recent_issues.recipe
-share/calibre/recipes/twtfb.recipe
 share/calibre/recipes/24sata.recipe
 share/calibre/recipes/24sata_rs.recipe
 share/calibre/recipes/7dias.recipe
@@ -1413,6 +1400,7 @@ share/calibre/recipes/ambito.recipe
 share/calibre/recipes/american_thinker.recipe
 share/calibre/recipes/amspec.recipe
 share/calibre/recipes/an_druma_mor.recipe
+share/calibre/recipes/anandtech.recipe
 share/calibre/recipes/anchorage_daily.recipe
 share/calibre/recipes/ap.recipe
 share/calibre/recipes/apcom.recipe
@@ -1434,6 +1422,7 @@ share/calibre/recipes/barrons.recipe
 share/calibre/recipes/bbc.recipe
 share/calibre/recipes/bbc_chinese.recipe
 share/calibre/recipes/bbc_fast.recipe
+share/calibre/recipes/bbc_sport.recipe
 share/calibre/recipes/bbcvietnamese.recipe
 share/calibre/recipes/berlingske_dk.recipe
 share/calibre/recipes/beta.recipe
@@ -1443,28 +1432,16 @@ share/calibre/recipes/biggovernment.recipe
 share/calibre/recipes/billorielly.recipe
 share/calibre/recipes/blic.recipe
 share/calibre/recipes/boortz.recipe
-share/calibre/recipes/brand_eins.recipe
-share/calibre/recipes/buckmasters.recipe
-share/calibre/recipes/gazeta_pomorska.recipe
-share/calibre/recipes/journalgazette.recipe
-share/calibre/recipes/kstar.recipe
-share/calibre/recipes/le_journal.recipe
-share/calibre/recipes/popscience.recipe
-share/calibre/recipes/rmf24_ESKN.recipe
-share/calibre/recipes/rmf24_fakty.recipe
-share/calibre/recipes/superesportes.recipe
-share/calibre/recipes/tagesan.recipe
-share/calibre/recipes/taz_rss.recipe
-share/calibre/recipes/the_marker.recipe
-share/calibre/recipes/walrusmag.recipe
-share/calibre/recipes/wsj_free.recipe
 share/calibre/recipes/borba.recipe
 share/calibre/recipes/boston.com.recipe
+share/calibre/recipes/brand_eins.recipe
+share/calibre/recipes/buckmasters.recipe
 share/calibre/recipes/buenosaireseconomico.recipe
 share/calibre/recipes/business_standard.recipe
 share/calibre/recipes/business_week.recipe
 share/calibre/recipes/businessworldin.recipe
 share/calibre/recipes/bwmagazine.recipe
+share/calibre/recipes/cacm.recipe
 share/calibre/recipes/calgary_herald.recipe
 share/calibre/recipes/canardpc.recipe
 share/calibre/recipes/carta.recipe
@@ -1478,6 +1455,7 @@ share/calibre/recipes/chinadaily.recipe
 share/calibre/recipes/chowk.recipe
 share/calibre/recipes/chr_mon.recipe
 share/calibre/recipes/cincinnati_enquirer.recipe
+share/calibre/recipes/cinebel_be.recipe
 share/calibre/recipes/cio.recipe
 share/calibre/recipes/cjr.recipe
 share/calibre/recipes/clarin.recipe
@@ -1518,6 +1496,7 @@ share/calibre/recipes/degentenaar.recipe
 share/calibre/recipes/demorgen_be.recipe
 share/calibre/recipes/denver_post.recipe
 share/calibre/recipes/der_standard.recipe
+share/calibre/recipes/dhnet_be.recipe
 share/calibre/recipes/di.recipe
 share/calibre/recipes/diagonales.recipe
 share/calibre/recipes/diario_cordoba.recipe
@@ -1562,6 +1541,7 @@ share/calibre/recipes/elsevier.recipe
 share/calibre/recipes/eltiempo_hn.recipe
 share/calibre/recipes/eluniversal_ve.recipe
 share/calibre/recipes/eluniversalimpresa.recipe
+share/calibre/recipes/eluniverso_ec.recipe
 share/calibre/recipes/emg_en.recipe
 share/calibre/recipes/emg_rs.recipe
 share/calibre/recipes/endgadget.recipe
@@ -1599,6 +1579,7 @@ share/calibre/recipes/futurismic.recipe
 share/calibre/recipes/gamasutra_fa.recipe
 share/calibre/recipes/gamasutra_news.recipe
 share/calibre/recipes/gawker.recipe
+share/calibre/recipes/gazeta_pomorska.recipe
 share/calibre/recipes/gizmodo.recipe
 share/calibre/recipes/glas_srpske.recipe
 share/calibre/recipes/glasgow_herald.recipe
@@ -1611,6 +1592,7 @@ share/calibre/recipes/granma.recipe
 share/calibre/recipes/greader.recipe
 share/calibre/recipes/greader_uber.recipe
 share/calibre/recipes/greensboro_news_and_record.recipe
+share/calibre/recipes/gsp.recipe
 share/calibre/recipes/guardian.recipe
 share/calibre/recipes/gulli.recipe
 share/calibre/recipes/gva_be.recipe
@@ -1634,6 +1616,7 @@ share/calibre/recipes/hna.recipe
 share/calibre/recipes/honvedelem.recipe
 share/calibre/recipes/hotair.recipe
 share/calibre/recipes/houston_chronicle.recipe
+share/calibre/recipes/howtogeek.recipe
 share/calibre/recipes/hoy.recipe
 share/calibre/recipes/hrt.recipe
 share/calibre/recipes/huffingtonpost.recipe
@@ -1642,6 +1625,7 @@ share/calibre/recipes/ieco.recipe
 share/calibre/recipes/ieeespectrum.recipe
 share/calibre/recipes/ifzm.recipe
 share/calibre/recipes/iht.recipe
+share/calibre/recipes/il_fatto.recipe
 share/calibre/recipes/il_giornale.recipe
 share/calibre/recipes/il_messaggero.recipe
 share/calibre/recipes/iliteratura_cz.recipe
@@ -1674,9 +1658,11 @@ share/calibre/recipes/jezebel.recipe
 share/calibre/recipes/joelonsoftware.recipe
 share/calibre/recipes/johm.recipe
 share/calibre/recipes/joop.recipe
+share/calibre/recipes/journalgazette.recipe
 share/calibre/recipes/journalofaccountancy.recipe
 share/calibre/recipes/jp_dk.recipe
 share/calibre/recipes/jpost.recipe
+share/calibre/recipes/jpost_fr.recipe
 share/calibre/recipes/jsonline.recipe
 share/calibre/recipes/jutarnji.recipe
 share/calibre/recipes/juventudrebelde.recipe
@@ -1692,6 +1678,7 @@ share/calibre/recipes/kommersant.recipe
 share/calibre/recipes/kotaku.recipe
 share/calibre/recipes/krstarica.recipe
 share/calibre/recipes/krstarica_en.recipe
+share/calibre/recipes/kstar.recipe
 share/calibre/recipes/kukuburi.recipe
 share/calibre/recipes/kurier.recipe
 share/calibre/recipes/l_espresso.recipe
@@ -1703,6 +1690,8 @@ share/calibre/recipes/la_republica.recipe
 share/calibre/recipes/la_segunda.recipe
 share/calibre/recipes/la_stampa.recipe
 share/calibre/recipes/la_tercera.recipe
+share/calibre/recipes/lalibre_be.recipe
+share/calibre/recipes/lameuse_be.recipe
 share/calibre/recipes/lamujerdemivida.recipe
 share/calibre/recipes/lanacion.recipe
 share/calibre/recipes/lanacion_chile.recipe
@@ -1713,6 +1702,8 @@ share/calibre/recipes/las_vegas_review.recipe
 share/calibre/recipes/latimes.recipe
 share/calibre/recipes/latribuna.recipe
 share/calibre/recipes/lavanguardia.recipe
+share/calibre/recipes/lavenir_be.recipe
+share/calibre/recipes/le_journal.recipe
 share/calibre/recipes/le_monde.recipe
 share/calibre/recipes/le_temps.recipe
 share/calibre/recipes/ledevoir.recipe
@@ -1721,6 +1712,7 @@ share/calibre/recipes/leggo_it.recipe
 share/calibre/recipes/legitymizm.recipe
 share/calibre/recipes/lemonde_dip.recipe
 share/calibre/recipes/lescienze.recipe
+share/calibre/recipes/lesoir_be.recipe
 share/calibre/recipes/levante.recipe
 share/calibre/recipes/liberation.recipe
 share/calibre/recipes/libero.recipe
@@ -1743,6 +1735,7 @@ share/calibre/recipes/marca.recipe
 share/calibre/recipes/maximum_pc.recipe
 share/calibre/recipes/mdj.recipe
 share/calibre/recipes/mediapart.recipe
+share/calibre/recipes/medscape.recipe
 share/calibre/recipes/metro_montreal.recipe
 share/calibre/recipes/miami_herald.recipe
 share/calibre/recipes/michalkiewicz.recipe
@@ -1778,6 +1771,7 @@ share/calibre/recipes/newsobs.recipe
 share/calibre/recipes/newsstraitstimes.recipe
 share/calibre/recipes/newsweek.recipe
 share/calibre/recipes/newsweek_argentina.recipe
+share/calibre/recipes/nightflier.recipe
 share/calibre/recipes/nin.recipe
 share/calibre/recipes/noaa.recipe
 share/calibre/recipes/nortecastilla.recipe
@@ -1804,6 +1798,7 @@ share/calibre/recipes/oilprice.recipe
 share/calibre/recipes/oldnewthing.recipe
 share/calibre/recipes/onionavclub.recipe
 share/calibre/recipes/open_left.recipe
+share/calibre/recipes/oriental_daily.recipe
 share/calibre/recipes/orlando_sentinel.recipe
 share/calibre/recipes/ottawa_citizen.recipe
 share/calibre/recipes/ourdailybread.recipe
@@ -1830,6 +1825,7 @@ share/calibre/recipes/politico.recipe
 share/calibre/recipes/politifact.recipe
 share/calibre/recipes/politika.recipe
 share/calibre/recipes/politiken_dk.recipe
+share/calibre/recipes/popscience.recipe
 share/calibre/recipes/portfolio.recipe
 share/calibre/recipes/praguemonitor.recipe
 share/calibre/recipes/pravda.recipe
@@ -1848,13 +1844,18 @@ share/calibre/recipes/regina_leader_post.recipe
 share/calibre/recipes/reptantes.recipe
 share/calibre/recipes/republika.recipe
 share/calibre/recipes/reuters.recipe
+share/calibre/recipes/revista_muy.recipe
 share/calibre/recipes/rga.recipe
 share/calibre/recipes/ria_ru.recipe
 share/calibre/recipes/rian_eng.recipe
 share/calibre/recipes/rian_spa.recipe
+share/calibre/recipes/rmf24_ESKN.recipe
+share/calibre/recipes/rmf24_fakty.recipe
+share/calibre/recipes/rmf24_opinie.recipe
 share/calibre/recipes/rte.recipe
 share/calibre/recipes/rts.recipe
 share/calibre/recipes/runa.recipe
+share/calibre/recipes/rusiahoy.recipe
 share/calibre/recipes/rzeczpospolita.recipe
 share/calibre/recipes/sabah.recipe
 share/calibre/recipes/salon.recipe
@@ -1864,6 +1865,7 @@ share/calibre/recipes/sarajevo_x.recipe
 share/calibre/recipes/saskatoon_star_phoenix.recipe
 share/calibre/recipes/science_aas.recipe
 share/calibre/recipes/science_news.recipe
+share/calibre/recipes/science_news_recent_issues.recipe
 share/calibre/recipes/sciencedaily.recipe
 share/calibre/recipes/scientific_american.recipe
 share/calibre/recipes/scinexx.recipe
@@ -1901,11 +1903,14 @@ share/calibre/recipes/straitstimes.recipe
 share/calibre/recipes/strategy-business.recipe
 share/calibre/recipes/sueddeutsche.recipe
 share/calibre/recipes/sueddeutschezeitung.recipe
+share/calibre/recipes/superesportes.recipe
 share/calibre/recipes/svd_se.recipe
+share/calibre/recipes/tagesan.recipe
 share/calibre/recipes/tagesspiegel.recipe
 share/calibre/recipes/tanea.recipe
 share/calibre/recipes/tanjug.recipe
 share/calibre/recipes/taz.recipe
+share/calibre/recipes/taz_rss.recipe
 share/calibre/recipes/tech_world.recipe
 share/calibre/recipes/technology_review.recipe
 share/calibre/recipes/telegraph_uk.recipe
@@ -1916,6 +1921,7 @@ share/calibre/recipes/thairath.recipe
 share/calibre/recipes/the_age.recipe
 share/calibre/recipes/the_budget_fashionista.recipe
 share/calibre/recipes/the_escapist.recipe
+share/calibre/recipes/the_marker.recipe
 share/calibre/recipes/the_nation.recipe
 share/calibre/recipes/the_nation_thai.recipe
 share/calibre/recipes/the_new_republic.recipe
@@ -1953,6 +1959,7 @@ share/calibre/recipes/tulsaworld.recipe
 share/calibre/recipes/tuttosport.recipe
 share/calibre/recipes/tweakers.recipe
 share/calibre/recipes/twitchfilms.recipe
+share/calibre/recipes/twtfb.recipe
 share/calibre/recipes/ultimahora.recipe
 share/calibre/recipes/uncrate.recipe
 share/calibre/recipes/upi.recipe
@@ -1972,6 +1979,7 @@ share/calibre/recipes/volksrant.recipe
 share/calibre/recipes/vreme.recipe
 share/calibre/recipes/vrijnederland.recipe
 share/calibre/recipes/waco_tribune.recipe
+share/calibre/recipes/walrusmag.recipe
 share/calibre/recipes/wapo_cartoons.recipe
 share/calibre/recipes/wash_post.recipe
 share/calibre/recipes/wash_times.recipe
@@ -1988,6 +1996,7 @@ share/calibre/recipes/wired_daily.recipe
 share/calibre/recipes/wired_uk.recipe
 share/calibre/recipes/woz_die.recipe
 share/calibre/recipes/wsj.recipe
+share/calibre/recipes/wsj_free.recipe
 share/calibre/recipes/xkcd.recipe
 share/calibre/recipes/yahoo_news.recipe
 share/calibre/recipes/yementimes.recipe