Merge branch 'master' of ssh://gparabola/srv/git/abslibre

6 files changed, 163 insertions, 4 deletions

diff --git a/libre/blackbox-libre/PKGBUILD b/libre/blackbox-libre/PKGBUILD
index fdddc645c..c76d7cba5 100644
--- a/libre/blackbox-libre/PKGBUILD
+++ b/libre/blackbox-libre/PKGBUILD
@@ -7,7 +7,7 @@
 _pkgname=blackbox
 pkgname=${_pkgname}-libre
 pkgver=0.70.1
-pkgrel=10
+pkgrel=10.1
 pkgdesc="A window manager for X11 without non-free programs on menu"
 url="http://${_pkgname}wm.sourceforge.net/"
 arch=('i686' 'x86_64')
@@ -28,7 +28,7 @@ md5sums=('2d173b95ca5e64ef478c6a5d2deee9df'
          '69c5a5e981b087b2d8267cab996b48dd'
          'e7fb0d5bfd95820c0194ec73df66dadc'
          '3b92ad246f07126dd55ae9634d6e875e'
-         'bdc49afe527880c8c1a3df13775e55b2')
+         'f4fefa5f25c65c5d9a601e9c14646757')
 
 build() {
   cd ${srcdir}/${_pkgname}-${pkgver}
diff --git a/libre/blackbox-libre/menu b/libre/blackbox-libre/menu
index 4ad14cf8b..9cba27d16 100644
--- a/libre/blackbox-libre/menu
+++ b/libre/blackbox-libre/menu
@@ -66,13 +66,17 @@
     [exec] (Image Magick) {display}
   [end]
 
-  [submenu] (GNUzilla and Mozilla libre suite)
+  [submenu] (Internet)
     [exec] (Icecat)                   {icecat}
     [exec] (Iceweasel libre)          {iceweasel}
     [submenu] (Icedove libre)
       [exec] (Icedove libre Mail)     {icedove -mail}
       [exec] (Icedove libre News)     {icedove -news}
-      [exec] (Icedove libre Composer) {icedove -compose}
+    [end]
+    [submenu] (Iceape libre)
+      [exec] (Iceape libre Mail)     {icedove -mail}
+      [exec] (Iceape libre News)     {icedove -news}
+      [exec] (Iceape libre Composer) {icedove -edit}
     [end]
   [end]
 
diff --git a/libre/dvdrip-libre/PKGBUILD b/libre/dvdrip-libre/PKGBUILD
new file mode 100644
index 000000000..b9cd0c8ff
--- /dev/null
+++ b/libre/dvdrip-libre/PKGBUILD
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: Fredrik Hammar <Horney_C86@Hotmail.com>
+# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
+
+_pkgname=dvdrip
+pkgname=dvdrip-libre
+pkgver=0.98.11
+pkgrel=10
+pkgdesc="A Gtk frontend for transcode writen in Perl, without opcional hal and unfree rar dependencies"
+arch=('i686' 'x86_64')
+license=('custom')
+url="http://www.exit1.org/${_pkgname}/"
+install=${_pkgname}.install
+depends=('perl-gtk2-ex-formfactory' 'transcode' 'imagemagick'
+         'perl-libintl-perl' 'desktop-file-utils' 'perl-event-execflow')
+optdepends=('xvid4conf: xvid4 configuration tool'
+            'lsdvd: Needed for faster DVD TOC reading'
+            'mplayer-libre: Needed for subtitle vobsub viewing'
+            'mplayer-vaapi-libre: Needed for subtitle vobsub viewing'
+            'mplayer2: Needed for subtitle vobsub viewing'
+            'ogmtools: Needed for OGG/Vorbis and for chapter progress bar'
+            'xine-ui: Can be used to view DVD'\''s/files'
+            'fping: Only for cluster mode master')
+source=("http://www.exit1.org/${_pkgname}/dist/${_pkgname}-${pkgver}.tar.gz"
+        "${_pkgname}.desktop" "libre.patch")
+options=('!emptydirs' '!makeflags')
+replaces=("${_pkgname}")
+conflicts=("${_pkgname}")
+provides=("${_pkgname}=${pkgver}")
+md5sums=('6dfa4199d451757a37eea233a07da4c0'
+         'e91cf411928fd0500d07a0022b4ef546'
+         'bc006d3b3447f8b62ae6ba29773a064b')
+
+build() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+
+  patch -Np1 -i "$srcdir/libre.patch"
+
+  # install module in vendor directories.
+  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+}
+
+package() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+
+  make install DESTDIR="${pkgdir}"
+
+  # remove perllocal.pod and .packlist
+  find ${pkgdir} -name perllocal.pod -delete
+  find ${pkgdir} -name .packlist -delete
+
+  install -Dm644 ${srcdir}/${_pkgname}.desktop "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
+  install -Dm 644 COPYRIGHT "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
+}
diff --git a/libre/dvdrip-libre/dvdrip.desktop b/libre/dvdrip-libre/dvdrip.desktop
new file mode 100644
index 000000000..dd19b4aae
--- /dev/null
+++ b/libre/dvdrip-libre/dvdrip.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=dvd::rip
+Comment=DVD Ripper and Encoder - Backup and compression utility for DVDs
+Exec=/usr/bin/vendor_perl/dvdrip
+Icon=/usr/share/perl5/vendor_perl/Video/DVDRip/icon.xpm
+Terminal=false
+Type=Application
+Categories=Application;AudioVideo;Video;
diff --git a/libre/dvdrip-libre/dvdrip.install b/libre/dvdrip-libre/dvdrip.install
new file mode 100644
index 000000000..e111ef946
--- /dev/null
+++ b/libre/dvdrip-libre/dvdrip.install
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/libre/dvdrip-libre/libre.patch b/libre/dvdrip-libre/libre.patch
new file mode 100644
index 000000000..cc24ef467
--- /dev/null
+++ b/libre/dvdrip-libre/libre.patch
@@ -0,0 +1,81 @@
+diff -Naur dvdrip-0.98.11.orig/lib/Video/DVDRip/Config.pm dvdrip-0.98.11/lib/Video/DVDRip/Config.pm
+--- dvdrip-0.98.11.orig/lib/Video/DVDRip/Config.pm	2009-02-28 16:28:00.000000000 -0200
++++ dvdrip-0.98.11/lib/Video/DVDRip/Config.pm	2012-05-15 15:41:34.554118050 -0300
+@@ -233,13 +233,6 @@
+         ],
+         rules => "executable-command",
+     },
+-    rar_command => {
+-        label   => __ "rar command (for vobsub compression)",
+-        type    => 'string',
+-        value   => 'rar',
+-        presets => [ 'rar', ],
+-        rules   => "executable-command",
+-    },
+     base_project_dir => {
+         label => __ "Default data base directory",
+         type  => 'dir',
+@@ -355,7 +348,6 @@
+     __ "Commands" => [
+         qw(
+             play_dvd_command   play_file_command
+-            play_stdin_command rar_command
+             )
+     ],
+     __ "Cluster options" => [
+@@ -907,7 +899,6 @@
+ sub test_play_dvd_command     { _executable(@_) }
+ sub test_play_file_command    { _executable(@_) }
+ sub test_play_stdin_command   { _executable(@_) }
+-sub test_rar_command          { _executable(@_) }
+ sub test_dvd_device           { _exists(@_) }
+ sub test_writer_device        { _exists(@_) }
+ sub test_base_project_dir     { _abs_and_writable(@_) }
+diff -Naur dvdrip-0.98.11.orig/lib/Video/DVDRip/Depend.pm dvdrip-0.98.11/lib/Video/DVDRip/Depend.pm
+--- dvdrip-0.98.11.orig/lib/Video/DVDRip/Depend.pm	2009-02-28 16:28:00.000000000 -0200
++++ dvdrip-0.98.11/lib/Video/DVDRip/Depend.pm	2012-05-15 15:30:13.506056523 -0300
+@@ -171,22 +171,6 @@
+         min       => "0.15",
+         suggested => "0.15",
+     },
+-    rar => {
+-        order       => ++$ORDER,
+-        command     => Video::DVDRip::Depend->config('rar_command'),
+-        comment     => __ "Needed for compressed vobsub subtitles",
+-        optional    => 1,
+-        version_cmd => "",
+-        get_version => sub {
+-            my $cmd = Video::DVDRip::Depend->config('rar_command')." '-?'";
+-            qx[$cmd 2>&1] =~ /rar\s+(\d+\.\d+(\.\d+)?)/i;
+-            return $1;
+-        },
+-        convert   => 'default',
+-        min       => "2.71",
+-        max       => "2.99",
+-        suggested => "2.71",
+-    },
+     mplayer => {
+         order       => ++$ORDER,
+         command     => "mplayer",
+@@ -284,21 +268,6 @@
+         min       => "2.2",
+         suggested => "2.4",
+     },
+-    hal => {
+-        order       => ++$ORDER,
+-        command     => "lshal",
+-        comment     => __"Used for DVD device scanning",
+-        optional    => 1,
+-        version_cmd => "lshal -v",
+-        get_version => sub {
+-            my ($cmd) = @_;
+-            qx[$cmd 2>&1] =~ /version\s+(\d+\.\d+(\.\d+)?)/i;
+-            return $1;
+-        },
+-        convert   => 'default',
+-        min       => "0.5",
+-        suggested => "0.5.7",
+-    },
+ );
+ 
+ sub convert_default {