Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

10 files changed, 261 insertions, 147 deletions

diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD
index 2247f0a8a..2325b8cd7 100755
--- a/libre/iceape-libre/PKGBUILD
+++ b/libre/iceape-libre/PKGBUILD
@@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 _pkgname=${_debname}
 pkgname=${_debname}-libre
 pkgver=${_debver}.${_debrel}
-pkgrel=1
+pkgrel=2
 pkgdesc="A libre version of Debian Iceape, the Internet Suite based on Mozilla Seamonkey."
 arch=('i586' 'i686' 'x86_64' 'mips64el')
 license=('GPL2' 'MPL' 'LGPL')
@@ -35,7 +35,7 @@ md5sums=('40473b4c662975eda865e1fc35c4953b'
          '7266333e31731af8bb50c2eca8d0bd26'
          '25b6fe16ac24cd5c852213e5c1adb272'
          'c395d443a8c4c16880c7322bcf174743'
-         '433b5cd7f02f0ed8861237e877f51ebf')
+         'ed7a06c9e73a9f3e023d7bff9878504b')
 
 build() {
   export QUILT_PATCHES=debian/patches
diff --git a/libre/iceape-libre/libre.patch b/libre/iceape-libre/libre.patch
index d25f8dbf5..9947b1bbe 100755
--- a/libre/iceape-libre/libre.patch
+++ b/libre/iceape-libre/libre.patch
@@ -3,13 +3,13 @@
 @@ -1,23 +1,23 @@
  # Default search engine
 -browser.search.defaultenginename=Google
-+browser.search.defaultenginename=Duck Duck Go (Lite)
++browser.search.defaultenginename=Duck Duck Go (HTML)
  
  # Search engine order (order displayed in the search bar dropdown)s
 -browser.search.order.1=Google
 -browser.search.order.2=Yahoo
 -browser.search.order.3=Bing
-+browser.search.order.1=Duck Duck Go (Lite)
++browser.search.order.1=Duck Duck Go (HTML)
 +browser.search.order.2=Seeks Search
 +browser.search.order.3=YaCy
  
@@ -29,7 +29,7 @@
  # to be searched and the user's search query. Place them in the appropriate location
  # for your locale's URL but do not translate them.
 -browser.search.siteSearchURL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
-+browser.search.siteSearchURL=https://duckduckgo.com/lite/?q=site%3A{moz:domain}+{searchTerms}
++browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms}
  
  # increment this number when anything gets changed in the list below.  This will
  # cause Firefox to re-read these prefs and inject any new handlers into the 
@@ -70,7 +70,7 @@
  //  The first character after a period must be alphabetic.
  
 -pref("keyword.URL", "http://www.google.com/search?ie=UTF-8&oe=utf-8&q=");
-+pref("keyword.URL", "https://duckduckgo.com/lite/?q=");
++pref("keyword.URL", "https://duckduckgo.com/html/?q=");
  pref("keyword.enabled", false);
  pref("general.useragent.locale", "chrome://global/locale/intl.properties");
  pref("general.useragent.compatMode.firefox", false);
@@ -125,7 +125,7 @@
  browser.startup.homepage=about:
  browser.throbber.url=about:
 -browser.search.defaulturl=http://www.google.com/search?q=
-+browser.search.defaulturl=https://duckduckgo.com/lite/?q=
++browser.search.defaulturl=https://duckduckgo.com/html/?q=
  
 -browser.translation.service=http://translate.google.com/translate?prev=/language_tools&u=
 -browser.translation.serviceDomain=translate.google.com
@@ -151,12 +151,12 @@
 @@ -1,10 +1,10 @@
  # Default search engine
 -browser.search.defaultenginename=Google
-+browser.search.defaultenginename=Duck Duck Go (Lite)
++browser.search.defaultenginename=Duck Duck Go (HTML)
  
  # Search engine order (order displayed in the search bar dropdown)
 -browser.search.order.1=Google
 -browser.search.order.2=Yahoo
-+browser.search.order.1=Duck Duck Go (Lite)
++browser.search.order.1=Duck Duck Go (HTML)
 +browser.search.order.2=Seeks Search
  
  # More information about this update link available in the update wizard.
@@ -187,7 +187,7 @@
 -        <DT><A HREF="http://www.google.com/">Google</A>
 -        <DT><A HREF="http://groups.google.com/">Google Groups</A>
 -        <DT><A HREF="http://news.google.com/">Google News</A>
-+        <DT><A HREF="https://duckduckgo.com/lite/">Duck Duck Go (Lite)</A>
++        <DT><A HREF="https://duckduckgo.com/html/">Duck Duck Go (HTML)</A>
      </DL><p>
  
  #unfilter emptyLines
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index fd050fb27..cb4ef9688 100755
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -16,7 +16,7 @@
 _pgo=false
 pkgname=icecat
 pkgver=14.0
-pkgrel=2
+pkgrel=3
 pkgdesc='The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!'
 arch=(i686 x86_64 mips64el)
 license=(GPL2 MPL LGPL)
@@ -79,7 +79,7 @@ md5sums=(
   3117865902d1a20ab61d75707be9888e
   ac29b01c189f20abae2f3eef1618ffc0
   3009b176cc5f9b1e416b1bf7c45b064b
-  72e6bb9ebebe555b4ab961add3df3b27
+  0fe48b455f9b0ad7993071cd766b3bbf
   e81ad01dbc16ba28bf92ba4b7c309ca7
   d93fe402b87cd000a869e1fd6badc6c9
   b320085e7effa2890a79f4f45760614b
diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch
index 18dfcc177..b5a9acc0b 100755
--- a/libre/icecat/libre.patch
+++ b/libre/icecat/libre.patch
@@ -142,13 +142,13 @@ diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/brow
 @@ -1,28 +1,28 @@
  # Default search engine
 -browser.search.defaultenginename=Google
-+browser.search.defaultenginename=Duck Duck Go (Lite)
++browser.search.defaultenginename=Duck Duck Go (HTML)
  
  # Search engine order (order displayed in the search bar dropdown)s
 -browser.search.order.1=Duck Duck Go
 -browser.search.order.2=Google
 -browser.search.order.3=Yahoo
-+browser.search.order.1=Duck Duck Go (Lite)
++browser.search.order.1=Duck Duck Go (HTML)
 +browser.search.order.2=Seeks Search
 +browser.search.order.3=YaCy
  
@@ -169,14 +169,14 @@ diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/brow
  
  # Keyword URL (for location bar searches)
 -keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
-+keyword.URL=https://duckduckgo.com/lite/?q=
++keyword.URL=https://duckduckgo.com/html/?q=
  
  # URL for site-specific search engines
  # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
  # to be searched and the user's search query. Place them in the appropriate location
  # for your locale's URL but do not translate them.
 -browser.search.siteSearchURL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
-+browser.search.siteSearchURL=https://duckduckgo.com/lite/?q=site%3A{moz:domain}+{searchTerms}
++browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms}
  
  # increment this number when anything gets changed in the list below.  This will
  # cause Firefox to re-read these prefs and inject any new handlers into the 
@@ -240,7 +240,7 @@ diff -Nur a/build/pgo/blueprint/elements.html b/build/pgo/blueprint/elements.htm
        <p>
          <a>&lt;a&gt; anchor</a><br>
 -        <a href="http://www.google.com">&lt;a&gt; a + href</a>
-+        <a href="https://duckduckgo.com/lite">&lt;a&gt; a + href</a>
++        <a href="https://duckduckgo.com/html">&lt;a&gt; a + href</a>
        </p>
        <p>
          <abbr title="extended abbr text should show when mouse over">&lt;abbr&gt; abbr - extended text when mouseover.</abbr><br>
@@ -252,7 +252,7 @@ diff -Nur a/dom/ipc/test.xul b/dom/ipc/test.xul
    </toolbar>
  
 -  <browser type="content" src="http://www.google.com/" flex="1" id="page" remote="true"/>
-+  <browser type="content" src="https://duckduckgo.com/lite" flex="1" id="page" remote="true"/>
++  <browser type="content" src="https://duckduckgo.com/html" flex="1" id="page" remote="true"/>
    <label id="messageLog" value="" crop="center"/>
  </window>
 diff -Nur a/layout/ipc/test-ipcbrowser.xul b/layout/ipc/test-ipcbrowser.xul
@@ -263,7 +263,7 @@ diff -Nur a/layout/ipc/test-ipcbrowser.xul b/layout/ipc/test-ipcbrowser.xul
    </toolbar>
  
 -  <browser type="content" src="http://www.google.com/" flex="1" id="content"
-+  <browser type="content" src="https://duckduckgo.com/lite" flex="1" id="content"
++  <browser type="content" src="https://duckduckgo.com/html" flex="1" id="content"
             remote="true"/>
  </window>
 diff -Nur a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js
@@ -296,11 +296,11 @@ diff -Nur a/mobile/locales/en-US/chrome/region.properties b/mobile/locales/en-US
 @@ -1,18 +1,18 @@
  # Default search engine
 -browser.search.defaultenginename=Google
-+browser.search.defaultenginename=Duck Duck Go (Lite)
++browser.search.defaultenginename=Duck Duck Go (HTML)
  
  # Search engine order (order displayed in the search bar dropdown)s
 -browser.search.order.1=Google
-+browser.search.order.1=Duck Duck Go (Lite)
++browser.search.order.1=Duck Duck Go (HTML)
  
  # This is the default set of web based feed handlers shown in the reader
  # selection UI
@@ -315,7 +315,7 @@ diff -Nur a/mobile/locales/en-US/chrome/region.properties b/mobile/locales/en-US
  
  # Keyword URL (for location bar searches)
 -keyword.URL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
-+keyword.URL=https://duckduckgo.com/lite/?q=
++keyword.URL=https://duckduckgo.com/html/?q=
  
  # increment this number when anything gets changed in the list below.  This will
  # cause Firefox to re-read these prefs and inject any new handlers into the
@@ -366,7 +366,7 @@ diff -Nur a/mobile/xul/app/mobile.js b/mobile/xul/app/mobile.js
  
  pref("keyword.enabled", true);
 -pref("keyword.URL", "https://www.google.com/m?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=");
-+pref("keyword.URL","https://duckduckgo.com/lite/?q=");
++pref("keyword.URL","https://duckduckgo.com/html/?q=");
  
  pref("accessibility.typeaheadfind", false);
  pref("accessibility.typeaheadfind.timeout", 5000);
@@ -378,7 +378,7 @@ diff -Nur a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
   */
  
 -pref("keyword.URL", "https://www.google.com/search?ie=UTF-8&oe=utf-8&q=");
-+pref("keyword.URL","https://duckduckgo.com/lite/?q=");
++pref("keyword.URL","https://duckduckgo.com/html/?q=");
  pref("keyword.enabled", false);
  pref("general.useragent.locale", "chrome://global/locale/intl.properties");
  pref("general.useragent.compatMode.firefox", false);
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 185f1c039..78fe9e946 100755
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 _pkgname=iceweasel
 pkgname=iceweasel-libre
 pkgver=${_debver}.${_debrel}
-pkgrel=1
+pkgrel=3
 
 if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
 if $_pgo; then
@@ -57,7 +57,7 @@ md5sums=('3e555026478026987753b4859ec91d3b'
          'eab149c1994ab14392e55af3abb08e80'
          'ac29b01c189f20abae2f3eef1618ffc0'
          'a485a2b5dc544a8a2bd40c985d2e5813'
-         '8768dfc39e9f1057c2956bf4405ae58e'
+         '8686d39ea314c2c7df43aad44279b7f1'
          'abf5ecb74caa857abb42bcfbb3442d9c'
          '0d053487907de4376d67d8f499c5502b'
          '52e52f840a49eb1d14be1c0065b03a93'
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index 7e7b7290f..5b1b94552 100755
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -1,6 +1,6 @@
-diff -urN iceweasel-16.0.orig/browser/app/profile/firefox.js iceweasel-16.0/browser/app/profile/firefox.js
---- iceweasel-16.0.orig/browser/app/profile/firefox.js	2012-10-05 20:01:58.000000000 -0300
-+++ iceweasel-16.0/browser/app/profile/firefox.js	2012-10-11 17:19:44.984225170 -0200
+diff -urN iceweasel-17.0.orig/browser/app/profile/firefox.js iceweasel-17.0/browser/app/profile/firefox.js
+--- iceweasel-17.0.orig/browser/app/profile/firefox.js	2012-10-05 20:01:58.000000000 -0300
++++ iceweasel-17.0/browser/app/profile/firefox.js	2012-11-28 16:33:37.105547392 -0200
 @@ -37,11 +37,11 @@
  // Preferences for AMO integration
  pref("extensions.getAddons.cache.enabled", true);
@@ -27,7 +27,16 @@ diff -urN iceweasel-16.0.orig/browser/app/profile/firefox.js iceweasel-16.0/brow
  pref("extensions.dss.enabled", false);          // Dynamic Skin Switching                                               
  pref("extensions.dss.switchPending", false);    // Non-dynamic switch pending after next
                                                  // restart.
-@@ -327,7 +327,7 @@
+@@ -210,7 +210,7 @@
+ pref("keyword.enabled", true);
+ // Override the default keyword.URL. Empty value means
+ // "use the search service's default engine"
+-pref("keyword.URL", "");
++pref("keyword.URL", "https://duckduckgo.com/html/?q=");
+ 
+ pref("general.skins.selectedSkin", "classic/1.0");
+ 
+@@ -340,7 +340,7 @@
  pref("browser.download.panel.removeFinishedDownloads", false);
  
  // search engines URL
@@ -36,7 +45,7 @@ diff -urN iceweasel-16.0.orig/browser/app/profile/firefox.js iceweasel-16.0/brow
  
  // pointer to the default engine name
  pref("browser.search.defaultenginename",      "chrome://browser-region/locale/region.properties");
-@@ -584,7 +584,7 @@
+@@ -582,7 +582,7 @@
  pref("accessibility.typeaheadfind.flashBar", 1);
  
  // plugin finder service url
@@ -45,61 +54,68 @@ diff -urN iceweasel-16.0.orig/browser/app/profile/firefox.js iceweasel-16.0/brow
  
  // by default we show an infobar message when pages require plugins the user has not installed, or are outdated
  pref("plugins.hide_infobar_for_missing_plugin", false);
-diff -urN iceweasel-14.0.1.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-14.0.1/browser/locales/en-US/chrome/browser-region/region.properties
---- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties	2012-06-01 09:03:48.000000000 -0300
-+++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties	2012-06-15 02:17:00.978636665 -0300
-@@ -1,23 +1,23 @@
+@@ -1184,13 +1184,3 @@
+ // might keep around more than this, but we'll try to get down to this value).
+ // (This is intentionally on the high side; see bug 746055.)
+ pref("image.mem.max_decoded_image_kb", 256000);
+-
+-// Example social provider
+-pref("social.manifest.facebook", "{\"origin\":\"https://www.facebook.com\",\"name\":\"Facebook Messenger\",\"workerURL\":\"https://www.facebook.com/desktop/fbdesktop2/socialfox/fbworker.js.php\",\"iconURL\":\"data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8%2F9hAAAAX0lEQVQ4jWP4%2F%2F8%2FAyUYTFhHzjgDxP9JxGeQDSBVMxgTbUBCxer%2Fr999%2BQ8DJBuArJksA9A10s8AXIBoA0B%2BR%2FY%2FjD%2BEwoBoA1yT5v3PbdmCE8MAshhID%2FUMoDgzUYIBj0Cgi7ar4coAAAAASUVORK5CYII%3D\",\"sidebarURL\":\"https://www.facebook.com/desktop/fbdesktop2/?socialfox=true\"}");
+-// Comma-separated list of nsIURI::prePaths that are allowed to activate
+-// built-in social functionality.
+-pref("social.activation.whitelist", "https://www.facebook.com");
+-pref("social.sidebar.open", true);
+-pref("social.sidebar.unload_timeout_ms", 10000);
+-pref("social.active", false);
+-pref("social.toast-notifications.enabled", true);
+diff -urN iceweasel-17.0.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-17.0/browser/locales/en-US/chrome/browser-region/region.properties
+--- iceweasel-17.0.orig/browser/locales/en-US/chrome/browser-region/region.properties	2012-11-20 00:45:50.000000000 -0200
++++ iceweasel-17.0/browser/locales/en-US/chrome/browser-region/region.properties	2012-11-28 16:25:11.411107262 -0200
+@@ -3,25 +3,18 @@
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ 
  # Default search engine
 -browser.search.defaultenginename=Google
-+browser.search.defaultenginename=Duck Duck Go (Lite)
++browser.search.defaultenginename=Duck Duck Go (HTML)
  
  # Search engine order (order displayed in the search bar dropdown)s
 -browser.search.order.1=Google
 -browser.search.order.2=Yahoo
 -browser.search.order.3=Bing
-+browser.search.order.1=Duck Duck Go (Lite)
-+browser.search.order.2=Seeks Search
-+browser.search.order.3=YaCy
- 
- # This is the default set of web based feed handlers shown in the reader
- # selection UI
+-
+-# This is the default set of web based feed handlers shown in the reader
+-# selection UI
 -browser.contentHandlers.types.0.title=Google
 -browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s
 -browser.contentHandlers.types.1.title=My Yahoo!
 -browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
-+browser.contentHandlers.types.0.title=
-+browser.contentHandlers.types.0.uri=about:blank
-+browser.contentHandlers.types.1.title=
-+browser.contentHandlers.types.1.uri=about:blank
++browser.search.order.1=Duck Duck Go (HTML)
++browser.search.order.2=Seeks Search
++browser.search.order.3=YaCy
  
  # URL for site-specific search engines
  # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
  # to be searched and the user's search query. Place them in the appropriate location
  # for your locale's URL but do not translate them.
 -browser.search.siteSearchURL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
-+browser.search.siteSearchURL=https://duckduckgo.com/lite/?q=site%3A{moz:domain}+{searchTerms}
++browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms}
  
  # increment this number when anything gets changed in the list below.  This will
  # cause Firefox to re-read these prefs and inject any new handlers into the 
-@@ -27,19 +27,19 @@
+@@ -30,20 +23,10 @@
+ # don't make any spelling errors here.
  gecko.handlerService.defaultHandlersVersion=3
  
- # The default set of protocol handlers for webcal:
+-# The default set of protocol handlers for webcal:
 -gecko.handlerService.schemes.webcal.0.name=30 Boxes
 -gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s
-+gecko.handlerService.schemes.webcal.0.name=
-+gecko.handlerService.schemes.webcal.0.uriTemplate=about:blank
- 
- # The default set of protocol handlers for mailto:
+-
+-# The default set of protocol handlers for mailto:
 -gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
 -gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s 
 -gecko.handlerService.schemes.mailto.1.name=Gmail
 -gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s
-+gecko.handlerService.schemes.mailto.0.name=
-+gecko.handlerService.schemes.mailto.0.uriTemplate=about:blank
-+gecko.handlerService.schemes.mailto.1.name=
-+gecko.handlerService.schemes.mailto.1.uriTemplate=about:blank
- 
+-
  # The default set of protocol handlers for irc:
 -gecko.handlerService.schemes.irc.0.name=Mibbit
 -gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s
@@ -112,31 +128,31 @@ diff -urN iceweasel-14.0.1.orig/browser/locales/en-US/chrome/browser-region/regi
 +gecko.handlerService.schemes.ircs.0.name=Freenode
 +gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/
 diff -urN iceweasel-13.0.orig/build/pgo/blueprint/elements.html iceweasel-13.0/build/pgo/blueprint/elements.html
---- mozilla-build.orig/build/pgo/blueprint/elements.html	2012-06-01 09:03:49.000000000 -0300
-+++ mozilla-build/build/pgo/blueprint/elements.html	2012-06-05 20:37:22.059133787 -0300
+--- iceweasel-13.0.orig/build/pgo/blueprint/elements.html	2012-06-01 09:03:49.000000000 -0300
++++ iceweasel-13.0/build/pgo/blueprint/elements.html		2012-06-05 20:37:22.059133787 -0300
 @@ -143,7 +143,7 @@
        </p>
        <p>
          <a>&lt;a&gt; anchor</a><br>
 -        <a href="http://www.google.com">&lt;a&gt; a + href</a>
-+        <a href="https://duckduckgo.com/lite">&lt;a&gt; a + href</a>
++        <a href="https://duckduckgo.com/html">&lt;a&gt; a + href</a>
        </p>
        <p>
          <abbr title="extended abbr text should show when mouse over">&lt;abbr&gt; abbr - extended text when mouseover.</abbr><br>
 diff -urN iceweasel-13.0.orig/dom/ipc/test.xul iceweasel-13.0/dom/ipc/test.xul
---- mozilla-build.orig/dom/ipc/test.xul	2012-06-01 09:03:55.000000000 -0300
-+++ mozilla-build/dom/ipc/test.xul	2012-06-05 20:40:59.453890004 -0300
+--- iceweasel-13.0.orig/dom/ipc/test.xul	2012-06-01 09:03:55.000000000 -0300
++++ iceweasel-13.0/dom/ipc/test.xul		2012-06-05 20:40:59.453890004 -0300
 @@ -294,6 +294,6 @@
                 oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
    </toolbar>
  
 -  <browser type="content" src="http://www.google.com/" flex="1" id="page" remote="true"/>
-+  <browser type="content" src="https://duckduckgo.com/lite" flex="1" id="page" remote="true"/>
++  <browser type="content" src="https://duckduckgo.com/html" flex="1" id="page" remote="true"/>
    <label id="messageLog" value="" crop="center"/>
  </window>
 diff -Naur iceweasel-14.0.1.orig/mobile/android/app/mobile.js iceweasel-14.0.1.orig/mobile/android/app/mobile.js
---- mozilla-build.orig/mobile/android/app/mobile.js	2012-07-12 14:27:37.000000000 -0300
-+++ mozilla-build/mobile/android/app/mobile.js		2012-07-17 22:14:47.293560718 -0300
+--- iceweasel-14.0.1.orig/mobile/android/app/mobile.js	2012-07-12 14:27:37.000000000 -0300
++++ iceweasel-14.0.1/mobile/android/app/mobile.js	2012-07-17 22:14:47.293560718 -0300
 @@ -226,13 +226,13 @@
  /* preferences for the Get Add-ons pane */
  pref("extensions.getAddons.cache.enabled", true);
@@ -163,24 +179,24 @@ diff -Naur iceweasel-14.0.1.orig/mobile/android/app/mobile.js iceweasel-14.0.1.o
  
  pref("keyword.enabled", true);
 -pref("keyword.URL", "");
-+pref("keyword.URL", "https://duckduckgo.com/lite/?q=");
++pref("keyword.URL", "https://duckduckgo.com/html/?q=");
  
  pref("accessibility.typeaheadfind", false);
  pref("accessibility.typeaheadfind.timeout", 5000);
 diff -urN iceweasel-13.0.orig/layout/ipc/test-ipcbrowser.xul iceweasel-13.0/layout/ipc/test-ipcbrowser.xul
---- mozilla-build.orig/layout/ipc/test-ipcbrowser.xul	2012-06-01 09:04:06.000000000 -0300
-+++ mozilla-build/layout/ipc/test-ipcbrowser.xul	2012-06-05 20:44:00.714006926 -0300
+--- iceweasel-13.0.orig/layout/ipc/test-ipcbrowser.xul	2012-06-01 09:04:06.000000000 -0300
++++ iceweasel-13.0/layout/ipc/test-ipcbrowser.xul	2012-06-05 20:44:00.714006926 -0300
 @@ -69,6 +69,6 @@
         label="setViewportScale"/>
    </toolbar>
  
 -  <browser type="content" src="http://www.google.com/" flex="1" id="content"
-+  <browser type="content" src="https://duckduckgo.com/lite" flex="1" id="content"
++  <browser type="content" src="https://duckduckgo.com/html" flex="1" id="content"
             remote="true"/>
  </window>
 diff -urN iceweasel-14.0.1.orig/mobile/xul/app/mobile.js iceweasel-14.0.1/mobile/xul/app/mobile.js
---- mozilla-build.orig/mobile/xul/app/mobile.js	2012-06-01 09:04:14.000000000 -0300
-+++ mozilla-build/mobile/xul/app/mobile.js	2012-06-05 20:48:20.193241600 -0300
+--- iceweasel-14.0.1.orig/mobile/xul/app/mobile.js	2012-06-01 09:04:14.000000000 -0300
++++ iceweasel-14.0.1/mobile/xul/app/mobile.js		2012-06-05 20:48:20.193241600 -0300
 @@ -221,13 +221,12 @@
  /* preferences for the Get Add-ons pane */
  pref("extensions.getAddons.cache.enabled", true);
@@ -206,92 +222,66 @@ diff -urN iceweasel-14.0.1.orig/mobile/xul/app/mobile.js iceweasel-14.0.1/mobile
  
  pref("keyword.enabled", true);
 -pref("keyword.URL", "https://www.google.com/m?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=");
-+pref("keyword.URL", "https://duckduckgo.com/lite/?q=");
++pref("keyword.URL", "https://duckduckgo.com/html/?q=");
  
  pref("accessibility.typeaheadfind", false);
  pref("accessibility.typeaheadfind.timeout", 5000);
-diff -urN iceweasel-13.0.orig/mobile/locales/en-US/chrome/region.properties iceweasel-13.0/mobile/locales/en-US/chrome/region.properties
---- mozilla-release.orig/mobile/locales/en-US/chrome/region.properties	2012-06-01 09:04:14.000000000 -0300
-+++ mozilla-release/mobile/locales/en-US/chrome/region.properties	2012-06-15 02:17:43.446130868 -0300
-@@ -1,18 +1,18 @@
+diff -urN iceweasel-17.0.orig/mobile/locales/en-US/chrome/region.properties iceweasel-17.0/mobile/locales/en-US/chrome/region.properties
+--- iceweasel-17.0.orig/mobile/locales/en-US/chrome/region.properties	2012-11-20 00:46:15.000000000 -0200
++++ iceweasel-17.0/mobile/locales/en-US/chrome/region.properties	2012-11-28 12:42:29.600175386 -0200
+@@ -3,34 +3,10 @@
+ # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ 
  # Default search engine
 -browser.search.defaultenginename=Google
-+browser.search.defaultenginename=Duck Duck Go (Lite)
++browser.search.defaultenginename=Duck Duck Go (HTML)
  
  # Search engine order (order displayed in the search bar dropdown)s
 -browser.search.order.1=Google
-+browser.search.order.1=Duck Duck Go (Lite)
- 
- # This is the default set of web based feed handlers shown in the reader
- # selection UI
+-
+-# This is the default set of web based feed handlers shown in the reader
+-# selection UI
 -browser.contentHandlers.types.0.title=My Yahoo
 -browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s
 -browser.contentHandlers.types.1.title=Google
 -browser.contentHandlers.types.1.uri=http://fusion.google.com/add?feedurl=%s
-+browser.contentHandlers.types.0.title=
-+browser.contentHandlers.types.0.uri=about:blank
-+browser.contentHandlers.types.1.title=
-+browser.contentHandlers.types.1.uri=about:blank
++browser.search.order.1=Duck Duck Go (HTML)
  
  # Keyword URL (for location bar searches)
 -keyword.URL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
-+keyword.URL=https://duckduckgo.com/lite/?q=site%3A{moz:domain}+{searchTerms}
- 
- # increment this number when anything gets changed in the list below.  This will
- # cause Firefox to re-read these prefs and inject any new handlers into the
-@@ -22,11 +22,11 @@
- gecko.handlerService.defaultHandlersVersion=2
- 
- # The default set of protocol handlers for webcal:
+-
+-# increment this number when anything gets changed in the list below.  This will
+-# cause Firefox to re-read these prefs and inject any new handlers into the
+-# profile database.  Note that "new" is defined as "has a different URL"; this
+-# means that it's not possible to update the name of existing handler, so
+-# don't make any spelling errors here.
+-gecko.handlerService.defaultHandlersVersion=2
+-
+-# The default set of protocol handlers for webcal:
 -gecko.handlerService.schemes.webcal.0.name=30 Boxes
 -gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s
-+gecko.handlerService.schemes.webcal.0.name=
-+gecko.handlerService.schemes.webcal.0.uriTemplate=about:blank
- 
- # The default set of protocol handlers for mailto:
+-
+-# The default set of protocol handlers for mailto:
 -gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
 -gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s
 -gecko.handlerService.schemes.mailto.1.name=Gmail
 -gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s
-+gecko.handlerService.schemes.mailto.0.name=
-+gecko.handlerService.schemes.mailto.0.uriTemplate=about:blank
-+gecko.handlerService.schemes.mailto.1.name=
-+gecko.handlerService.schemes.mailto.1.uriTemplate=about:blank
++keyword.URL=https://duckduckgo.com/html/?q=
 diff -urN iceweasel-14.0.orig/modules/libpref/src/init/all.js iceweasel-14.0/modules/libpref/src/init/all.js
---- mozilla-build.orig/modules/libpref/src/init/all.js	2012-06-01 09:04:16.000000000 -0300
-+++ mozilla-build/modules/libpref/src/init/all.js	2012-06-05 20:55:41.569045759 -0300
+--- iceweasel-14.0.orig/modules/libpref/src/init/all.js	2012-06-01 09:04:16.000000000 -0300
++++ iceweasel-14.0/modules/libpref/src/init/all.js	2012-06-05 20:55:41.569045759 -0300
 @@ -47,7 +47,7 @@
  // SYNTAX HINTS:  dashes are delimiters.  Use underscores instead.
  //  The first character after a period must be alphabetic.
  
 -pref("keyword.URL", "https://www.google.com/search?ie=UTF-8&oe=utf-8&q=");
-+pref("keyword.URL", "https://duckduckgo.com/lite/?q=");
++pref("keyword.URL", "https://duckduckgo.com/html/?q=");
  pref("keyword.enabled", false);
  pref("general.useragent.locale", "chrome://global/locale/intl.properties");
  pref("general.useragent.compatMode.firefox", false);
-diff -urN iceweasel-13.0.orig/toolkit/locales/en-US/chrome/global-region/region.properties iceweasel-13.0/toolkit/locales/en-US/chrome/global-region/region.properties
---- mozilla-build.orig/toolkit/locales/en-US/chrome/global-region/region.properties	2012-06-01 09:04:20.000000000 -0300
-+++ mozilla-build/toolkit/locales/en-US/chrome/global-region/region.properties	2012-06-05 20:58:59.068158482 -0300
-@@ -4,10 +4,10 @@
- pluginStartupMessage=Starting Plugin for type
- 
- # plug-ins URLs
--more_plugins_label=mozilla.org
--more_plugins_url=https://pfs.mozilla.org/plugins/
--pluginupdates_label=mozilla.com/plugincheck
--pluginupdates_url=http://www.mozilla.com/plugincheck/
--plugindoc_label=plugindoc.mozdev.org
--plugindoc_url=http://plugindoc.mozdev.org/
-+more_plugins_label=
-+more_plugins_url=about:blank
-+pluginupdates_label=
-+pluginupdates_url=about:blank
-+plugindoc_label=
-+plugindoc_url=about:blank
- 
 diff -urN iceweasel-14.0.1.orig/browser/locales/generic/profile/bookmarks.html.in iceweasel-14.0.1/browser/locales/generic/profile/bookmarks.html.in
---- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in	2012-06-01 09:03:48.000000000 -0300
-+++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in	2012-06-15 22:54:08.446274144 -0300
+--- iceweasel-14.0.1.orig/browser/locales/generic/profile/bookmarks.html.in	2012-06-01 09:03:48.000000000 -0300
++++ iceweasel-14.0.1/browser/locales/generic/profile/bookmarks.html.in		2012-06-15 22:54:08.446274144 -0300
 @@ -11,13 +11,20 @@
      <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3>
  <DD>@bookmarks_toolbarfolder_description@
@@ -320,8 +310,8 @@ diff -urN iceweasel-14.0.1.orig/browser/locales/generic/profile/bookmarks.html.i
      </DL><p>
  </DL><p>
 diff -urN iceweasel-13.0.orig/browser/base/content/abouthome/aboutHome.js iceweasel-13.0/browser/base/content/abouthome/aboutHome.js
---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js	2012-06-01 09:03:47.000000000 -0300
-+++ mozilla-release/browser/base/content/abouthome/aboutHome.js	2012-06-13 18:07:51.217531774 -0300
+--- iceweasel-13.0.orig/browser/base/content/abouthome/aboutHome.js	2012-06-01 09:03:47.000000000 -0300
++++ iceweasel-13.0/browser/base/content/abouthome/aboutHome.js		2012-06-13 18:07:51.217531774 -0300
 @@ -38,104 +38,6 @@
   *
   * ***** END LICENSE BLOCK ***** */
diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD
index 80537f26f..164cd19e9 100644
--- a/libre/kdebase-runtime-libre/PKGBUILD
+++ b/libre/kdebase-runtime-libre/PKGBUILD
@@ -6,7 +6,7 @@
 _pkgname=kdebase-runtime
 pkgname=kdebase-runtime-libre
 pkgver=4.9.3
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Plugins and applications necessary for the running of KDE applications (without non-privacy search providers)"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kde/kde-runtime'
@@ -24,8 +24,10 @@ conflicts=("${_pkgname}")
 provides=("${_pkgname}=${pkgver}")
 install="${_pkgname}.install"
 source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz"
+        'duckduckgo_html.desktop'
         'duckduckgo_lite.desktop')
 sha1sums=('5245c1152680ad22dff21c44dad531eda736e769'
+          'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd'
           '265d4ca95c3a022b5f6f1d5daea6f8e3a25dee85')
 
 build() {
@@ -34,6 +36,9 @@ build() {
 # Removing non-privacy search providers 
     rm -v kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders/{7digital,acronym,altavista,amazon{,_mp3},amg,austronaut,backports,baidu,bing,blip,cia,dbug,deb,duckduckgo{,_info,_shopping},facebook,ecosia,feedster,flickr,flickrcc,froogle,google,google_advanced,google_code,google_groups,google_images,google_lucky,google_maps,google_movie,google_news,gracenote,imdb,jeeves,katatudo,magnatune,metacrawler,msdn,nl-telephone,nl-teletekst,python,rpmfind,tvtome,uspto,vimeo,vivisimo,voila,yahoo,yahoo_image,yahoo_local,yahoo_shopping,yahoo_video,youtube}.desktop
 
+# Adding DuckDuckGo HTML
+    cp -v duckduckgo_html.desktop "kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders"
+
 # Adding DuckDuckGo Lite
     cp -v duckduckgo_lite.desktop "kde-runtime-${pkgver}/kurifilter-plugins/ikws/searchproviders"
 
diff --git a/libre/kdebase-runtime-libre/duckduckgo_html.desktop b/libre/kdebase-runtime-libre/duckduckgo_html.desktop
new file mode 100644
index 000000000..ba6a602ad
--- /dev/null
+++ b/libre/kdebase-runtime-libre/duckduckgo_html.desktop
@@ -0,0 +1,113 @@
+[Desktop Entry]
+Charset=
+Hidden=false
+Keys=duckduckgo,dd,dukgo
+Name=Duck Duck Go HTML
+Name[ar]=Duck Duck Go HTML
+Name[ast]=Duck Duck Go HTML
+Name[bg]=Duck Duck Go HTML
+Name[bn]=Duck Duck Go HTML
+Name[bs]=Dak dak go HTML
+Name[ca]=Duck Duck Go HTML
+Name[ca@valencia]=Duck Duck Go HTML
+Name[cs]=Duck Duck Go HTML
+Name[da]=Duck Duck Go HTML
+Name[de]=Duck Duck Go HTML
+Name[el]=Duck Duck Go HTML
+Name[en_GB]=Duck Duck Go HTML
+Name[eo]=Duck Duck Go HTML
+Name[es]=Duck Duck Go HTML
+Name[et]=Duck Duck Go HTML
+Name[eu]=Duck Duck Go HTML
+Name[fa]=Duck Duck Go HTML
+Name[fi]=Duck Duck Go HTML
+Name[fr]=Duck Duck Go HTML
+Name[ga]=Duck Duck Go HTML
+Name[gl]=Duck Duck Go HTML
+Name[gu]=Duck Duck Go HTML
+Name[he]=Duck Duck Go HTML
+Name[hi]=Duck Duck Go HTML
+Name[hr]=Duck Duck Go HTML
+Name[hu]=Duck Duck Go HTML
+Name[ia]=Duck Duck Go HTML
+Name[id]=Duck Duck Go HTML
+Name[is]=Duck Duck Go HTML
+Name[it]=Duck Duck Go HTML
+Name[ja]=Duck Duck Go HTML
+Name[kk]=Duck Duck Go HTML
+Name[km]=Duck Duck Go HTML
+Name[kn]=Duck Duck Go HTML
+Name[ko]=Duck Duck Go HTML
+Name[lt]=Duck Duck Go HTML
+Name[lv]=Duck Duck Go HTML
+Name[ml]=Duck Duck Go HTML
+Name[nb]=Duck Duck Go HTML
+Name[nds]=Duck Duck Go HTML
+Name[nl]=Duck Duck Go HTML
+Name[nn]=Duck Duck Go HTML
+Name[pa]=Duck Duck Go HTML
+Name[pl]=Duck Duck Go HTML
+Name[pt]=Duck Duck Go HTML
+Name[pt_BR]=Duck Duck Go HTML
+Name[ro]=Duck Duck Go HTML
+Name[ru]=Поиск Duck Duck Go HTML
+Name[si]=Duck Duck Go HTML
+Name[sk]=Duck Duck Go HTML
+Name[sl]=Duck Duck Go HTML
+Name[sr]=Duck Duck Go HTML
+Name[sr@ijekavian]=Duck Duck Go HTML
+Name[sr@ijekavianlatin]=Duck Duck Go HTML
+Name[sr@latin]=Duck Duck Go HTML
+Name[sv]=Duck Duck Go HTML
+Name[tg]=Duck Duck Go HTML
+Name[th]=Duck Duck Go HTML
+Name[tr]=Duck Duck Go HTML
+Name[ug]=Duck Duck Go HTML
+Name[uk]=Duck Duck Go HTML
+Name[vi]=Duck Duck Go HTML
+Name[wa]=Duck Duck Go HTML
+Name[x-test]=xxDuck Duck Go HTMLxx
+Name[zh_CN]=Duck Duck Go HTML
+Name[zh_TW]=Duck Duck Go HTML
+Query=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[bg]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[bn]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[ca]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[cs]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[da]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[de]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[el]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[eo]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[es]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[et]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[fi]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[fr]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[gl]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[hi]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[hu]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[ia]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[it]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[kk]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[km]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[nb]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[nl]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[pa]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[pl]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[pt]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[pt_BR]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[ro]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[ru]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[sl]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[sr]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[sr@ijekavian]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[sr@ijekavianlatin]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[sr@latin]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[sv]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[tr]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[uk]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[wa]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[x-test]=xxhttp://duckduckgo.com/html/?q=\\{@}&t=KDExx
+Query[zh_CN]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+Query[zh_TW]=http://duckduckgo.com/html/?q=\\{@}&t=KDE
+ServiceTypes=SearchProvider
+Type=Service
diff --git a/libre/kdebase-runtime-libre/duckduckgo_lite.desktop b/libre/kdebase-runtime-libre/duckduckgo_lite.desktop
index 2b875b4c1..0da670dbe 100644
--- a/libre/kdebase-runtime-libre/duckduckgo_lite.desktop
+++ b/libre/kdebase-runtime-libre/duckduckgo_lite.desktop
@@ -1,13 +1,13 @@
 [Desktop Entry]
 Charset=
 Hidden=false
-Keys=duckduckgo,dd,dukgo
+Keys=duckduckgolite,ddlite,dukgolite
 Name=Duck Duck Go Lite
 Name[ar]=Duck Duck Go Lite
 Name[ast]=Duck Duck Go Lite
 Name[bg]=Duck Duck Go Lite
 Name[bn]=Duck Duck Go Lite
-Name[bs]=Dak dak go lite
+Name[bs]=Dak dak go Lite
 Name[ca]=Duck Duck Go Lite
 Name[ca@valencia]=Duck Duck Go Lite
 Name[cs]=Duck Duck Go Lite
diff --git a/~fauno/pandoc/PKGBUILD b/~fauno/pandoc/PKGBUILD
index d3b88d3a0..18e249a47 100755
--- a/~fauno/pandoc/PKGBUILD
+++ b/~fauno/pandoc/PKGBUILD
@@ -15,6 +15,9 @@ options=(strip !makeflags !distcc)
 source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig} SRCBUILD)
 conflicts=('haskell-pandoc')
 optdepends=('texlive-most: for pdf creation')
+md5sums=('912abc4574aea3c5203eff1b02ceafa9'
+         '7ac798d62f253535a2e194af5aa1c3c3'
+         'e632f8c06be8284e17329a5d1c459e3b')
 
 # PKGBUILD functions
 build() {
@@ -24,24 +27,30 @@ build() {
    while read _hkpkg; do
        pushd ${srcdir}/${pkgname}-${pkgver}/${_hkpkg} >/dev/null
 
-       extra="--prefix=${srcdir}/build/usr"
+       msg2 "Building $_hkpkg"
+
        case $_hkpkg in
         $pkgname-$pkgver)
-          extra="--flags=\"executable -library\" --prefix=/usr --libdir=${srcdir}/build/usr/lib -v" ;;
-        citeproc-hs-*)
-          extra="--flags=\"embed_data_files\" --prefix=${srcdir}/build/usr -v" ;;
-       esac
+         HOME=${srcdir}/${pkgname}-${pkgver} \
+         cabal configure --flags='-library' \
+                         --prefix=/usr \
+                         --libdir=${srcdir}/build/usr/lib -v
 
-       msg2 "Configuring $_hkpkg with $extra"
-       if [ "$_hkpkg" != "$pkgname-$pkgver" ]; then
          HOME=${srcdir}/${pkgname}-${pkgver} \
-         cabal install $extra
-       else 
+         cabal build
+         ;;
+
+        citeproc-hs-*)
          HOME=${srcdir}/${pkgname}-${pkgver} \
-         cabal configure $extra
+         cabal install --flags='embed_data_files' \
+                       --prefix=${srcdir}/build/usr -v
+         ;;
+
+        *)
          HOME=${srcdir}/${pkgname}-${pkgver} \
-         cabal build
-       fi
+         cabal install --prefix=${srcdir}/build/usr
+         ;;
+       esac
 
        popd >/dev/null
    done <BUILDORDER
@@ -63,6 +72,3 @@ package() {
   find ${pkgdir}/usr/share -type f -exec chmod 644 {} \;
   find ${pkgdir}/usr/share -type d -exec chmod 755 {} \;
 }
-md5sums=('912abc4574aea3c5203eff1b02ceafa9'
-         '7ac798d62f253535a2e194af5aa1c3c3'
-         'e632f8c06be8284e17329a5d1c459e3b')