fpkg -e "tar.bz2" ${PYCAIRO} ${CAIRO_URL}
fpkg -m gnome ${PYGTK}
+fpkg -m gnome ${ADWAITA_ICON_THEME}
+
fpkg -m gnu ${EMACS}
fpkg -m hv ${MMM_MODE}
fpkg -e "tar.gz" ${HVCLOCK} "http://www.hugovil.com/repository/hvclock"
fpkg -m gnome ${LIBXKLAVIER}
fpkg -m gnome ${LIBGLADE}
fpkg -m gnome ${GCONF}
+
+fpkg -e "txt" ${CERTDATA} "http://anduin.linuxfromscratch.org/sources/other"
+fpkg -e "tar.gz" ${P11KIT} "http://p11-glue.freedesktop.org/releases"
+fpkg -m gnome ${GCR}
fpkg -m gnome ${GNOME_KEYRING}
fpkg -m gnome ${LIBSOUP}
fpkg -e "tar.gz" ${XSCREENSAVER} "http://www.jwz.org/xscreensaver"
fpkg -m sf -s "ghostscript" ${GHOSTSCRIPT_FONTS_OTHER}
fpkg -e "tar.gz" ${LIBSPECTRE} "http://libspectre.freedesktop.org/releases"
fpkg -e "tar.xz" ${IMAGE_MAGICK} "ftp://ftp.imagemagick.org/pub/ImageMagick"
-fpkg -e "tar.gz" ${VIEWNIOR} "http://cloud.github.com/downloads/xsisqox/Viewnior"
+fpkg -e "tar.gz" ${EVIV2} "http://www.exiv2.org"
+fpkg -e "tar.gz" ${VIEWNIOR} "https://github.com/xsisqox/Viewnior/archive"
+
fpkg -e "tar.xz" -m fd -s "none" ${POPPLER}
fpkg -m gnome ${LIBCROCO}
fpkg -m gnome ${LIBRSVG}