- Update to 0.6.18.

- Add PoDoFo support.

4 files changed, 291 insertions, 279 deletions

diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
index bdeea3ed43ba..95d68580d8e8 100644
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	calibre
-PORTVERSION=	0.6.17
+PORTVERSION=	0.6.18
 CATEGORIES=	deskutils python
 MASTER_SITES=	http://calibre.kovidgoyal.net/downloads/
 
@@ -35,7 +35,8 @@ RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils \
 		py*-qt4-webkit>=0:${PORTSDIR}/www/py-qt4-webkit \
 		py*-qt4-xml>=0:${PORTSDIR}/textproc/py-qt4-xml
 
-OPTIONS=	MOUNTHELPER_SUID "Install mount helper as suid binary" off
+OPTIONS=	PODOFO "PDF support via PoDoFo library" on \
+		MOUNTHELPER_SUID "Install mount helper as suid binary" off
 
 USE_GETTEXT=	yes
 USE_PYTHON=	2.6+
@@ -47,7 +48,9 @@ CFLAGS+=	"-I${LOCALBASE}/include"
 LDFLAGS+=	"-L${LOCALBASE}/lib"
 MAKE_ENV+=	LDFLAGS="${LDFLAGS}" \
 		FC_INC_DIR="${LOCALBASE}/include/fontconfig" \
-		FC_LIB_DIR="${LOCALBASE}/lib"
+		FC_LIB_DIR="${LOCALBASE}/lib" \
+		OVERRIDE_CFLAGS="${CFLAGS}" \
+		OVERRIDE_LDFLAGS="${LDFLAGS}"
 
 MAN1=	calibre-customize.1 calibre-debug.1 calibre-server.1 calibre-smtp.1 \
 	calibredb.1 ebook-convert.1 ebook-meta.1 fetch-ebook-metadata.1 \
@@ -59,6 +62,14 @@ MANCOMPRESSED=	no
 .if ${OSVERSION} < 800069
 LIB_DEPENDS+=	usb-0.1.8:${PORTSDIR}/devel/libusb
 .endif
+.if !defined(WITHOUT_PODOFO) || exists(${LOCALBASE}/lib/libpodofo.so)
+LIB_DEPENDS+=	podofo:${PORTSDIR}/graphics/podofo
+MAKE_ENV+=	PODOFO_LIB_DIR="${LOCALBASE}/lib" \
+		PODOFO_INC_DIR="${LOCALBASE}/include/podofo"
+PLIST_SUB+=	PODOFO=""
+.else
+PLIST_SUB+=	PODOFO="@comment "
+.endif
 
 do-build:
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \
diff --git a/deskutils/calibre/distinfo b/deskutils/calibre/distinfo
index 2459c1babee5..274c7156ee41 100644
--- a/deskutils/calibre/distinfo
+++ b/deskutils/calibre/distinfo
@@ -1,3 +1,3 @@
-MD5 (calibre-0.6.17.tar.gz) = 818b536dd74dff2afa38460d995dd436
-SHA256 (calibre-0.6.17.tar.gz) = 696215c12c228c3c399f6fcf483dad4c4d73c2355cb79b673e580d2abc5a3712
-SIZE (calibre-0.6.17.tar.gz) = 10514520
+MD5 (calibre-0.6.18.tar.gz) = eef0585c753a7487f60e9829782ac9ed
+SHA256 (calibre-0.6.18.tar.gz) = 78c7f34618284950bc7e2a2519ef7856b5665d2bc224597ab8f4766237514751
+SIZE (calibre-0.6.18.tar.gz) = 10445563
diff --git a/deskutils/calibre/files/patch-setup_extensions.py b/deskutils/calibre/files/patch-setup_extensions.py
index 121adc84f97c..c95f8b00cdba 100644
--- a/deskutils/calibre/files/patch-setup_extensions.py
+++ b/deskutils/calibre/files/patch-setup_extensions.py
@@ -18,15 +18,6 @@
  
  make = 'make' if isunix else NMAKE
  
-@@ -134,7 +134,7 @@
- if isunix:
-     cc = os.environ.get('CC', 'gcc')
-     cxx = os.environ.get('CXX', 'g++')
--    cflags = '-O3 -Wall -DNDEBUG -fPIC -fno-strict-aliasing -pipe'.split()
-+    cflags = '-Wall -DNDEBUG -fPIC'.split()
-     ldflags = ['-Wall']
-     cflags += shlex.split(os.environ.get('CFLAGS', ''))
-     ldflags += shlex.split(os.environ.get('LDFLAGS', ''))
 @@ -146,6 +146,13 @@
      ldflags.append('-lpython'+sysconfig.get_python_version())
  
diff --git a/deskutils/calibre/pkg-plist b/deskutils/calibre/pkg-plist
index f83de1c56c19..a28b54a48d55 100644
--- a/deskutils/calibre/pkg-plist
+++ b/deskutils/calibre/pkg-plist
@@ -333,6 +333,8 @@ lib/calibre/calibre/ebooks/rtf2xml/table.py
 lib/calibre/calibre/ebooks/rtf2xml/table_info.py
 lib/calibre/calibre/ebooks/rtf2xml/tokenize.py
 lib/calibre/calibre/ebooks/sgmllib.py
+lib/calibre/calibre/ebooks/tcr/__init__.py
+lib/calibre/calibre/ebooks/tcr/input.py
 lib/calibre/calibre/ebooks/txt/__init__.py
 lib/calibre/calibre/ebooks/txt/input.py
 lib/calibre/calibre/ebooks/txt/newlines.py
@@ -495,6 +497,7 @@ lib/calibre/calibre/plugins/lzx.so
 lib/calibre/calibre/plugins/msdes.so
 lib/calibre/calibre/plugins/pdfreflow.so
 lib/calibre/calibre/plugins/pictureflow.so
+%%PODOFO%%lib/calibre/calibre/plugins/podofo.so
 lib/calibre/calibre/ptempfile.py
 lib/calibre/calibre/startup.py
 lib/calibre/calibre/trac/__init__.py
@@ -563,269 +566,8 @@ lib/calibre/calibre/web/feeds/feedparser.py
 lib/calibre/calibre/web/feeds/input.py
 lib/calibre/calibre/web/feeds/news.py
 lib/calibre/calibre/web/feeds/recipes/__init__.py
-lib/calibre/calibre/web/feeds/recipes/recipe_24sata.py
-lib/calibre/calibre/web/feeds/recipes/recipe_24sata_rs.py
-lib/calibre/calibre/web/feeds/recipes/recipe_7dias.py
-lib/calibre/calibre/web/feeds/recipes/recipe_accountancyage.py
-lib/calibre/calibre/web/feeds/recipes/recipe_adventuregamers.py
-lib/calibre/calibre/web/feeds/recipes/recipe_al_jazeera.py
-lib/calibre/calibre/web/feeds/recipes/recipe_ambito.py
-lib/calibre/calibre/web/feeds/recipes/recipe_amspec.py
-lib/calibre/calibre/web/feeds/recipes/recipe_ap.py
-lib/calibre/calibre/web/feeds/recipes/recipe_ars_technica.py
-lib/calibre/calibre/web/feeds/recipes/recipe_atlantic.py
-lib/calibre/calibre/web/feeds/recipes/recipe_axxon_news.py
-lib/calibre/calibre/web/feeds/recipes/recipe_azstarnet.py
-lib/calibre/calibre/web/feeds/recipes/recipe_b92.py
-lib/calibre/calibre/web/feeds/recipes/recipe_barrons.py
-lib/calibre/calibre/web/feeds/recipes/recipe_bbc.py
-lib/calibre/calibre/web/feeds/recipes/recipe_bbcvietnamese.py
-lib/calibre/calibre/web/feeds/recipes/recipe_beta.py
-lib/calibre/calibre/web/feeds/recipes/recipe_beta_en.py
-lib/calibre/calibre/web/feeds/recipes/recipe_blic.py
-lib/calibre/calibre/web/feeds/recipes/recipe_borba.py
-lib/calibre/calibre/web/feeds/recipes/recipe_buenosaireseconomico.py
-lib/calibre/calibre/web/feeds/recipes/recipe_business_standard.py
-lib/calibre/calibre/web/feeds/recipes/recipe_business_week.py
-lib/calibre/calibre/web/feeds/recipes/recipe_carta.py
-lib/calibre/calibre/web/feeds/recipes/recipe_chicago_breaking_news.py
-lib/calibre/calibre/web/feeds/recipes/recipe_chicago_tribune.py
-lib/calibre/calibre/web/feeds/recipes/recipe_chr_mon.py
-lib/calibre/calibre/web/feeds/recipes/recipe_cincinnati_enquirer.py
-lib/calibre/calibre/web/feeds/recipes/recipe_clarin.py
-lib/calibre/calibre/web/feeds/recipes/recipe_climate_progress.py
-lib/calibre/calibre/web/feeds/recipes/recipe_cnn.py
-lib/calibre/calibre/web/feeds/recipes/recipe_coding_horror.py
-lib/calibre/calibre/web/feeds/recipes/recipe_common_dreams.py
-lib/calibre/calibre/web/feeds/recipes/recipe_corriere_della_sera_en.py
-lib/calibre/calibre/web/feeds/recipes/recipe_corriere_della_sera_it.py
-lib/calibre/calibre/web/feeds/recipes/recipe_courrierinternational.py
-lib/calibre/calibre/web/feeds/recipes/recipe_craigslist.py
-lib/calibre/calibre/web/feeds/recipes/recipe_criticadigital.py
-lib/calibre/calibre/web/feeds/recipes/recipe_cubadebate.py
-lib/calibre/calibre/web/feeds/recipes/recipe_cyberpresse.py
-lib/calibre/calibre/web/feeds/recipes/recipe_daily_mail.py
-lib/calibre/calibre/web/feeds/recipes/recipe_daily_telegraph.py
-lib/calibre/calibre/web/feeds/recipes/recipe_danas.py
-lib/calibre/calibre/web/feeds/recipes/recipe_darknet.py
-lib/calibre/calibre/web/feeds/recipes/recipe_de_standaard.py
-lib/calibre/calibre/web/feeds/recipes/recipe_degentenaar.py
-lib/calibre/calibre/web/feeds/recipes/recipe_demorgen_be.py
-lib/calibre/calibre/web/feeds/recipes/recipe_der_standard.py
-lib/calibre/calibre/web/feeds/recipes/recipe_diagonales.py
-lib/calibre/calibre/web/feeds/recipes/recipe_diepresse.py
-lib/calibre/calibre/web/feeds/recipes/recipe_discover_magazine.py
-lib/calibre/calibre/web/feeds/recipes/recipe_dna.py
-lib/calibre/calibre/web/feeds/recipes/recipe_dnevni_avaz.py
-lib/calibre/calibre/web/feeds/recipes/recipe_dnevnik_cro.py
-lib/calibre/calibre/web/feeds/recipes/recipe_e_novine.py
-lib/calibre/calibre/web/feeds/recipes/recipe_ecogeek.py
-lib/calibre/calibre/web/feeds/recipes/recipe_economist.py
-lib/calibre/calibre/web/feeds/recipes/recipe_el_mercurio_chile.py
-lib/calibre/calibre/web/feeds/recipes/recipe_el_pais.py
-lib/calibre/calibre/web/feeds/recipes/recipe_el_universal.py
-lib/calibre/calibre/web/feeds/recipes/recipe_elargentino.py
-lib/calibre/calibre/web/feeds/recipes/recipe_elcronista.py
-lib/calibre/calibre/web/feeds/recipes/recipe_elektrolese.py
-lib/calibre/calibre/web/feeds/recipes/recipe_elmundo.py
-lib/calibre/calibre/web/feeds/recipes/recipe_elperiodico_catalan.py
-lib/calibre/calibre/web/feeds/recipes/recipe_elperiodico_spanish.py
-lib/calibre/calibre/web/feeds/recipes/recipe_eltiempo_hn.py
-lib/calibre/calibre/web/feeds/recipes/recipe_endgadget.py
-lib/calibre/calibre/web/feeds/recipes/recipe_espn.py
-lib/calibre/calibre/web/feeds/recipes/recipe_esquire.py
-lib/calibre/calibre/web/feeds/recipes/recipe_estadao.py
-lib/calibre/calibre/web/feeds/recipes/recipe_exiled.py
-lib/calibre/calibre/web/feeds/recipes/recipe_expansion_spanish.py
-lib/calibre/calibre/web/feeds/recipes/recipe_fastcompany.py
-lib/calibre/calibre/web/feeds/recipes/recipe_faznet.py
-lib/calibre/calibre/web/feeds/recipes/recipe_financial_times.py
-lib/calibre/calibre/web/feeds/recipes/recipe_forbes.py
-lib/calibre/calibre/web/feeds/recipes/recipe_freakonomics.py
-lib/calibre/calibre/web/feeds/recipes/recipe_ftd.py
-lib/calibre/calibre/web/feeds/recipes/recipe_fudzilla.py
-lib/calibre/calibre/web/feeds/recipes/recipe_glas_srpske.py
-lib/calibre/calibre/web/feeds/recipes/recipe_glasgow_herald.py
-lib/calibre/calibre/web/feeds/recipes/recipe_glasjavnosti.py
-lib/calibre/calibre/web/feeds/recipes/recipe_globe_and_mail.py
-lib/calibre/calibre/web/feeds/recipes/recipe_granma.py
-lib/calibre/calibre/web/feeds/recipes/recipe_greader.py
-lib/calibre/calibre/web/feeds/recipes/recipe_guardian.py
-lib/calibre/calibre/web/feeds/recipes/recipe_gva_be.py
-lib/calibre/calibre/web/feeds/recipes/recipe_h1.py
-lib/calibre/calibre/web/feeds/recipes/recipe_h2.py
-lib/calibre/calibre/web/feeds/recipes/recipe_h3.py
-lib/calibre/calibre/web/feeds/recipes/recipe_harpers.py
-lib/calibre/calibre/web/feeds/recipes/recipe_harpers_full.py
-lib/calibre/calibre/web/feeds/recipes/recipe_heise.py
-lib/calibre/calibre/web/feeds/recipes/recipe_hindu.py
-lib/calibre/calibre/web/feeds/recipes/recipe_hln.py
-lib/calibre/calibre/web/feeds/recipes/recipe_hln_be.py
-lib/calibre/calibre/web/feeds/recipes/recipe_hna.py
-lib/calibre/calibre/web/feeds/recipes/recipe_honoluluadvertiser.py
-lib/calibre/calibre/web/feeds/recipes/recipe_honvedelem.py
-lib/calibre/calibre/web/feeds/recipes/recipe_hrt.py
-lib/calibre/calibre/web/feeds/recipes/recipe_huntechnet.py
-lib/calibre/calibre/web/feeds/recipes/recipe_iht.py
-lib/calibre/calibre/web/feeds/recipes/recipe_index_hu.py
-lib/calibre/calibre/web/feeds/recipes/recipe_indy_star.py
-lib/calibre/calibre/web/feeds/recipes/recipe_infobae.py
-lib/calibre/calibre/web/feeds/recipes/recipe_infoworld.py
-lib/calibre/calibre/web/feeds/recipes/recipe_inquirer_net.py
-lib/calibre/calibre/web/feeds/recipes/recipe_instapaper.py
-lib/calibre/calibre/web/feeds/recipes/recipe_intelligencer.py
-lib/calibre/calibre/web/feeds/recipes/recipe_irish_times.py
-lib/calibre/calibre/web/feeds/recipes/recipe_japan_times.py
-lib/calibre/calibre/web/feeds/recipes/recipe_javalobby.py
-lib/calibre/calibre/web/feeds/recipes/recipe_jb_online.py
-lib/calibre/calibre/web/feeds/recipes/recipe_joelonsoftware.py
-lib/calibre/calibre/web/feeds/recipes/recipe_jpost.py
-lib/calibre/calibre/web/feeds/recipes/recipe_jutarnji.py
-lib/calibre/calibre/web/feeds/recipes/recipe_juventudrebelde.py
-lib/calibre/calibre/web/feeds/recipes/recipe_juventudrebelde_english.py
-lib/calibre/calibre/web/feeds/recipes/recipe_kellog_faculty.py
-lib/calibre/calibre/web/feeds/recipes/recipe_kellog_insight.py
-lib/calibre/calibre/web/feeds/recipes/recipe_krstarica.py
-lib/calibre/calibre/web/feeds/recipes/recipe_krstarica_en.py
-lib/calibre/calibre/web/feeds/recipes/recipe_la_cuarta.py
-lib/calibre/calibre/web/feeds/recipes/recipe_la_republica.py
-lib/calibre/calibre/web/feeds/recipes/recipe_la_segunda.py
-lib/calibre/calibre/web/feeds/recipes/recipe_la_tercera.py
-lib/calibre/calibre/web/feeds/recipes/recipe_lamujerdemivida.py
-lib/calibre/calibre/web/feeds/recipes/recipe_lanacion.py
-lib/calibre/calibre/web/feeds/recipes/recipe_lanacion_chile.py
-lib/calibre/calibre/web/feeds/recipes/recipe_laprensa.py
-lib/calibre/calibre/web/feeds/recipes/recipe_laprensa_hn.py
-lib/calibre/calibre/web/feeds/recipes/recipe_laprensa_ni.py
-lib/calibre/calibre/web/feeds/recipes/recipe_latimes.py
-lib/calibre/calibre/web/feeds/recipes/recipe_latribuna.py
-lib/calibre/calibre/web/feeds/recipes/recipe_lavanguardia.py
-lib/calibre/calibre/web/feeds/recipes/recipe_le_monde.py
-lib/calibre/calibre/web/feeds/recipes/recipe_le_temps.py
-lib/calibre/calibre/web/feeds/recipes/recipe_lemonde_dip.py
-lib/calibre/calibre/web/feeds/recipes/recipe_liberation.py
-lib/calibre/calibre/web/feeds/recipes/recipe_linux_magazine.py
-lib/calibre/calibre/web/feeds/recipes/recipe_linuxdevices.py
-lib/calibre/calibre/web/feeds/recipes/recipe_livemint.py
-lib/calibre/calibre/web/feeds/recipes/recipe_lrb.py
-lib/calibre/calibre/web/feeds/recipes/recipe_marca.py
-lib/calibre/calibre/web/feeds/recipes/recipe_mediapart.py
-lib/calibre/calibre/web/feeds/recipes/recipe_miami_herald.py
-lib/calibre/calibre/web/feeds/recipes/recipe_miradasalsur.py
-lib/calibre/calibre/web/feeds/recipes/recipe_mondedurable.py
-lib/calibre/calibre/web/feeds/recipes/recipe_moneynews.py
-lib/calibre/calibre/web/feeds/recipes/recipe_monitor.py
-lib/calibre/calibre/web/feeds/recipes/recipe_moscow_times.py
-lib/calibre/calibre/web/feeds/recipes/recipe_msdnmag_en.py
-lib/calibre/calibre/web/feeds/recipes/recipe_nacional_cro.py
-lib/calibre/calibre/web/feeds/recipes/recipe_nasa.py
-lib/calibre/calibre/web/feeds/recipes/recipe_new_scientist.py
-lib/calibre/calibre/web/feeds/recipes/recipe_new_york_review_of_books.py
-lib/calibre/calibre/web/feeds/recipes/recipe_new_york_review_of_books_no_sub.py
-lib/calibre/calibre/web/feeds/recipes/recipe_new_yorker.py
-lib/calibre/calibre/web/feeds/recipes/recipe_news_times.py
-lib/calibre/calibre/web/feeds/recipes/recipe_newsweek.py
-lib/calibre/calibre/web/feeds/recipes/recipe_newsweek_argentina.py
-lib/calibre/calibre/web/feeds/recipes/recipe_nin.py
-lib/calibre/calibre/web/feeds/recipes/recipe_noaa.py
-lib/calibre/calibre/web/feeds/recipes/recipe_novosti.py
-lib/calibre/calibre/web/feeds/recipes/recipe_nspm.py
-lib/calibre/calibre/web/feeds/recipes/recipe_nspm_int.py
-lib/calibre/calibre/web/feeds/recipes/recipe_nytimes.py
-lib/calibre/calibre/web/feeds/recipes/recipe_nytimes_sub.py
-lib/calibre/calibre/web/feeds/recipes/recipe_nzz_ger.py
-lib/calibre/calibre/web/feeds/recipes/recipe_o_globo.py
-lib/calibre/calibre/web/feeds/recipes/recipe_ourdailybread.py
-lib/calibre/calibre/web/feeds/recipes/recipe_outlook_india.py
-lib/calibre/calibre/web/feeds/recipes/recipe_pagina12.py
-lib/calibre/calibre/web/feeds/recipes/recipe_pcworld_hu.py
-lib/calibre/calibre/web/feeds/recipes/recipe_pescanik.py
-lib/calibre/calibre/web/feeds/recipes/recipe_phd_comics.py
-lib/calibre/calibre/web/feeds/recipes/recipe_philly.py
-lib/calibre/calibre/web/feeds/recipes/recipe_physics_today.py
-lib/calibre/calibre/web/feeds/recipes/recipe_physics_world.py
-lib/calibre/calibre/web/feeds/recipes/recipe_pobjeda.py
-lib/calibre/calibre/web/feeds/recipes/recipe_politico.py
-lib/calibre/calibre/web/feeds/recipes/recipe_politika.py
-lib/calibre/calibre/web/feeds/recipes/recipe_portfolio.py
-lib/calibre/calibre/web/feeds/recipes/recipe_pressonline.py
-lib/calibre/calibre/web/feeds/recipes/recipe_publico.py
-lib/calibre/calibre/web/feeds/recipes/recipe_republika.py
-lib/calibre/calibre/web/feeds/recipes/recipe_reuters.py
-lib/calibre/calibre/web/feeds/recipes/recipe_rga.py
-lib/calibre/calibre/web/feeds/recipes/recipe_rts.py
-lib/calibre/calibre/web/feeds/recipes/recipe_salon.py
-lib/calibre/calibre/web/feeds/recipes/recipe_san_fran_chronicle.py
-lib/calibre/calibre/web/feeds/recipes/recipe_sanjosemercurynews.py
-lib/calibre/calibre/web/feeds/recipes/recipe_science_aas.py
-lib/calibre/calibre/web/feeds/recipes/recipe_science_news.py
-lib/calibre/calibre/web/feeds/recipes/recipe_sciencedaily.py
-lib/calibre/calibre/web/feeds/recipes/recipe_scientific_american.py
-lib/calibre/calibre/web/feeds/recipes/recipe_scott_hanselman.py
-lib/calibre/calibre/web/feeds/recipes/recipe_seattle_times.py
-lib/calibre/calibre/web/feeds/recipes/recipe_security_watch.py
-lib/calibre/calibre/web/feeds/recipes/recipe_serverside.py
-lib/calibre/calibre/web/feeds/recipes/recipe_shacknews.py
-lib/calibre/calibre/web/feeds/recipes/recipe_slashdot.py
-lib/calibre/calibre/web/feeds/recipes/recipe_slate.py
-lib/calibre/calibre/web/feeds/recipes/recipe_smashing.py
-lib/calibre/calibre/web/feeds/recipes/recipe_smh.py
-lib/calibre/calibre/web/feeds/recipes/recipe_soldiers.py
-lib/calibre/calibre/web/feeds/recipes/recipe_spiegel_int.py
-lib/calibre/calibre/web/feeds/recipes/recipe_spiegelde.py
-lib/calibre/calibre/web/feeds/recipes/recipe_st_petersburg_times.py
-lib/calibre/calibre/web/feeds/recipes/recipe_stackoverflow.py
-lib/calibre/calibre/web/feeds/recipes/recipe_starbulletin.py
-lib/calibre/calibre/web/feeds/recipes/recipe_straitstimes.py
-lib/calibre/calibre/web/feeds/recipes/recipe_sueddeutsche.py
-lib/calibre/calibre/web/feeds/recipes/recipe_tanjug.py
-lib/calibre/calibre/web/feeds/recipes/recipe_telegraph_uk.py
-lib/calibre/calibre/web/feeds/recipes/recipe_telepolis.py
-lib/calibre/calibre/web/feeds/recipes/recipe_telepolis_artikel.py
-lib/calibre/calibre/web/feeds/recipes/recipe_teleread.py
-lib/calibre/calibre/web/feeds/recipes/recipe_the_age.py
-lib/calibre/calibre/web/feeds/recipes/recipe_the_budget_fashionista.py
-lib/calibre/calibre/web/feeds/recipes/recipe_the_nation.py
-lib/calibre/calibre/web/feeds/recipes/recipe_the_new_republic.py
-lib/calibre/calibre/web/feeds/recipes/recipe_the_oz.py
-lib/calibre/calibre/web/feeds/recipes/recipe_the_register.py
-lib/calibre/calibre/web/feeds/recipes/recipe_the_scotsman.py
-lib/calibre/calibre/web/feeds/recipes/recipe_thedgesingapore.py
-lib/calibre/calibre/web/feeds/recipes/recipe_theeconomictimes_india.py
-lib/calibre/calibre/web/feeds/recipes/recipe_themarketticker.py
-lib/calibre/calibre/web/feeds/recipes/recipe_theoldfoodie.py
-lib/calibre/calibre/web/feeds/recipes/recipe_theonion.py
-lib/calibre/calibre/web/feeds/recipes/recipe_thestar.py
-lib/calibre/calibre/web/feeds/recipes/recipe_tijd.py
-lib/calibre/calibre/web/feeds/recipes/recipe_time_magazine.py
-lib/calibre/calibre/web/feeds/recipes/recipe_times_online.py
-lib/calibre/calibre/web/feeds/recipes/recipe_tnxm.py
-lib/calibre/calibre/web/feeds/recipes/recipe_tomshardware.py
-lib/calibre/calibre/web/feeds/recipes/recipe_tomshardware_de.py
-lib/calibre/calibre/web/feeds/recipes/recipe_toronto_sun.py
-lib/calibre/calibre/web/feeds/recipes/recipe_tweakers.py
-lib/calibre/calibre/web/feeds/recipes/recipe_twitchfilms.py
-lib/calibre/calibre/web/feeds/recipes/recipe_uncrate.py
-lib/calibre/calibre/web/feeds/recipes/recipe_upi.py
-lib/calibre/calibre/web/feeds/recipes/recipe_usatoday.py
-lib/calibre/calibre/web/feeds/recipes/recipe_usnews.py
-lib/calibre/calibre/web/feeds/recipes/recipe_utne.py
-lib/calibre/calibre/web/feeds/recipes/recipe_vecernji_list.py
-lib/calibre/calibre/web/feeds/recipes/recipe_veintitres.py
-lib/calibre/calibre/web/feeds/recipes/recipe_vijesti.py
-lib/calibre/calibre/web/feeds/recipes/recipe_vnexpress.py
-lib/calibre/calibre/web/feeds/recipes/recipe_volksrant.py
-lib/calibre/calibre/web/feeds/recipes/recipe_vreme.py
-lib/calibre/calibre/web/feeds/recipes/recipe_wash_post.py
-lib/calibre/calibre/web/feeds/recipes/recipe_wikinews_en.py
-lib/calibre/calibre/web/feeds/recipes/recipe_winsupersite.py
-lib/calibre/calibre/web/feeds/recipes/recipe_wired.py
-lib/calibre/calibre/web/feeds/recipes/recipe_woz_die.py
-lib/calibre/calibre/web/feeds/recipes/recipe_wsj.py
-lib/calibre/calibre/web/feeds/recipes/recipe_xkcd.py
-lib/calibre/calibre/web/feeds/recipes/recipe_zaobao.py
-lib/calibre/calibre/web/feeds/recipes/recipe_zdnet.py
-lib/calibre/calibre/web/feeds/recipes/recipe_zeitde.py
+lib/calibre/calibre/web/feeds/recipes/collection.py
+lib/calibre/calibre/web/feeds/recipes/model.py
 lib/calibre/calibre/web/feeds/templates.py
 lib/calibre/calibre/web/fetch/__init__.py
 lib/calibre/calibre/web/fetch/simple.py
@@ -947,6 +689,7 @@ lib/calibre/pyPdf/generic.py
 lib/calibre/pyPdf/pdf.py
 lib/calibre/pyPdf/utils.py
 lib/calibre/pyPdf/xmp.py
+share/calibre/builtin_recipes.xml
 share/calibre/content_server/av.jpg
 share/calibre/content_server/bg_search_box.png
 share/calibre/content_server/btn_search_box.png
@@ -1054,6 +797,7 @@ share/calibre/images/news/beta_en.png
 share/calibre/images/news/blic.png
 share/calibre/images/news/borba.png
 share/calibre/images/news/business_standard.png
+share/calibre/images/news/businessworldin.png
 share/calibre/images/news/carta.png
 share/calibre/images/news/chicago_breaking_news.png
 share/calibre/images/news/chr_mon.png
@@ -1287,7 +1031,271 @@ share/calibre/localization/locales/zh_TW/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/zh_TW/LC_MESSAGES/qt.qm
 share/calibre/localization/stats.pickle
 share/calibre/metadata_sqlite.sql
-share/calibre/recipes.pickle
+share/calibre/recipes/24sata.recipe
+share/calibre/recipes/24sata_rs.recipe
+share/calibre/recipes/7dias.recipe
+share/calibre/recipes/accountancyage.recipe
+share/calibre/recipes/adventuregamers.recipe
+share/calibre/recipes/al_jazeera.recipe
+share/calibre/recipes/ambito.recipe
+share/calibre/recipes/amspec.recipe
+share/calibre/recipes/ap.recipe
+share/calibre/recipes/ars_technica.recipe
+share/calibre/recipes/atlantic.recipe
+share/calibre/recipes/axxon_news.recipe
+share/calibre/recipes/azstarnet.recipe
+share/calibre/recipes/b92.recipe
+share/calibre/recipes/barrons.recipe
+share/calibre/recipes/bbc.recipe
+share/calibre/recipes/bbcvietnamese.recipe
+share/calibre/recipes/beta.recipe
+share/calibre/recipes/beta_en.recipe
+share/calibre/recipes/blic.recipe
+share/calibre/recipes/borba.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/carta.recipe
+share/calibre/recipes/chicago_breaking_news.recipe
+share/calibre/recipes/chicago_tribune.recipe
+share/calibre/recipes/chr_mon.recipe
+share/calibre/recipes/cincinnati_enquirer.recipe
+share/calibre/recipes/clarin.recipe
+share/calibre/recipes/climate_progress.recipe
+share/calibre/recipes/cnn.recipe
+share/calibre/recipes/coding_horror.recipe
+share/calibre/recipes/common_dreams.recipe
+share/calibre/recipes/corriere_della_sera_en.recipe
+share/calibre/recipes/corriere_della_sera_it.recipe
+share/calibre/recipes/courrierinternational.recipe
+share/calibre/recipes/craigslist.recipe
+share/calibre/recipes/criticadigital.recipe
+share/calibre/recipes/cubadebate.recipe
+share/calibre/recipes/cyberpresse.recipe
+share/calibre/recipes/daily_mail.recipe
+share/calibre/recipes/daily_telegraph.recipe
+share/calibre/recipes/danas.recipe
+share/calibre/recipes/darknet.recipe
+share/calibre/recipes/de_standaard.recipe
+share/calibre/recipes/degentenaar.recipe
+share/calibre/recipes/demorgen_be.recipe
+share/calibre/recipes/der_standard.recipe
+share/calibre/recipes/diagonales.recipe
+share/calibre/recipes/diepresse.recipe
+share/calibre/recipes/discover_magazine.recipe
+share/calibre/recipes/dna.recipe
+share/calibre/recipes/dnevni_avaz.recipe
+share/calibre/recipes/dnevnik_cro.recipe
+share/calibre/recipes/e_novine.recipe
+share/calibre/recipes/ecogeek.recipe
+share/calibre/recipes/economist.recipe
+share/calibre/recipes/el_mercurio_chile.recipe
+share/calibre/recipes/el_pais.recipe
+share/calibre/recipes/el_universal.recipe
+share/calibre/recipes/elargentino.recipe
+share/calibre/recipes/elcronista.recipe
+share/calibre/recipes/elektrolese.recipe
+share/calibre/recipes/elmundo.recipe
+share/calibre/recipes/elperiodico_catalan.recipe
+share/calibre/recipes/elperiodico_spanish.recipe
+share/calibre/recipes/eltiempo_hn.recipe
+share/calibre/recipes/endgadget.recipe
+share/calibre/recipes/espn.recipe
+share/calibre/recipes/esquire.recipe
+share/calibre/recipes/estadao.recipe
+share/calibre/recipes/exiled.recipe
+share/calibre/recipes/expansion_spanish.recipe
+share/calibre/recipes/fastcompany.recipe
+share/calibre/recipes/faznet.recipe
+share/calibre/recipes/financial_times.recipe
+share/calibre/recipes/forbes.recipe
+share/calibre/recipes/freakonomics.recipe
+share/calibre/recipes/ftd.recipe
+share/calibre/recipes/fudzilla.recipe
+share/calibre/recipes/glas_srpske.recipe
+share/calibre/recipes/glasgow_herald.recipe
+share/calibre/recipes/glasjavnosti.recipe
+share/calibre/recipes/globe_and_mail.recipe
+share/calibre/recipes/granma.recipe
+share/calibre/recipes/greader.recipe
+share/calibre/recipes/guardian.recipe
+share/calibre/recipes/gva_be.recipe
+share/calibre/recipes/h1.recipe
+share/calibre/recipes/h2.recipe
+share/calibre/recipes/h3.recipe
+share/calibre/recipes/harpers.recipe
+share/calibre/recipes/harpers_full.recipe
+share/calibre/recipes/heise.recipe
+share/calibre/recipes/hindu.recipe
+share/calibre/recipes/hln.recipe
+share/calibre/recipes/hln_be.recipe
+share/calibre/recipes/hna.recipe
+share/calibre/recipes/honoluluadvertiser.recipe
+share/calibre/recipes/honvedelem.recipe
+share/calibre/recipes/hrt.recipe
+share/calibre/recipes/huntechnet.recipe
+share/calibre/recipes/iht.recipe
+share/calibre/recipes/index_hu.recipe
+share/calibre/recipes/indy_star.recipe
+share/calibre/recipes/infobae.recipe
+share/calibre/recipes/infoworld.recipe
+share/calibre/recipes/inquirer_net.recipe
+share/calibre/recipes/instapaper.recipe
+share/calibre/recipes/intelligencer.recipe
+share/calibre/recipes/irish_times.recipe
+share/calibre/recipes/japan_times.recipe
+share/calibre/recipes/javalobby.recipe
+share/calibre/recipes/jb_online.recipe
+share/calibre/recipes/joelonsoftware.recipe
+share/calibre/recipes/jpost.recipe
+share/calibre/recipes/jutarnji.recipe
+share/calibre/recipes/juventudrebelde.recipe
+share/calibre/recipes/juventudrebelde_english.recipe
+share/calibre/recipes/kellog_faculty.recipe
+share/calibre/recipes/kellog_insight.recipe
+share/calibre/recipes/krstarica.recipe
+share/calibre/recipes/krstarica_en.recipe
+share/calibre/recipes/la_cuarta.recipe
+share/calibre/recipes/la_republica.recipe
+share/calibre/recipes/la_segunda.recipe
+share/calibre/recipes/la_tercera.recipe
+share/calibre/recipes/lamujerdemivida.recipe
+share/calibre/recipes/lanacion.recipe
+share/calibre/recipes/lanacion_chile.recipe
+share/calibre/recipes/laprensa.recipe
+share/calibre/recipes/laprensa_hn.recipe
+share/calibre/recipes/laprensa_ni.recipe
+share/calibre/recipes/latimes.recipe
+share/calibre/recipes/latribuna.recipe
+share/calibre/recipes/lavanguardia.recipe
+share/calibre/recipes/le_monde.recipe
+share/calibre/recipes/le_temps.recipe
+share/calibre/recipes/lemonde_dip.recipe
+share/calibre/recipes/liberation.recipe
+share/calibre/recipes/linux_magazine.recipe
+share/calibre/recipes/linuxdevices.recipe
+share/calibre/recipes/livemint.recipe
+share/calibre/recipes/lrb.recipe
+share/calibre/recipes/marca.recipe
+share/calibre/recipes/mediapart.recipe
+share/calibre/recipes/miami_herald.recipe
+share/calibre/recipes/miradasalsur.recipe
+share/calibre/recipes/mondedurable.recipe
+share/calibre/recipes/moneynews.recipe
+share/calibre/recipes/monitor.recipe
+share/calibre/recipes/moscow_times.recipe
+share/calibre/recipes/msdnmag_en.recipe
+share/calibre/recipes/nacional_cro.recipe
+share/calibre/recipes/nasa.recipe
+share/calibre/recipes/new_scientist.recipe
+share/calibre/recipes/new_york_review_of_books.recipe
+share/calibre/recipes/new_york_review_of_books_no_sub.recipe
+share/calibre/recipes/new_yorker.recipe
+share/calibre/recipes/news_times.recipe
+share/calibre/recipes/newsweek.recipe
+share/calibre/recipes/newsweek_argentina.recipe
+share/calibre/recipes/nin.recipe
+share/calibre/recipes/noaa.recipe
+share/calibre/recipes/novosti.recipe
+share/calibre/recipes/nspm.recipe
+share/calibre/recipes/nspm_int.recipe
+share/calibre/recipes/nytimes.recipe
+share/calibre/recipes/nytimes_sub.recipe
+share/calibre/recipes/nzz_ger.recipe
+share/calibre/recipes/o_globo.recipe
+share/calibre/recipes/ourdailybread.recipe
+share/calibre/recipes/outlook_india.recipe
+share/calibre/recipes/pagina12.recipe
+share/calibre/recipes/pcworld_hu.recipe
+share/calibre/recipes/pescanik.recipe
+share/calibre/recipes/phd_comics.recipe
+share/calibre/recipes/philly.recipe
+share/calibre/recipes/physics_today.recipe
+share/calibre/recipes/physics_world.recipe
+share/calibre/recipes/pobjeda.recipe
+share/calibre/recipes/politico.recipe
+share/calibre/recipes/politika.recipe
+share/calibre/recipes/portfolio.recipe
+share/calibre/recipes/pressonline.recipe
+share/calibre/recipes/publico.recipe
+share/calibre/recipes/republika.recipe
+share/calibre/recipes/reuters.recipe
+share/calibre/recipes/rga.recipe
+share/calibre/recipes/rts.recipe
+share/calibre/recipes/salon.recipe
+share/calibre/recipes/san_fran_chronicle.recipe
+share/calibre/recipes/sanjosemercurynews.recipe
+share/calibre/recipes/science_aas.recipe
+share/calibre/recipes/science_news.recipe
+share/calibre/recipes/sciencedaily.recipe
+share/calibre/recipes/scientific_american.recipe
+share/calibre/recipes/scott_hanselman.recipe
+share/calibre/recipes/seattle_times.recipe
+share/calibre/recipes/security_watch.recipe
+share/calibre/recipes/serverside.recipe
+share/calibre/recipes/shacknews.recipe
+share/calibre/recipes/slashdot.recipe
+share/calibre/recipes/slate.recipe
+share/calibre/recipes/smashing.recipe
+share/calibre/recipes/smh.recipe
+share/calibre/recipes/soldiers.recipe
+share/calibre/recipes/spiegel_int.recipe
+share/calibre/recipes/spiegelde.recipe
+share/calibre/recipes/st_petersburg_times.recipe
+share/calibre/recipes/stackoverflow.recipe
+share/calibre/recipes/starbulletin.recipe
+share/calibre/recipes/straitstimes.recipe
+share/calibre/recipes/sueddeutsche.recipe
+share/calibre/recipes/tanjug.recipe
+share/calibre/recipes/telegraph_uk.recipe
+share/calibre/recipes/telepolis.recipe
+share/calibre/recipes/telepolis_artikel.recipe
+share/calibre/recipes/teleread.recipe
+share/calibre/recipes/the_age.recipe
+share/calibre/recipes/the_budget_fashionista.recipe
+share/calibre/recipes/the_nation.recipe
+share/calibre/recipes/the_new_republic.recipe
+share/calibre/recipes/the_oz.recipe
+share/calibre/recipes/the_register.recipe
+share/calibre/recipes/the_scotsman.recipe
+share/calibre/recipes/thedgesingapore.recipe
+share/calibre/recipes/theeconomictimes_india.recipe
+share/calibre/recipes/themarketticker.recipe
+share/calibre/recipes/theoldfoodie.recipe
+share/calibre/recipes/theonion.recipe
+share/calibre/recipes/thestar.recipe
+share/calibre/recipes/tijd.recipe
+share/calibre/recipes/time_magazine.recipe
+share/calibre/recipes/times_online.recipe
+share/calibre/recipes/tnxm.recipe
+share/calibre/recipes/tomshardware.recipe
+share/calibre/recipes/tomshardware_de.recipe
+share/calibre/recipes/toronto_sun.recipe
+share/calibre/recipes/trouw.recipe
+share/calibre/recipes/tweakers.recipe
+share/calibre/recipes/twitchfilms.recipe
+share/calibre/recipes/uncrate.recipe
+share/calibre/recipes/upi.recipe
+share/calibre/recipes/usatoday.recipe
+share/calibre/recipes/usnews.recipe
+share/calibre/recipes/utne.recipe
+share/calibre/recipes/vecernji_list.recipe
+share/calibre/recipes/veintitres.recipe
+share/calibre/recipes/vijesti.recipe
+share/calibre/recipes/vnexpress.recipe
+share/calibre/recipes/volksrant.recipe
+share/calibre/recipes/vreme.recipe
+share/calibre/recipes/wash_post.recipe
+share/calibre/recipes/wikinews_en.recipe
+share/calibre/recipes/winsupersite.recipe
+share/calibre/recipes/wired.recipe
+share/calibre/recipes/woz_die.recipe
+share/calibre/recipes/wsj.recipe
+share/calibre/recipes/xkcd.recipe
+share/calibre/recipes/zaobao.recipe
+share/calibre/recipes/zdnet.recipe
+share/calibre/recipes/zeitde.recipe
 share/calibre/scripts.pickle
 share/calibre/templates/fb2.xsl
 share/calibre/templates/html.css
@@ -1325,6 +1333,7 @@ share/calibre/viewer/jquery_scrollTo.js
 @dirrm share/calibre/viewer/hyphenate
 @dirrm share/calibre/viewer
 @dirrm share/calibre/templates
+@dirrm share/calibre/recipes
 @dirrm share/calibre/localization/locales/zh_TW/LC_MESSAGES
 @dirrm share/calibre/localization/locales/zh_TW
 @dirrm share/calibre/localization/locales/zh_HK/LC_MESSAGES
@@ -1439,6 +1448,7 @@ share/calibre/viewer/jquery_scrollTo.js
 @dirrm lib/calibre/calibre/gui2
 @dirrm lib/calibre/calibre/ebooks/unidecode
 @dirrm lib/calibre/calibre/ebooks/txt
+@dirrm lib/calibre/calibre/ebooks/tcr
 @dirrm lib/calibre/calibre/ebooks/rtf2xml
 @dirrm lib/calibre/calibre/ebooks/rtf
 @dirrm lib/calibre/calibre/ebooks/rb