Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

glorious funtoo updates

merged:

  funtoo-overlay: 34368576d04e9dbcbd5c4a6196b5b8ef4d5f2f65
  foo-overlay: f7749549a67741868fbb3da8781e42cbac533fa7
  bar-overlay: f1e9085ee695ff5b6ce57d430d6b224aaf4fa0a6
  flora: 6df4f4e5f6d2ef66832f10c027cd9328e3ee249f
  mythtv: 232ca207c520eb294db060a770aafd30ffa25afb
  • Loading branch information...
commit f4787053d6b8bdbef0175b44f683faebbd70f8d1 1 parent 8f48234
@danielrobbins danielrobbins authored
Showing with 4,469 additions and 217 deletions.
  1. +4 −2 app-cdr/backlite/backlite-1.0.3-r1.ebuild
  2. +363 −0 app-cdr/backlite/files/backlite-1.0.3-ffmpeg-0.11.patch
  3. +89 −0 app-cdr/backlite/files/backlite-1.0.3-includepaths.patch
  4. +1 −0  dev-db/innotop/Manifest
  5. +23 −0 dev-db/innotop/innotop-1.9.0.ebuild
  6. +118 −0 dev-db/mysql-init-scripts/files/mysql-5.1.67-init.d
  7. +56 −0 dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r3.ebuild
  8. +1 −0  dev-lang/v8/Manifest
  9. +104 −0 dev-lang/v8/v8-3.16.4.1.ebuild
  10. +1 −0  dev-libs/libburn/Manifest
  11. +42 −0 dev-libs/libburn/libburn-1.2.6.ebuild
  12. +1 −0  dev-libs/libisoburn/Manifest
  13. +59 −0 dev-libs/libisoburn/libisoburn-1.2.6.ebuild
  14. +3 −0  dev-libs/libisoburn/metadata.xml
  15. +1 −0  dev-libs/libisofs/Manifest
  16. +40 −0 dev-libs/libisofs/libisofs-1.2.6.ebuild
  17. +1 −0  dev-libs/nettle/Manifest
  18. +89 −0 dev-libs/nettle/files/nettle-2.6-shared.patch
  19. +50 −0 dev-libs/nettle/nettle-2.6.ebuild
  20. +1 −0  dev-libs/userspace-rcu/Manifest
  21. +27 −0 dev-libs/userspace-rcu/userspace-rcu-0.7.6.ebuild
  22. +2 −2 dev-python/jsonpatch/jsonpatch-0.12.ebuild
  23. +1 −4 dev-python/python-glanceclient/metadata.xml
  24. +5 −5 dev-python/python-glanceclient/python-glanceclient-0.7.0.ebuild
  25. +6 −6 dev-python/warlock/warlock-0.7.0.ebuild
  26. +4 −3 dev-scheme/chicken/Manifest
  27. +70 −0 dev-scheme/chicken/chicken-4.8.0.ebuild
  28. +74 −0 dev-scheme/chicken/files/chicken-4.8.0-parallel-build.patch
  29. +2 −0  games-action/trosh/Manifest
  30. +10 −0 games-action/trosh/metadata.xml
  31. +51 −0 games-action/trosh/trosh-20.ebuild
  32. +1 −0  games-emulation/vbam/Manifest
  33. +48 −0 games-emulation/vbam/files/vbam-1.8.0.1149-desktop.patch
  34. +109 −0 games-emulation/vbam/vbam-1.8.0.1149.ebuild
  35. +26 −4 games-emulation/vbam/vbam-9999.ebuild
  36. +2 −1  games-mud/tintin/Manifest
  37. +11 −0 games-mud/tintin/files/tintin-2.00.9-ldpermission.patch
  38. +38 −0 games-mud/tintin/tintin-2.00.9.ebuild
  39. +1 −0  games-puzzle/xye/Manifest
  40. +4 −4 games-puzzle/xye/files/xye-0.12.0-gcc47.patch
  41. +22 −0 games-puzzle/xye/files/xye-0.12.1-gcc47.patch
  42. +41 −0 games-puzzle/xye/xye-0.12.1.ebuild
  43. +2 −2 gnome-base/gconf/gconf-2.32.4.ebuild
  44. +2 −2 gnome-base/gconf/gconf-3.2.5.ebuild
  45. +59 −0 media-libs/mediastreamer/files/mediastreamer-2.8.2-ffmpeg-1.0.patch
  46. +4 −3 media-libs/mediastreamer/mediastreamer-2.8.2.ebuild
  47. +14 −0 media-plugins/vdr-image/files/vdr-image-0.3.1-ffmpeg-1.patch
  48. +4 −3 media-plugins/vdr-image/vdr-image-0.3.1.ebuild
  49. +1 −1  media-sound/aqualung/Manifest
  50. +9 −3 media-sound/aqualung/aqualung-0.9_beta11-r1.ebuild
  51. +108 −0 media-sound/aqualung/aqualung-0.9_beta11-r2.ebuild
  52. +2 −1  media-sound/potamus/Manifest
  53. +46 −0 media-sound/potamus/potamus-14.ebuild
  54. +2 −0  media-tv/xbmc/Manifest
  55. +16 −0 media-tv/xbmc/files/generate.sh
  56. +237 −0 media-tv/xbmc/xbmc-12.0_rc3.ebuild
  57. +1 −1  media-video/hwdecode-demos/Manifest
  58. +73 −0 media-video/hwdecode-demos/files/ffmpeg-1.patch
  59. +6 −3 media-video/hwdecode-demos/hwdecode-demos-0.9.5.ebuild
  60. +1 −1  metadata/dtd/timestamp.chk
  61. +1 −1  metadata/glsa/timestamp.chk
  62. +1 −1  metadata/md5-cache/app-cdr/backlite-1.0.3-r1
  63. +11 −0 metadata/md5-cache/dev-db/innotop-1.9.0
  64. +8 −0 metadata/md5-cache/dev-db/mysql-init-scripts-2.0_pre1-r3
  65. +11 −0 metadata/md5-cache/dev-lang/v8-3.16.4.1
  66. +12 −0 metadata/md5-cache/dev-libs/libburn-1.2.6
  67. +13 −0 metadata/md5-cache/dev-libs/libisoburn-1.2.6
  68. +12 −0 metadata/md5-cache/dev-libs/libisofs-1.2.6
  69. +13 −0 metadata/md5-cache/dev-libs/nettle-2.6
  70. +11 −0 metadata/md5-cache/dev-libs/userspace-rcu-0.7.6
  71. +2 −2 metadata/md5-cache/dev-python/jsonpatch-0.12
  72. +5 −5 metadata/md5-cache/dev-python/python-glanceclient-0.7.0
  73. +4 −4 metadata/md5-cache/dev-python/warlock-0.7.0
  74. +14 −0 metadata/md5-cache/dev-scheme/chicken-4.8.0
  75. +12 −0 metadata/md5-cache/games-action/trosh-20
  76. +14 −0 metadata/md5-cache/games-emulation/vbam-1.8.0.1149
  77. +2 −2 metadata/md5-cache/games-emulation/vbam-9999
  78. +12 −0 metadata/md5-cache/games-mud/tintin-2.00.9
  79. +12 −0 metadata/md5-cache/games-puzzle/xye-0.12.1
  80. +1 −1  metadata/md5-cache/gnome-base/gconf-2.32.4
  81. +1 −1  metadata/md5-cache/gnome-base/gconf-3.2.5
  82. +1 −1  metadata/md5-cache/media-libs/mediastreamer-2.8.2
  83. +3 −3 metadata/md5-cache/media-plugins/vdr-image-0.3.1
  84. +3 −3 metadata/md5-cache/media-sound/aqualung-0.9_beta11-r1
  85. +13 −0 metadata/md5-cache/media-sound/aqualung-0.9_beta11-r2
  86. +13 −0 metadata/md5-cache/media-sound/potamus-14
  87. +14 −0 metadata/md5-cache/media-tv/xbmc-12.0_rc3
  88. +1 −1  metadata/md5-cache/media-video/hwdecode-demos-0.9.5
  89. +2 −2 metadata/md5-cache/net-libs/ldns-1.6.13-r1
  90. +4 −4 metadata/md5-cache/net-misc/{flexget-1.0_beta3181 → flexget-1.0.3279}
  91. +3 −3 metadata/md5-cache/net-misc/flexget-9999
  92. +2 −2 metadata/md5-cache/net-misc/openssh-5.9_p1-r4
  93. +2 −2 metadata/md5-cache/net-misc/openssh-6.0_p1
  94. +2 −2 metadata/md5-cache/net-misc/openssh-6.0_p1-r1
  95. +2 −2 metadata/md5-cache/net-misc/openssh-6.1_p1
  96. +13 −0 metadata/md5-cache/net-misc/openssh-6.1_p1-r1
  97. +1 −1  metadata/md5-cache/net-proxy/obfsproxy-0.1.4
  98. +2 −2 metadata/md5-cache/net-voip/homer-0.24.1
  99. +1 −1  metadata/md5-cache/sci-chemistry/aria-2.3.2-r4
  100. +3 −3 metadata/md5-cache/sci-chemistry/vmd-1.9.1-r2
  101. +13 −0 metadata/md5-cache/sci-electronics/ngspice-25
  102. +4 −4 metadata/md5-cache/sci-geosciences/grass-6.4.2
  103. +1 −1  metadata/md5-cache/sci-libs/vtk-5.10.1
  104. +2 −2 metadata/md5-cache/sci-physics/cernlib-montecarlo-2006-r3
  105. +12 −0 metadata/md5-cache/sci-physics/paw-2.14.04-r4
  106. +13 −0 metadata/md5-cache/sci-physics/pythia-6.4.27
  107. +12 −0 metadata/md5-cache/sys-block/fio-2.0.13
  108. +11 −0 metadata/md5-cache/sys-cluster/drbd-8.3.15
  109. +11 −0 metadata/md5-cache/sys-cluster/drbd-8.4.2
  110. +13 −0 metadata/md5-cache/sys-fs/cryptsetup-1.5.1
  111. +13 −0 metadata/md5-cache/sys-fs/cryptsetup-1.6.0
  112. +15 −0 metadata/md5-cache/sys-kernel/gentoo-sources-3.7.3
  113. +14 −0 metadata/md5-cache/sys-kernel/vserver-sources-2.3.5.5
  114. +14 −0 metadata/md5-cache/x11-drivers/xf86-video-intel-2.20.18
  115. +6 −6 metadata/md5-cache/x11-misc/{grsync-0.9.2 → grsync-1.2.3}
  116. +1 −1  metadata/news/timestamp.chk
  117. +1 −1  metadata/timestamp
  118. +1 −1  metadata/timestamp.chk
  119. +1 −1  metadata/timestamp.x
  120. +3 −3 net-libs/ldns/ldns-1.6.13-r1.ebuild
  121. +1 −1  net-misc/flexget/Manifest
  122. +5 −4 net-misc/flexget/{flexget-1.0_beta3181.ebuild → flexget-1.0.3279.ebuild}
  123. +4 −3 net-misc/flexget/flexget-9999.ebuild
  124. +2 −0  net-misc/openssh/metadata.xml
  125. +3 −3 net-misc/openssh/openssh-5.9_p1-r4.ebuild
  126. +3 −3 net-misc/openssh/openssh-6.0_p1-r1.ebuild
  127. +3 −3 net-misc/openssh/openssh-6.0_p1.ebuild
  128. +303 −0 net-misc/openssh/openssh-6.1_p1-r1.ebuild
  129. +3 −3 net-misc/openssh/openssh-6.1_p1.ebuild
  130. +2 −2 net-proxy/obfsproxy/obfsproxy-0.1.4.ebuild
  131. +101 −0 net-voip/homer/files/homer-0.24.1-libav-9.patch
  132. +6 −2 net-voip/homer/homer-0.24.1.ebuild
  133. +34 −1 profiles/package.mask/gentoo
  134. +7 −0 profiles/use.local.desc
  135. +2 −2 sci-chemistry/aria/aria-2.3.2-r4.ebuild
  136. +2 −7 sci-chemistry/vmd/vmd-1.9.1-r2.ebuild
  137. +2 −0  sci-electronics/ngspice/Manifest
  138. +100 −0 sci-electronics/ngspice/ngspice-25.ebuild
  139. +1 −1  sci-geosciences/grass/Manifest
  140. +26 −0 sci-geosciences/grass/files/grass-6.4.2-configure.patch
  141. +79 −0 sci-geosciences/grass/files/grass-6.4.2-ffmpeg-1.patch
  142. +11 −0 sci-geosciences/grass/files/grass-6.4.2-libav-9.patch
  143. +9 −5 sci-geosciences/grass/grass-6.4.2.ebuild
  144. +49 −0 sci-libs/vtk/files/vtk-5.10.1-ffmpeg-1.patch
  145. +2 −1  sci-libs/vtk/vtk-5.10.1.ebuild
  146. +2 −2 sci-physics/cernlib-montecarlo/Manifest
  147. +11 −10 sci-physics/cernlib-montecarlo/cernlib-montecarlo-2006-r3.ebuild
  148. +6 −6 sci-physics/cernlib-montecarlo/metadata.xml
  149. +3 −2 sci-physics/paw/Manifest
  150. +2 −2 sci-physics/paw/metadata.xml
  151. +67 −0 sci-physics/paw/paw-2.14.04-r4.ebuild
  152. +1 −0  sci-physics/pythia/Manifest
  153. +68 −0 sci-physics/pythia/pythia-6.4.27.ebuild
  154. +15 −14 sys-block/fio/Manifest
  155. +44 −0 sys-block/fio/fio-2.0.13.ebuild
  156. +9 −7 sys-cluster/drbd/Manifest
  157. +79 −0 sys-cluster/drbd/drbd-8.3.15.ebuild
  158. +79 −0 sys-cluster/drbd/drbd-8.4.2.ebuild
  159. +6 −6 sys-cluster/drbd/files/drbd-8.0.rc
  160. +3 −1 sys-fs/cryptsetup/Manifest
  161. +112 −0 sys-fs/cryptsetup/cryptsetup-1.5.1.ebuild
  162. +112 −0 sys-fs/cryptsetup/cryptsetup-1.6.0.ebuild
  163. +350 −0 sys-fs/cryptsetup/files/1.5.1-dmcrypt.rc
  164. +2 −0  sys-fs/cryptsetup/metadata.xml
  165. +2 −0  sys-kernel/gentoo-sources/Manifest
  166. +29 −0 sys-kernel/gentoo-sources/gentoo-sources-3.7.3.ebuild
  167. +2 −0  sys-kernel/vserver-sources/Manifest
  168. +23 −0 sys-kernel/vserver-sources/vserver-sources-2.3.5.5.ebuild
  169. +1 −0  x11-drivers/xf86-video-intel/Manifest
  170. +65 −0 x11-drivers/xf86-video-intel/xf86-video-intel-2.20.18.ebuild
  171. +1 −1  x11-misc/grsync/Manifest
  172. +8 −5 x11-misc/grsync/{grsync-0.9.2.ebuild → grsync-1.2.3.ebuild}
View
6 app-cdr/backlite/backlite-1.0.3-r1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/backlite/backlite-1.0.3-r1.ebuild,v 1.2 2013/01/13 11:12:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/backlite/backlite-1.0.3-r1.ebuild,v 1.3 2013/01/17 18:42:37 aballier Exp $
EAPI=4
-inherit qt4-r2
+inherit qt4-r2 eutils
DESCRIPTION="backlite is a pure QT4 version of k9copy"
HOMEPAGE="http://k9copy.sourceforge.net/"
@@ -32,6 +32,8 @@ RDEPEND="${DEPEND}
src_prepare() {
sed -i -e '/^MimeTypes=.*/d' \
-e '/^Encoding=.*/d' *.desktop || die
+ epatch "${FILESDIR}/${P}-ffmpeg-0.11.patch" \
+ "${FILESDIR}/${P}-includepaths.patch"
}
src_configure() {
View
363 app-cdr/backlite/files/backlite-1.0.3-ffmpeg-0.11.patch
@@ -0,0 +1,363 @@
+From slackware:
+http://www.slackware.org.uk/slackbuilds.org/14.0/multimedia/backlite/
+https://bugs.gentoo.org/show_bug.cgi?id=443192
+
+diff -Nru backlite-1.0.3.orig/backlite.pro backlite-1.0.3/backlite.pro
+--- backlite-1.0.3.orig/backlite.pro 2011-12-07 21:34:56.000000000 +0100
++++ backlite-1.0.3/backlite.pro 2012-11-23 10:02:55.000000000 +0100
+@@ -386,6 +386,11 @@
+ INCLUDEPATH += $$a/ffmpeg
+ INCLUDEPATH += $$a/ffmpeg/libavformat
+ }
++ exists($$a/ffmpeg/libavutil) {
++ message(found $$a/ffmpeg!)
++ INCLUDEPATH += $$a/ffmpeg
++ INCLUDEPATH += $$a/ffmpeg/libavutil
++ }
+ exists($$a/ffmpeg/libswscale) {
+ message(found $$a/ffmpeg!)
+ INCLUDEPATH += $$a/ffmpeg
+@@ -400,6 +405,10 @@
+ message(found $$a/libavformat!)
+ INCLUDEPATH += $$a/libavformat
+ }
++ exists($$a/libavutil) {
++ message(found $$a/libavutil!)
++ INCLUDEPATH += $$a/libavutil
++ }
+ exists($$a/libswscale) {
+ message(found $$a/libswscale!)
+ INCLUDEPATH += $$a/libswscale
+diff -Nru backlite-1.0.3.orig/src/backup/k9mp4enc.cpp backlite-1.0.3/src/backup/k9mp4enc.cpp
+--- backlite-1.0.3.orig/src/backup/k9mp4enc.cpp 2011-12-07 21:34:56.000000000 +0100
++++ backlite-1.0.3/src/backup/k9mp4enc.cpp 2012-12-11 10:01:39.507859366 +0100
+@@ -619,7 +619,7 @@
+ // cmd << "-lavfopts" << "i_certify_that_my_video_stream_does_not_use_b_frames";
+ }
+ //synchronize audio
+- cmd << "-async" << "1" ;
++ cmd << "-async" << "44100" ;
+ cmd << "-y" << KShell::quoteArg(path);
+ cmd << slNewAudio;
+ // if (m_extractMkv) {
+diff -Nru backlite-1.0.3.orig/src/core/k9audiocodecs.cpp backlite-1.0.3/src/core/k9audiocodecs.cpp
+--- backlite-1.0.3.orig/src/core/k9audiocodecs.cpp 2011-12-07 21:34:56.000000000 +0100
++++ backlite-1.0.3/src/core/k9audiocodecs.cpp 2012-12-11 10:01:39.510859330 +0100
+@@ -75,10 +75,10 @@
+ m_codecs[4]=_k9AudioCodec("sonic","-oac lavc -lavcopts acodec=sonic:abitrate=$AUDBR","mencoder");
+ m_codecs[5]=_k9AudioCodec("aac","-oac faac -faacopts br=$AUDBR","mencoder");
+ m_codecs[6]=_k9AudioCodec("mp3 (lame)","-oac mp3lame -lameopts abr:br=$AUDBR","mencoder");
+- m_codecs[7]=_k9AudioCodec("copy","-acodec copy","ffmpeg","");
+- m_codecs[8]=_k9AudioCodec("mp3","-acodec libmp3lame -ab $AUDBRk -ac 2","ffmpeg",".mp3");
+- m_codecs[9]=_k9AudioCodec("vorbis","-acodec vorbis -ab $AUDBRk -ac 2","ffmpeg",".ogg");
+- m_codecs[10]=_k9AudioCodec("aac","-acodec libfaac -ab $AUDBRk -ac 2","ffmpeg",".aac");
++ m_codecs[7]=_k9AudioCodec("copy","-codec:a copy","ffmpeg","");
++ m_codecs[8]=_k9AudioCodec("mp3","-codec:a libmp3lame -ab $AUDBRk -ac 2 -ar 44100","ffmpeg",".mp3");
++ m_codecs[9]=_k9AudioCodec("vorbis","-codec:a vorbis -ab $AUDBRk -ac 2 -ar 44100","ffmpeg",".ogg");
++ m_codecs[10]=_k9AudioCodec("aac","-codec:a libfaac -ab $AUDBRk -ac 2 -ar 44100","ffmpeg",".aac");
+
+ save();
+ }
+diff -Nru backlite-1.0.3.orig/src/core/k9videocodecs.cpp backlite-1.0.3/src/core/k9videocodecs.cpp
+--- backlite-1.0.3.orig/src/core/k9videocodecs.cpp 2011-12-07 21:34:56.000000000 +0100
++++ backlite-1.0.3/src/core/k9videocodecs.cpp 2012-12-11 10:01:39.512859304 +0100
+@@ -98,12 +98,12 @@
+ m_codecs[18]=_k9VideoCodec("ASUS v1","","-ovc lavc -lavcopts vcodec=asv1:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=asv1:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=asv1:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","mencoder");
+ m_codecs[19]=_k9VideoCodec("ASUS v2","","-ovc lavc -lavcopts vcodec=asv2:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=asv2:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=asv2:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","mencoder");
+ m_codecs[20]=_k9VideoCodec("flv","","-ovc lavc -lavcopts vcodec=flv:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=flv:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","-ovc lavc -lavcopts vcodec=flv:vhq:v4mv:vqmin=2:vbitrate=$VIDBR:aspect=$ASPECT:turbo:vpass=$PASS -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP,scale=$WIDTH:$HEIGHT,dsize=$ASPECT","mencoder");
+- m_codecs[21]=_k9VideoCodec("copy","","-vcodec copy","-vcodec copy","-vcodec copy","ffmpeg");
+- m_codecs[22]=_k9VideoCodec("x264","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -vcodec libx264 -level 30","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec libx264 -pass $PASS -passlogfile $PASSLOGFILE -level 30","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec libx264 -pass $PASS -passlogfile $PASSLOGFILE -level 30","ffmpeg");
+- m_codecs[23]=_k9VideoCodec("x264 (high)","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -vcodec libx264 -level 30 -flags +loop+mv4 -cmp 256 -partitions +parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 -me_method hex -subq 7 -trellis 1 -refs 5 -bf 3 -flags2 +bpyramid+wpred+mixed_refs+dct8x8 -coder 1 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -qmin 10 -qmax 51 -qdiff 4","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec libx264 -level 30 -flags +loop+mv4 -cmp 256 -partitions +parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 -me_method hex -subq 7 -trellis 1 -refs 5 -bf 3 -flags2 +bpyramid+wpred+mixed_refs+dct8x8 -coder 1 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -qmin 10 -qmax 51 -qdiff 4 -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec libx264 -level 30 -flags +loop+mv4 -cmp 256 -partitions +parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 -me_method hex -subq 7 -trellis 1 -refs 5 -bf 3 -flags2 +bpyramid+wpred+mixed_refs+dct8x8 -coder 1 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -qmin 10 -qmax 51 -qdiff 4 -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");
+- m_codecs[24]=_k9VideoCodec("MPEG-4 ","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -vcodec mpeg4 ","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec mpeg4 -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec mpeg4 -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");
+- m_codecs[25]=_k9VideoCodec("Flash Video","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -vcodec flv ","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec flv -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec flv -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");
+- m_codecs[26]=_k9VideoCodec("Windows Media 8","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -vcodec wmv2","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec wmv2 -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -croptop $CROPTOP -cropbottom $CROPBOTTOM -cropleft $CROPLEFT -cropright $CROPRIGHT -aspect $ASPECT -vcodec wmv2 -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");
++ m_codecs[21]=_k9VideoCodec("copy","","-codec:v copy","-codec:v copy","-codec:v copy","ffmpeg");
++ m_codecs[22]=_k9VideoCodec("x264","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v libx264 -level 30","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v libx264 -pass $PASS -passlogfile $PASSLOGFILE -level 30","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v libx264 -pass $PASS -passlogfile $PASSLOGFILE -level 30","ffmpeg");
++ m_codecs[23]=_k9VideoCodec("x264 (high)","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v libx264 -level 30 -flags +loop+mv4 -cmp 256 -partitions +parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 -me_method hex -subq 7 -trellis 1 -refs 5 -bf 3 -b-pyramid normal -weightb 1 -mixed-refs 1 -8x8dct 1 -coder 1 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -qmin 10 -qmax 51 -qdiff 4","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v libx264 -level 30 -flags +loop+mv4 -cmp 256 -partitions +parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 -me_method hex -subq 7 -trellis 1 -refs 5 -bf 3 -b-pyramid normal -weightb 1 -mixed-refs 1 -8x8dct 1 -coder 1 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -qmin 10 -qmax 51 -qdiff 4 -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v libx264 -level 30 -flags +loop+mv4 -cmp 256 -partitions +parti4x4+parti8x8+partp4x4+partp8x8+partb8x8 -me_method hex -subq 7 -trellis 1 -refs 5 -bf 3 -b-pyramid normal -weightb 1 -mixed-refs 1 -8x8dct 1 -coder 1 -me_range 16 -g 250 -keyint_min 25 -sc_threshold 40 -i_qfactor 0.71 -qmin 10 -qmax 51 -qdiff 4 -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");
++ m_codecs[24]=_k9VideoCodec("MPEG-4 ","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v mpeg4 ","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v mpeg4 -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v mpeg4 -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");
++ m_codecs[25]=_k9VideoCodec("Flash Video","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v flv ","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v flv -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v flv -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");
++ m_codecs[26]=_k9VideoCodec("Windows Media 8","","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$CROPWIDTH:$CROPHEIGHT:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v wmv2","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v wmv2 -pass $PASS -passlogfile $PASSLOGFILE","-b $VIDBRk -s $WIDTHx$HEIGHT -vf crop=$WIDTH-$CROPRIGHT-$CROPLEFT:$HEIGHT-$CROPTOP-$CROPBOTTOM:$CROPLEFT:$CROPTOP -aspect $ASPECT -codec:v wmv2 -pass $PASS -passlogfile $PASSLOGFILE","ffmpeg");
+
+ save();
+
+diff -Nru backlite-1.0.3.orig/src/import/k9avidecode.cpp backlite-1.0.3/src/import/k9avidecode.cpp
+--- backlite-1.0.3.orig/src/import/k9avidecode.cpp 2011-12-07 21:34:56.000000000 +0100
++++ backlite-1.0.3/src/import/k9avidecode.cpp 2012-11-23 09:39:06.000000000 +0100
+@@ -37,11 +37,13 @@
+ : QObject(parent) {
+ CodecHandle=0;
+ FormatHandle=0;
++ UtilHandle=0;
+ SwscaleHandle=0;
+ glibref=0;
+ if (glibref==0) {
+ CodecHandle=dlopen("libavcodec.so",RTLD_LAZY ); //| RTLD_GLOBAL
+ FormatHandle=dlopen("libavformat.so",RTLD_LAZY);
++ UtilHandle=dlopen("libavutil.so",RTLD_LAZY);
+ #ifdef HAVE_SWSCALE
+ SwscaleHandle=dlopen("libswscale.so",RTLD_LAZY);
+ if (SwscaleHandle==0)
+@@ -56,6 +58,12 @@
+ if (!FormatHandle ) {
+ errs << i18n("Cannot open the library %1").arg("libavformat");
+ }
++# if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 33, 0)
++ if (!UtilHandle) {
++ m_error =i18n("Cannot open then library %1").arg("libavutil");
++ return;
++ }
++# endif
+ #ifdef HAVE_SWSCALE
+ if (!SwscaleHandle) {
+ errs << i18n("Cannot open the library %1").arg("libswscale");
+@@ -63,17 +71,32 @@
+ #endif
+
+ av_register_all = (av_register_all_t)dlsym(FormatHandle,"av_register_all");
++# if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 2, 0)
++ avformat_open_input = (avformat_open_input_t)dlsym(FormatHandle,"avformat_open_input");
++# else
+ av_open_input_file = (av_open_input_file_t)dlsym(FormatHandle,"av_open_input_file");
++# endif
++# if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 6, 0)
++ avformat_find_stream_info = (avformat_find_stream_info_t)dlsym(FormatHandle,"avformat_find_stream_info");
++# else
+ av_find_stream_info = (av_find_stream_info_t)dlsym(FormatHandle,"av_find_stream_info");
++# endif
+ avcodec_find_decoder =(avcodec_find_decoder_t) dlsym(CodecHandle,"avcodec_find_decoder");
++# if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0)
++ avcodec_open2 = (avcodec_open2_t)dlsym(CodecHandle,"avcodec_open2");
++# else
+ avcodec_open = (avcodec_open_t)dlsym(CodecHandle,"avcodec_open");
++# endif
+ avcodec_alloc_frame = (avcodec_alloc_frame_t)dlsym(CodecHandle,"avcodec_alloc_frame");
+ avpicture_get_size = (avpicture_get_size_t)dlsym(CodecHandle,"avpicture_get_size");
+ av_malloc = (av_malloc_t)dlsym(CodecHandle,"av_malloc");
+ avpicture_fill = (avpicture_fill_t)dlsym(CodecHandle,"avpicture_fill");
+ av_read_frame = (av_read_frame_t)dlsym(FormatHandle,"av_read_frame");
++# if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 23, 0)
++ avcodec_decode_video2 = (avcodec_decode_video2_t)dlsym(CodecHandle,"avcodec_decode_video2");
++# else
+ avcodec_decode_video = (avcodec_decode_video_t)dlsym(CodecHandle,"avcodec_decode_video");
+- if (avcodec_decode_video==0) avcodec_decode_video=(avcodec_decode_video_t)dlsym(CodecHandle,"avcodec_decode_video2");
++# endif
+ #ifndef HAVE_SWSCALE
+ img_convert = (img_convert_t)dlsym(CodecHandle,"img_convert");
+ //if img_convert is null (deprecated in ffmpeg), we need libswscale
+@@ -85,7 +108,11 @@
+ if (av_free_packet==0)
+ av_free_packet=av_free_packet_internal;
+ avcodec_close = (avcodec_close_t)dlsym(FormatHandle,"avcodec_close");
++# if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0)
++ avformat_close_input = (avformat_close_input_t)dlsym(FormatHandle,"avformat_close_input");
++# else
+ av_close_input_file = (av_close_input_file_t)dlsym(FormatHandle,"av_close_input_file");
++# endif
+ av_seek_frame=(av_seek_frame_t)dlsym(FormatHandle,"av_seek_frame");
+ av_rescale_q=(av_rescale_q_t)dlsym(FormatHandle,"av_rescale_q");
+ avcodec_flush_buffers=(avcodec_flush_buffers_t)dlsym(CodecHandle,"avcodec_flush_buffers");
+@@ -94,7 +121,11 @@
+ sws_getContext=(sws_getContext_t)dlsym(SwscaleHandle,"sws_getContext");
+ sws_scale= (sws_scale_t)dlsym(SwscaleHandle,"sws_scale");
+ #endif
++# if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 33, 0)
++ av_gettime=(av_gettime_t)dlsym(UtilHandle,"av_gettime");
++# else
+ av_gettime=(av_gettime_t)dlsym(FormatHandle,"av_gettime");
++# endif
+
+ if (errs.count() >0) {
+ m_error=errs.join("\n");
+@@ -118,6 +149,8 @@
+ dlclose(FormatHandle);
+ if (CodecHandle)
+ dlclose(CodecHandle);
++ if(UtilHandle)
++ dlclose(UtilHandle);
+ #ifdef HAVE_SWSCALE
+ if (SwscaleHandle)
+ dlclose(CodecHandle);
+@@ -134,12 +167,24 @@
+ close();
+
+ // Open video file
+- if (av_open_input_file(&m_FormatCtx, _fileName.toUtf8(), NULL, 0, NULL)!=0) {
++ if (
++# if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 2, 0)
++ avformat_open_input(&m_FormatCtx, _fileName.toUtf8(), 0, 0)!=0
++# else
++ av_open_input_file(&m_FormatCtx, _fileName.toUtf8(), NULL, 0, NULL)!=0
++# endif
++ ) {
+ m_error=i18n("Couldn't open the file %1").arg(_fileName);
+ return false; // Couldn't open file}
+ }
+ // Retrieve stream information
+- if (av_find_stream_info(m_FormatCtx)<0) {
++ if (
++# if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 6, 0)
++ avformat_find_stream_info(m_FormatCtx, NULL)<0
++# else
++ av_find_stream_info(m_FormatCtx)<0
++# endif
++ ) {
+ m_error =i18n("Couldn't find stream information");
+ return false; // Couldn't find stream information
+ }
+@@ -168,7 +213,13 @@
+ return false; // Codec not found
+ }
+ // Open codec
+- if (avcodec_open(m_CodecCtx, m_Codec)<0) {
++ if (
++# if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0)
++ avcodec_open2(m_CodecCtx, m_Codec, NULL)<0
++# else
++ avcodec_open(m_CodecCtx, m_Codec)<0
++# endif
++ ) {
+ m_error =i18n("Could'nt open the codec");
+ return false; // Could not open codec
+ }
+@@ -245,15 +296,23 @@
+ // Is this a packet from the video stream?
+ if (packet.stream_index==m_videoStream) {
+ // Decode video frame
++# if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 23, 0)
++ avcodec_decode_video2(m_CodecCtx, m_Frame, &frameFinished, &packet);
++# else
+ avcodec_decode_video(m_CodecCtx, m_Frame, &frameFinished,
+ packet.data, packet.size);
++# endif
+
+ // Did we get a video frame?
+ if (frameFinished) {
+ // if (m_Frame->pts >=fspos)
+ int64_t cur_dts=fspos;
+- if (m_FormatCtx->cur_st)
+- cur_dts= m_FormatCtx->cur_st->cur_dts;
++# if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(54, 2, 0)
++ cur_dts= packet.dts;
++# else
++ if (m_FormatCtx->cur_st)
++ cur_dts= m_FormatCtx->cur_st->cur_dts;
++# endif
+ if (cur_dts >=fspos) {
+ bFound=true;
+ #ifndef HAVE_SWSCALE
+@@ -309,7 +368,11 @@
+ avcodec_close(m_CodecCtx);
+
+ // Close the video file
++# if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0)
++ avformat_close_input(&m_FormatCtx);
++# else
+ av_close_input_file(m_FormatCtx);
++# endif
+ m_opened=false;
+ }
+ }
+diff -Nru backlite-1.0.3.orig/src/import/k9avidecode.h backlite-1.0.3/src/import/k9avidecode.h
+--- backlite-1.0.3.orig/src/import/k9avidecode.h 2011-12-07 21:34:56.000000000 +0100
++++ backlite-1.0.3/src/import/k9avidecode.h 2012-11-23 09:39:06.000000000 +0100
+@@ -15,6 +15,7 @@
+ #include "k9common.h"
+ #include <qobject.h>
+ #include <avformat.h>
++#include <avutil.h>
+ #include <qimage.h>
+ #include <cstdlib>
+ #include <QObject>
+@@ -29,10 +30,22 @@
+ //typedef dvd_file_t * (*DVDOpenFile_t) ( dvd_reader_t *, int, dvd_read_domain_t );
+ typedef void (*av_register_all_t) (void);
+ typedef int64_t (*av_gettime_t) (void);
++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 2, 0)
++typedef int (*avformat_open_input_t)(AVFormatContext **, const char *, AVInputFormat *, AVDictionary **);
++#else
+ typedef int (*av_open_input_file_t)(AVFormatContext **, const char *,AVInputFormat *,int, AVFormatParameters *);
++#endif
++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 6, 0)
++typedef int (*avformat_find_stream_info_t)(AVFormatContext *, AVDictionary **);
++#else
+ typedef int (*av_find_stream_info_t)(AVFormatContext *);
++#endif
+ typedef AVCodec* (*avcodec_find_decoder_t)(enum CodecID);
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0)
++typedef int (*avcodec_open2_t)(AVCodecContext *, AVCodec *, AVDictionary **);
++#else
+ typedef int (*avcodec_open_t)(AVCodecContext *, AVCodec *);
++#endif
+ typedef AVFrame * (*avcodec_alloc_frame_t)(void);
+
+ typedef int (*avpicture_get_size_t)(int , int , int );
+@@ -40,11 +53,19 @@
+ typedef int (*avpicture_fill_t)(AVPicture *, uint8_t *,int , int , int);
+ typedef int (*av_read_frame_t)(AVFormatContext *, AVPacket *);
+
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 23, 0)
++typedef int (*avcodec_decode_video2_t)(AVCodecContext *, AVFrame *, int *, AVPacket *);
++#else
+ typedef int (*avcodec_decode_video_t)(AVCodecContext *, AVFrame *,int *, uint8_t *, int );
++#endif
+ typedef int (*img_convert_t)(AVPicture *, int , const AVPicture *, int ,int, int);
+ typedef void (*av_free_t)(void *);
+ typedef int (*avcodec_close_t)(AVCodecContext *);
++#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0)
++typedef void (*avformat_close_input_t)(AVFormatContext **);
++#else
+ typedef void (*av_close_input_file_t)(AVFormatContext *);
++#endif
+ typedef int (*av_seek_frame_t)(AVFormatContext *,int,int64_t timestamp,int flags); typedef int64_t (*av_rescale_q_t)(int64_t , AVRational , AVRational ) ;
+ typedef void (*avcodec_flush_buffers_t)(AVCodecContext *);
+ typedef void (*av_free_packet_t)(AVPacket *);
+@@ -77,21 +98,41 @@
+
+ private:
+ av_register_all_t av_register_all;
++# if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 2, 0)
++ avformat_open_input_t avformat_open_input;
++# else
+ av_open_input_file_t av_open_input_file;
++# endif
++# if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 6, 0)
++ avformat_find_stream_info_t avformat_find_stream_info;
++# else
+ av_find_stream_info_t av_find_stream_info;
++# endif
+ avcodec_find_decoder_t avcodec_find_decoder;
++# if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0)
++ avcodec_open2_t avcodec_open2;
++# else
+ avcodec_open_t avcodec_open;
++# endif
+ avcodec_alloc_frame_t avcodec_alloc_frame;
+ av_seek_frame_t av_seek_frame;
+ avpicture_get_size_t avpicture_get_size;
+ av_malloc_t av_malloc;
+ avpicture_fill_t avpicture_fill;
+ av_read_frame_t av_read_frame;
++# if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 23, 0)
++ avcodec_decode_video2_t avcodec_decode_video2;
++# else
+ avcodec_decode_video_t avcodec_decode_video;
++# endif
+ img_convert_t img_convert;
+ av_free_t av_free;
+ avcodec_close_t avcodec_close;
++# if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(53, 17, 0)
++ avformat_close_input_t avformat_close_input;
++# else
+ av_close_input_file_t av_close_input_file;
++# endif
+ av_rescale_q_t av_rescale_q;
+ av_gettime_t av_gettime;
+ avcodec_flush_buffers_t avcodec_flush_buffers;
+@@ -103,6 +144,7 @@
+ #endif
+ void *CodecHandle;
+ void *FormatHandle;
++ void *UtilHandle;
+ void *SwscaleHandle;
+ int glibref;
+
View
89 app-cdr/backlite/files/backlite-1.0.3-includepaths.patch
@@ -0,0 +1,89 @@
+libavutil/time.h in recent ffmpeg versions pollute the includes.
+include libav* headers correcly.
+
+Index: backlite-1.0.3/backlite.pro
+===================================================================
+--- backlite-1.0.3.orig/backlite.pro
++++ backlite-1.0.3/backlite.pro
+@@ -383,39 +383,31 @@ for(a, INCLOC ) {
+ exists($$a/ffmpeg/libavcodec) {
+ message(found $$a/ffmpeg!)
+ INCLUDEPATH += $$a/ffmpeg
+- INCLUDEPATH += $$a/ffmpeg/libavcodec
+ }
+ exists($$a/ffmpeg/libavformat) {
+ message(found $$a/ffmpeg!)
+ INCLUDEPATH += $$a/ffmpeg
+- INCLUDEPATH += $$a/ffmpeg/libavformat
+ }
+ exists($$a/ffmpeg/libavutil) {
+ message(found $$a/ffmpeg!)
+ INCLUDEPATH += $$a/ffmpeg
+- INCLUDEPATH += $$a/ffmpeg/libavutil
+ }
+ exists($$a/ffmpeg/libswscale) {
+ message(found $$a/ffmpeg!)
+ INCLUDEPATH += $$a/ffmpeg
+- INCLUDEPATH += $$a/ffmpeg/libswscale
+ DEFINES += HAVE_SWSCALE
+ }
+ exists($$a/libavcodec) {
+ message(found $$a/libavcodec!)
+- INCLUDEPATH += $$a/libavcodec
+ }
+ exists($$a/libavformat) {
+ message(found $$a/libavformat!)
+- INCLUDEPATH += $$a/libavformat
+ }
+ exists($$a/libavutil) {
+ message(found $$a/libavutil!)
+- INCLUDEPATH += $$a/libavutil
+ }
+ exists($$a/libswscale) {
+ message(found $$a/libswscale!)
+- INCLUDEPATH += $$a/libswscale
+ DEFINES += HAVE_SWSCALE
+ }
+ }
+Index: backlite-1.0.3/src/import/k9avidecode.cpp
+===================================================================
+--- backlite-1.0.3.orig/src/import/k9avidecode.cpp
++++ backlite-1.0.3/src/import/k9avidecode.cpp
+@@ -10,14 +10,14 @@
+ //
+ //
+ #include "k9avidecode.h"
+-#include <avcodec.h>
++#include <libavcodec/avcodec.h>
+ #include <qimage.h>
+ #include <dlfcn.h>
+ #include "k9common.h"
+
+ #ifdef HAVE_SWSCALE
+
+-#include "swscale.h"
++#include <libswscale/swscale.h>
+
+ static int sws_flags = SWS_BICUBIC;
+
+Index: backlite-1.0.3/src/import/k9avidecode.h
+===================================================================
+--- backlite-1.0.3.orig/src/import/k9avidecode.h
++++ backlite-1.0.3/src/import/k9avidecode.h
+@@ -14,13 +14,13 @@
+
+ #include "k9common.h"
+ #include <qobject.h>
+-#include <avformat.h>
+-#include <avutil.h>
++#include <libavformat/avformat.h>
++#include <libavutil/avutil.h>
+ #include <qimage.h>
+ #include <cstdlib>
+ #include <QObject>
+ #ifdef HAVE_SWSCALE
+-#include <swscale.h>
++#include <libswscale/swscale.h>
+ #endif
+ /**
+ @author Jean-Michel PETIT <k9copy@free.fr>
View
1  dev-db/innotop/Manifest
@@ -1,3 +1,4 @@
DIST innotop-1.4.0.tar.gz 77585 SHA256 43a17cc751629d1566bb4a619e0c4058afffe5499b287ef76b828f3405ddf9b2 SHA512 d3b2e1de9bb8b92221b5f02286150e4e2713c267f98bb50c6acfa0e40f47548add048486654735a2bfba233e3ab5ed77e38679e1e7e3f0c91958f4b042fece5b WHIRLPOOL eb7e170d20852a4fd9cb9f3ec5747ebd9ebaf3eb9db38bcb365b93fa3610219575a331a6643841a0b7da26a7140279f4689b977ed8ce20d7de9d504d7de88c35
DIST innotop-1.6.0.tar.gz 113671 SHA256 834fbfdfbd1e612aaf32537b86a30fb84f2a9458498722395cf71d929d12a811 SHA512 ce51f664ab4f775e3a0996cab7b8b1179da84cdc9c732b6ce4093be50086d388a59f13e232c483b48d88475efaa9c214b9fe8f85e39a1cf3b52d1cf2610b18dc WHIRLPOOL 0a89af3a0d29289582b4fd75a5b98ba5fd37d2935ee49bb4e40b5098c560ec321fdc75fa3049c7ebdec2adb79d969f3631e9b9253a8b3a5ed46ee97f8aa6f772
DIST innotop-1.7.2.tar.gz 763132 SHA256 9a78de6ffea59f36d223a81ef6b20688ad622b891071b251b9fd2d2359a40c7b SHA512 855fa7288a3bff7839aeaa8970f495dbed79209991de9a5b9aade4161fc83e7208c93b16b26aa5aaac5d5384c98bf6945f4d25a9ce006e3068b97f7c9f6d6c19 WHIRLPOOL e7ed99eecbf0ea14cb3eaf8159e087a9b7965983e707732dbcc07f908e2b349c3763567a9a1c5694ab2b0412da7c7a87286077899fdf0446cbfe31c687c21a8e
+DIST innotop-1.9.0.tar.gz 143179 SHA256 bc2669ea88fb728c6c4ed9c695c4d0b7b9ae5df0f158ef23e8853694bf4f240a SHA512 a3fe26b7e9e4a4608f6ef68e8cfefca080fd5799cc7780ffadd0b6bd0a0cfd035561bf6c10436f556b8fc79726304cae408343a231a57d02c74e3bd29b941a17 WHIRLPOOL 76226828f8c91608b03d49802cc082a77b552f7a482ab2186e71a4f9fb56662d17d4ee04c5187df78ca68a733ca4a710b3d6156e0b028375576c8abb9b7effd8
View
23 dev-db/innotop/innotop-1.9.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/innotop/innotop-1.9.0.ebuild,v 1.1 2013/01/18 02:16:49 robbat2 Exp $
+
+inherit perl-app
+
+DESCRIPTION="innotop - A text-mode MySQL and InnoDB monitor like mytop, but with many more features"
+HOMEPAGE="http://code.google.com/p/innotop/"
+SRC_URI="http://innotop.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-perl/DBD-mysql
+ dev-perl/TermReadKey
+ virtual/perl-Term-ANSIColor
+ virtual/perl-Time-HiRes"
+
+src_install() {
+ perl-module_src_install
+}
View
118 dev-db/mysql-init-scripts/files/mysql-5.1.67-init.d
@@ -0,0 +1,118 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/mysql-5.1.67-init.d,v 1.1 2013/01/18 01:51:47 robbat2 Exp $
+
+depend() {
+ use net.lo
+ # localmount needed for $basedir
+ need localmount
+}
+
+get_config() {
+ my_print_defaults --config-file="$1" mysqld |
+ sed -n -e "s/^--$2=//p"
+}
+
+mysql_svcname() {
+ local ebextra=
+ case "${SVCNAME}" in
+ mysql*) ;;
+ *) ebextra=" (mysql)" ;;
+ esac
+ echo "${SVCNAME}${ebextra}"
+}
+
+start() {
+ # Check for old conf.d variables that mean migration was not yet done.
+ set | egrep -sq '^(mysql_slot_|MYSQL_BLOG_PID_FILE|STOPTIMEOUT)'
+ rc=$?
+ # Yes, MYSQL_INIT_I_KNOW_WHAT_I_AM_DOING is a hidden variable.
+ # It does have a use in testing, as it is possible to build a config file
+ # that works with both the old and new init scripts simulateously.
+ if [ "${rc}" = 0 -a -z "${MYSQL_INIT_I_KNOW_WHAT_I_AM_DOING}" ]; then
+ eerror "You have not updated your conf.d for the new mysql-init-scripts-2 revamp."
+ eerror "Not proceeding because it may be dangerous."
+ return 1
+ fi
+
+ # Now we can startup
+ ebegin "Starting $(mysql_svcname)"
+
+ MY_CNF="${MY_CNF:-/etc/${SVCNAME}/my.cnf}"
+
+ if [ ! -r "${MY_CNF}" ] ; then
+ eerror "Cannot read the configuration file \`${MY_CNF}'"
+ return 1
+ fi
+
+ # tail -n1 is critical as these we only want the last instance of the option
+ local basedir=$(get_config "${MY_CNF}" basedir | tail -n1)
+ local datadir=$(get_config "${MY_CNF}" datadir | tail -n1)
+ local pidfile=$(get_config "${MY_CNF}" pid-file | tail -n1)
+ local socket=$(get_config "${MY_CNF}" socket | tail -n1)
+
+ if [ ! -d "${datadir}" ] ; then
+ eerror "MySQL datadir \`${datadir}' is empty or invalid"
+ eerror "Please check your config file \`${MY_CNF}'"
+ return 1
+ fi
+
+ if [ ! -d "${datadir}"/mysql ] ; then
+ eerror "You don't appear to have the mysql database installed yet."
+ eerror "Please run /usr/bin/mysql_install_db to have this done..."
+ return 1
+ fi
+
+ local piddir="${pidfile%/*}"
+ checkpath -d --owner mysql:mysql --mode 0755 "$piddir"
+ rc=$?
+ if [ $rc -ne 0 ]; then
+ eerror "Directory $piddir for pidfile does not exist and cannot be created"
+ return 1
+ fi
+
+ local startup_timeout=${STARTUP_TIMEOUT:-900}
+ local startup_early_timeout=${STARTUP_EARLY_TIMEOUT:-1000}
+ local tmpnice="${NICE:+"--nicelevel "}${NICE}"
+ local tmpionice="${IONICE:+"--ionice "}${IONICE}"
+ start-stop-daemon \
+ ${DEBUG:+"--verbose"} \
+ --start \
+ --exec "${basedir}"/sbin/mysqld \
+ --pidfile "${pidfile}" \
+ --background \
+ --wait ${startup_early_timeout} \
+ ${tmpnice} \
+ ${tmpionice} \
+ -- --defaults-file="${MY_CNF}" ${MY_ARGS}
+ local ret=$?
+ if [ ${ret} -ne 0 ] ; then
+ eend ${ret}
+ return ${ret}
+ fi
+
+ ewaitfile ${startup_timeout} "${socket}"
+ eend $? || return 1
+
+ save_options pidfile "${pidfile}"
+ save_options basedir "${basedir}"
+}
+
+stop() {
+ ebegin "Stopping $(mysql_svcname)"
+
+ local pidfile="$(get_options pidfile)"
+ local basedir="$(get_options basedir)"
+ local stop_timeout=${STOP_TIMEOUT:-120}
+
+ start-stop-daemon \
+ ${DEBUG:+"--verbose"} \
+ --stop \
+ --exec "${basedir}"/sbin/mysqld \
+ --pidfile "${pidfile}" \
+ --retry ${stop_timeout}
+ eend $?
+}
+# vim: filetype=gentoo-init-d sw=2 ts=2 sts=2 noet:
+
View
56 dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r3.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r3.ebuild,v 1.1 2013/01/18 01:51:47 robbat2 Exp $
+
+DESCRIPTION="Gentoo MySQL init scripts."
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+# This _will_ break with MySQL 5.0, 4.x, 3.x
+# It also NEEDS openrc for the save_options/get_options builtins.
+RDEPEND="!<dev-db/mysql-5.1
+ sys-apps/openrc"
+
+src_install() {
+ newconfd "${FILESDIR}/mysql-5.1.53-conf.d" "mysql"
+ newinitd "${FILESDIR}/mysql-5.1.67-init.d" "mysql"
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/logrotate.mysql" "mysql"
+}
+
+pkg_postinst() {
+ grep -sq mysql_slot "${ROOT}"/etc/conf.d/mysql
+ old_conf_present=$?
+ grep -sq get_slot_config "${ROOT}"/etc/init.d/mysql
+ old_init_present=$?
+
+ egrep -sq 'MY_CNF|MY_ARGS|(STARTUP|STOP)_TIMEOUT' "${ROOT}"/etc/conf.d/mysql
+ new_conf_present=$?
+ egrep -sq 'MY_ARGS|STOP_TIMEOUT' "${ROOT}"/etc/init.d/mysql
+ new_init_present=$?
+
+ einfo "Please note if you are using multiple internal 'slots' in the old"
+ einfo "conf.d fille, that you should use multiple init files now."
+ echo old $old_conf_present $old_init_present
+ echo new $new_conf_present $new_init_present
+
+ # new scripts present
+ if [ $new_conf_present -eq 0 -a $new_init_present -eq 0 -a \
+ $old_conf_present -eq 1 -a $old_init_present -eq 1 ]; then
+ :
+ elif [ $old_conf_present -eq 0 -a $old_init_present -eq 0 -a \
+ $new_conf_present -eq 1 -a $new_init_present -eq 1 ]; then
+ ewarn "Old /etc/init.d/mysql and /etc/conf.d/mysql still present!"
+ ewarn "Update both of those files to the new versions!"
+ else
+ eerror "DANGER, mixed update of /etc/init.d/mysql and /etc/conf.d/mysql"
+ eerror "detected! You must update BOTH to the new versions"
+ fi
+}
View
1  dev-lang/v8/Manifest
@@ -1,4 +1,5 @@
DIST v8-3.14.5.3.tar.bz2 10352249 SHA256 f91d851abd284589272f2b338c74e10f07ce667736e8e73cbd301172cb7f75a1 SHA512 ea090f390d9ec86b33393135d9e14f2a059e0341f65aaa86e4816ee9b2f0d9dbdb1ef1d86b6eab5742c93f62279bb4ce806a86eeacc4e0e0b04b0627c462b685 WHIRLPOOL fbb44dfed7c77fac28eb4d87e9f151ab0e70d6e57807de0f6af3c71ec7006cee15cc2935f3c75375f8a793a92fcd6a9f453ba2ea4b7e0d7353f5f0382ca9d937
DIST v8-3.15.11.2.tar.bz2 10394544 SHA256 b52eea34c9a897a365f97ab2649c1678f99b8757f08e96fd683ac06367f52a98 SHA512 ed2ac0ff280f129922a639961cd2c2824bfd3890175b5a1eda021e90550591904e224171b4b446a2547a0062a93fa411000c7a7ff61245f8950280e692d5dc4a WHIRLPOOL 459e465b3530cad900c1507b4f232963a288070e16a37739eabbf48948b95eb64ce598f7a01b19de5f981cac0e91c3725c3d7c47ac15bf373ba3c24c244ffe52
DIST v8-3.15.11.5.tar.bz2 10394328 SHA256 5dd7db8d8dd9247a10cdc48e647d3e83a8dac6768f7d0f8096539a9f0ebfaf64 SHA512 89e2658d555781eeecd7004fe058a693175ae7c515b7f290ea7acac32c27942afedd3a0c3d3c3a650ab78ed4772cc5eb04b4eb40782bfc857be8eac8e2a39e42 WHIRLPOOL 39c6ddad8531cba890d20e9874d282455ebb20a729d9f45acf1308358135226b04edd3bfe97a4cb36d985a51e3a1497b27cb9098c9b80412ca5aab980fe29b26
+DIST v8-3.16.4.1.tar.bz2 10435189 SHA256 74ab3bc11f6761e5108affcbe15bc673d2ecbe06aa38ea4b27d850321c0fdc2b SHA512 c0db5b0c101cfc2fb6d303c3fbfd021ee293e165fd3bf22b1d39ac510ac94d8f37dccdd67485880fd677c92cb0b0f51e591091abad8811dab2efb184445da6d9 WHIRLPOOL 2f2cf17b6b958c2ebf5aa9aa3f7865186374c6f23ae7123bfaaae07a92edfaf066b41a9db5465428e6ca1d21113d57ce8a2ab16fe38d0e7e5955b300747301dc
DIST v8-3.16.4.tar.bz2 10433190 SHA256 a7efdababbdc14dd226fc6aaddb2b93b9ff6a68cf249de595bc8cd87fe87f9db SHA512 2254f8e50ba87863d1f3cb158c35c9f9c7976d18ba533518b320e720252cf10bb5f85e08003836417359ab9eba6dc8f08ee0263bc8a93a02d9de87fc3b2356d9 WHIRLPOOL c831dae5aeef708047f536358d9747935c81eacbd48eabb5c3de640e541e531a0bddcccc4ccfa6706f0ca5492c28f24629d50e19043e3d8ad475c6aa29545c12
View
104 dev-lang/v8/v8-3.16.4.1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.16.4.1.ebuild,v 1.1 2013/01/18 05:30:46 phajdan.jr Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_{6,7} )
+
+inherit eutils multilib pax-utils python-any-r1 toolchain-funcs versionator
+
+DESCRIPTION="Google's open source JavaScript engine"
+HOMEPAGE="http://code.google.com/p/v8"
+SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.bz2"
+LICENSE="BSD"
+
+soname_version="$(get_version_component_range 1-3)"
+SLOT="0/${soname_version}"
+KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}"
+
+src_compile() {
+ tc-export AR CC CXX RANLIB
+ export LINK=${CXX}
+
+ local hardfp=off
+
+ # Use target arch detection logic from bug #354601.
+ case ${CHOST} in
+ i?86-*) myarch=ia32 ;;
+ x86_64-*)
+ if [[ $ABI = x86 ]] ; then
+ myarch=ia32
+ else
+ myarch=x64
+ fi ;;
+ arm*-hardfloat-*)
+ hardfp=on
+ myarch=arm ;;
+ arm*-*) myarch=arm ;;
+ *) die "Unrecognized CHOST: ${CHOST}"
+ esac
+ mytarget=${myarch}.release
+
+ local snapshot=on
+ host-is-pax && snapshot=off
+
+ # TODO: Add console=readline option once implemented upstream
+ # http://code.google.com/p/v8/issues/detail?id=1781
+
+ emake V=1 \
+ library=shared \
+ werror=no \
+ soname_version=${soname_version} \
+ snapshot=${snapshot} \
+ hardfp=${hardfp} \
+ ${mytarget} || die
+
+ pax-mark m out/${mytarget}/{cctest,d8,shell} || die
+}
+
+src_test() {
+ local arg testjobs
+ for arg in ${MAKEOPTS}; do
+ case ${arg} in
+ -j*) testjobs=${arg#-j} ;;
+ --jobs=*) testjobs=${arg#--jobs=} ;;
+ esac
+ done
+
+ tools/test-wrapper-gypbuild.py \
+ -j${testjobs:-1} \
+ --arch-and-mode=${mytarget} \
+ --no-presubmit \
+ --progress=dots || die
+}
+
+src_install() {
+ insinto /usr
+ doins -r include || die
+
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ # buildsystem is too horrific to get this built correctly
+ mkdir -p out/${mytarget}/lib.target
+ mv out/${mytarget}/libv8.so.${soname_version} \
+ out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) || die
+ install_name_tool \
+ -id "${EPREFIX}"/usr/$(get_libdir)/libv8$(get_libname) \
+ out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) \
+ || die
+ install_name_tool \
+ -change \
+ /usr/local/lib/libv8.so.${soname_version} \
+ "${EPREFIX}"/usr/$(get_libdir)/libv8$(get_libname) \
+ out/${mytarget}/d8 || die
+ fi
+
+ dobin out/${mytarget}/d8 || die
+
+ dolib out/${mytarget}/lib.target/libv8$(get_libname ${soname_version}) || die
+ dosym libv8$(get_libname ${soname_version}) /usr/$(get_libdir)/libv8$(get_libname) || die
+
+ dodoc AUTHORS ChangeLog || die
+}
View
1  dev-libs/libburn/Manifest
@@ -1 +1,2 @@
DIST libburn-1.2.4.tar.gz 917837 SHA256 f0598fa76d157a935b576778ab8cc772f96480894239da14be84986ef1313e4b SHA512 4d8c34bdb2c829931b2a8860580319f8e374d6ea04622e40d6b97fc2120dddcd0836d31011c7797508fce0e9e5a4bcd763332bb9d505058ce656e1118c85fe0e WHIRLPOOL ab175c6af51ab1cd1982e5b96480e3b6d17dcf6c70cd6fe3509cb0d440de81c30c5e88d9add269ebf6f4c031c814c56d299d3c125dcf6fdfae16b6ff974917f7
+DIST libburn-1.2.6.tar.gz 923413 SHA256 7b99a3036834c18259a59293b2aab37892550bd1d19a8a010fa338379555188f SHA512 5026f271680f3321281dfb89d8ab7e2975549db4848a9db79020b42869ab33974d9ba2d8ca1f0bcc6dabb7cd05fa99fb6087fbd6e62bcee77c96f879104c9e70 WHIRLPOOL 6654390f58dea410a3d4734532d9a97e4ce898a6a1853e179820817ad1491232fa86c94086d9837063b0db7ea25664554cfddd63709653aa8d1de165fb329810
View
42 dev-libs/libburn/libburn-1.2.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libburn/libburn-1.2.6.ebuild,v 1.1 2013/01/17 19:02:59 billie Exp $
+
+EAPI=5
+
+DESCRIPTION="Libburn is an open-source library for reading, mastering and writing optical discs."
+HOMEPAGE="http://libburnia-project.org"
+SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cdio debug static-libs track-src-odirect"
+
+RDEPEND="cdio? ( >=dev-libs/libcdio-0.83 )"
+DEPEND="$RDEPEND
+ virtual/pkgconfig"
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static) \
+ $(use_enable track-src-odirect) \
+ --enable-pkg-check-modules \
+ $(use_enable cdio libcdio) \
+ --disable-ldconfig-at-install \
+ $(use_enable debug)
+}
+
+src_install() {
+ default
+
+ dodoc CONTRIBUTORS doc/{comments,*.txt}
+
+ cd "${S}"/cdrskin
+ docinto cdrskin
+ dodoc *.txt README
+ docinto cdrskin/html
+ dohtml cdrskin_eng.html
+
+ find "${D}" -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
+}
View
1  dev-libs/libisoburn/Manifest
@@ -1 +1,2 @@
DIST libisoburn-1.2.4.tar.gz 1279036 SHA256 be5c3adfcf8c32e8489ac77de5842c39cfefd8e994edebabb8353262945a85bf SHA512 379febdaad104cdb020d2fee94da0843f8ae7db497eb4e5fe55cb4da20f88fd07c8ae766767c905abbe7120684a38b2eae7d62169ce00305d4d420204db72390 WHIRLPOOL 07e05f872c7ba7b7546edfe9b18ce44fdbb0d2e0e0d5369ca30c67a116026eb9e17461220035afccbafec3635fd799a6ac99749ad07eb851c435d4ed73025607
+DIST libisoburn-1.2.6.tar.gz 1363911 SHA256 caf09ad8b96b2ea4ef7cc54b1afbb65f7b7acfae2df6b5599efdef5b8d1bb7ce SHA512 6740659d0371f6b67964c233ba544c515bb42ce4d17a251d7fab56c38938008f8f2a39f750ccbef313aa5ec1b730aaebe4f5714a18075b1dfb195235e8ccf65c WHIRLPOOL c7c4e79254df63c477b3f8d4af3c951f0f71f80840ce8afac141136de78c32f5972d387036d57ea88bfb54bac380f21bca8ede92129ed3738a46814373525f43
View
59 dev-libs/libisoburn/libisoburn-1.2.6.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libisoburn/libisoburn-1.2.6.ebuild,v 1.1 2013/01/17 19:28:26 billie Exp $
+
+EAPI=5
+
+DESCRIPTION="Enables creation and expansion of ISO-9660 filesystems on all CD/DVD media supported by libburn"
+HOMEPAGE="http://libburnia-project.org/"
+SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+IUSE="acl cdio debug external-filters external-filters-setuid frontend-optional launch-frontend launch-frontend-setuid readline static-libs xattr zlib"
+
+REQUIRED_USE="frontend-optional? ( || ( launch-frontend launch-frontend-setuid ) )"
+
+RDEPEND=">=dev-libs/libburn-1.2.6
+ >=dev-libs/libisofs-1.2.6
+ readline? ( sys-libs/readline )
+ acl? ( virtual/acl )
+ xattr? ( sys-apps/attr )
+ zlib? ( sys-libs/zlib )
+ cdio? ( >=dev-libs/libcdio-0.83 )
+ launch-frontend? ( dev-lang/tcl dev-lang/tk )
+ launch-frontend-setuid? ( dev-lang/tcl dev-lang/tk )
+ frontend-optional? ( dev-tcltk/bwidget )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static) \
+ $(use_enable readline libreadline) \
+ $(use_enable acl libacl) \
+ $(use_enable xattr) \
+ $(use_enable zlib) \
+ --disable-libjte \
+ $(use_enable cdio libcdio) \
+ $(use_enable external-filters) \
+ $(use_enable external-filters-setuid) \
+ $(use_enable launch-frontend) \
+ $(use_enable launch-frontend-setuid) \
+ --disable-ldconfig-at-install \
+ --enable-pkg-check-modules \
+ $(use_enable debug)
+}
+
+src_install() {
+ default
+
+ dodoc CONTRIBUTORS doc/{comments,*.wiki,startup_file.txt}
+
+ cd "${S}"/xorriso
+ docinto xorriso
+ dodoc changelog.txt README_gnu_xorriso
+
+ find "${D}" -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
+}
View
3  dev-libs/libisoburn/metadata.xml
@@ -12,6 +12,9 @@ filters (Note: this is a potential security risk)</flag>
<flag name='external-filters-setuid'>Also allow the use of external setuid
processes as file content filters (Note: this is a potential security
risk)</flag>
+<flag name='launch-frontend'>Enable the tcl gui for xorriso</flag>
+<flag name='launch-frontend-setuid'>Enable the tcl gui for xorriso under setuid</flag>
+<flag name='frontend-optional'>Use <pkg>dev-tcltk/bwidget</pkg> which is not strictly required for the frontend</flag>
<flag name="cdio">Enable EXPERIMENTAL use of libcdio as system adapter</flag>
</use>
</pkgmetadata>
View
1  dev-libs/libisofs/Manifest
@@ -1 +1,2 @@
DIST libisofs-1.2.4.tar.gz 763300 SHA256 d0875e51f229c5e34491dce58f3cdddf8c98fadeae9e84b62b27cff7800a967f SHA512 4ebdab4b1d7c2b4b8ffd5431e27e765a405db14117f55a0c749ffa30ca705529f692762959b6e136bee78924524dd38fdbadbd722be1bd11be10ec23d928ab26 WHIRLPOOL 056f4176a84145eacd654648d7df122da843db4f66e76bb54ef579995718ead240bf3abe512fe405f6535245014bb92dec9a101c56a4849928f908afe1ce618b
+DIST libisofs-1.2.6.tar.gz 763513 SHA256 c89da6821d5cac049657a27bbbc19d69b475ca51bfd595804617ee6ee2e977b7 SHA512 6bc25297b79805b547fdd92833c850b145dcdc0f9e84004aac2cb19b0df302dc1a44612c320fca0f867653a212c42adea3a84a45d273f31cc7523a9325f1e3a4 WHIRLPOOL 3de5fae5663477820a2143cc013bb2a932157c6d6e701f379ea31fbc46eb5752295ec4debf5de1b8421a9b0a4d0044d484092c969baa608f5dabfe0cbe0a1bbe
View
40 dev-libs/libisofs/libisofs-1.2.6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libisofs/libisofs-1.2.6.ebuild,v 1.1 2013/01/17 19:16:08 billie Exp $
+
+EAPI=5
+
+DESCRIPTION="libisofs is an open-source library for reading, mastering and writing optical discs."
+HOMEPAGE="http://libburnia-project.org/"
+SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acl debug static-libs verbose-debug xattr zlib"
+
+RDEPEND="acl? ( virtual/acl )
+ xattr? ( sys-apps/attr )
+ zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static) \
+ $(use_enable debug) \
+ $(use_enable verbose-debug) \
+ $(use_enable acl libacl) \
+ $(use_enable xattr) \
+ $(use_enable zlib) \
+ --disable-libjte \
+ --disable-ldconfig-at-install
+}
+
+src_install() {
+ default
+
+ dodoc Roadmap doc/{checksums.txt,susp_aaip*,Tutorial,zisofs_format.txt}
+
+ find "${D}" -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
+}
View
1  dev-libs/nettle/Manifest
@@ -1,3 +1,4 @@
DIST nettle-1.15.tar.gz 829862 SHA256 d6e540bf4acc857a3b09580e7f61822d352ee83c119579bf7333f0a785f7d9ac SHA512 90178ab6af3d7048aeba888d65d83f77823b800689713979ead8e5eeec51026bac183953d4421276e249c2bcbb26e9528ed304754c951147df8bdcf35a2c6596 WHIRLPOOL 852cbc828d78a3b495607d89daf110781c8c3e410519be6d2495c65745a923ca4c7ad548b475330744b84bf416c4bdf72ae3eb1569d94dcca45ee989fe0326e3
DIST nettle-2.4.tar.gz 1075789 SHA256 a6009208df6881f75aa1a87081ccfb2ccac1884da10670c53d7b76596f649c3f SHA512 2523e3a0119918c5f4988d8c7e62b1895067b7ffee440910f2040c7cba22d1d26d8f13aee266779edb88605faa6252e4d2e22acbee54d886f766c0c0c9765516 WHIRLPOOL bc5f23379d3c49e59b646f63f28967219f51443767e937043859fb5cccd83b863f1600ca6560019355dcec55428e6113200354a8357bd8770d6cdcb5569a944b
DIST nettle-2.5.tar.gz 1113274 SHA256 4aa142e908b0053082d7729fc0155dc90dbe71c8ef5f50f30034805ed5c92c72 SHA512 186c3d8687628d7ce2d0e3880355741970bb6e0354f1b3aa49118e7c729cb65348fa2b1ce3b56dbdf01fbcb25a2bd6d5ce634b8a1ab419f9f93b693321f57ea1 WHIRLPOOL 4229b8a11b3bf45396bad775ead91f9a5c4bb45bde821ba49185a19cd7595e840883e0f90af52744e3aae8ffef17e526c025cc1830b4e228c578debf5a8811ca
+DIST nettle-2.6.tar.gz 1385695 SHA256 60df624f63b997c832cae29f48ab9ada99df815bcd60d231526b83e786b4b156 SHA512 edee4b7ecd34d7db8636650e59916c358a9be323128b4b7ad6eb4088a0a09a6744d0ebf382b23143fbcee3d40b148f43a54f25759141b16ba0befc3c46740b80 WHIRLPOOL a7f56870918400ae4966ad0b6f398667e629ab91355bc3cbd51039757dbd9bd140fa501ae1b8a0a3cf82196036afd90671776dcb5f2587ba281bc01c27049ae6
View
89 dev-libs/nettle/files/nettle-2.6-shared.patch
@@ -0,0 +1,89 @@
+--- nettle-2.6/examples/Makefile.in
++++ nettle-2.6/examples/Makefile.in
+@@ -8,7 +8,7 @@
+ include ../config.make
+
+ PRE_CPPFLAGS = -I.. -I$(top_srcdir)
+-PRE_LDFLAGS = -L..
++PRE_LDFLAGS = -L../.lib
+
+ OPENSSL_LIBFLAGS = @OPENSSL_LIBFLAGS@
+ BENCH_LIBS = @BENCH_LIBS@ -lm
+@@ -49,11 +49,11 @@
+ ( cd .. && $(MAKE) nettle-internal.$(OBJEXT))
+
+ # For Solaris and BSD make, we have to use an explicit rule for each executable
+-next-prime$(EXEEXT): next-prime.$(OBJEXT) $(GETOPT_OBJS) ../libhogweed.a
++next-prime$(EXEEXT): next-prime.$(OBJEXT) $(GETOPT_OBJS) ../$(LIBHOGWEED_FORLINK)
+ $(LINK) next-prime.$(OBJEXT) $(GETOPT_OBJS) \
+ -lhogweed -lnettle $(LIBS) -o next-prime$(EXEEXT)
+
+-random-prime$(EXEEXT): random-prime.$(OBJEXT) io.$(OBJEXT) $(GETOPT_OBJS) ../libhogweed.a
++random-prime$(EXEEXT): random-prime.$(OBJEXT) io.$(OBJEXT) $(GETOPT_OBJS) ../$(LIBHOGWEED_FORLINK)
+ $(LINK) random-prime.$(OBJEXT) io.$(OBJEXT) $(GETOPT_OBJS) \
+ -lhogweed -lnettle $(LIBS) -o random-prime$(EXEEXT)
+
+@@ -102,7 +102,7 @@
+ nettle-benchmark$(EXEEXT): $(BENCH_OBJS)
+ $(LINK) $(BENCH_OBJS) -lnettle $(BENCH_LIBS) $(OPENSSL_LIBFLAGS) -o nettle-benchmark$(EXEEXT)
+
+-$(TARGETS) : io.$(OBJEXT) ../libnettle.a
++$(TARGETS) : io.$(OBJEXT) ../$(LIBNETTLE_FORLINK)
+
+
+ check: $(TS_ALL)
+--- nettle-2.6/testsuite/Makefile.in
++++ nettle-2.6/testsuite/Makefile.in
+@@ -8,7 +8,7 @@
+ include ../config.make
+
+ PRE_CPPFLAGS = -I.. -I$(top_srcdir)
+-PRE_LDFLAGS = -L..
++PRE_LDFLAGS = -L../.lib
+
+ TS_NETTLE_SOURCES = aes-test.c arcfour-test.c arctwo-test.c \
+ blowfish-test.c cast128-test.c \
+@@ -93,7 +93,7 @@
+ include $(srcdir)/.test-rules.make
+
+ $(TARGETS) $(EXTRA_TARGETS): testutils.$(OBJEXT) ../nettle-internal.$(OBJEXT) \
+- ../libnettle.a @IF_HOGWEED@ ../libhogweed.a
++ ../$(LIBNETTLE_FORLINK) @IF_HOGWEED@ ../$(LIBHOGWEED_FORLINK)
+
+ # For use as, e.g.,
+ #
+--- nettle-2.6/tools/Makefile.in
++++ nettle-2.6/tools/Makefile.in
+@@ -15,7 +15,7 @@
+ include ../config.make
+
+ PRE_CPPFLAGS = -I.. -I$(top_srcdir)
+-PRE_LDFLAGS = -L..
++PRE_LDFLAGS = -L../.lib
+
+ HOGWEED_TARGETS = pkcs1-conv$(EXEEXT)
+ TARGETS = sexp-conv$(EXEEXT) nettle-hash$(EXEEXT) nettle-lfib-stream$(EXEEXT) \
+@@ -34,19 +34,19 @@
+ DISTFILES = $(SOURCES) Makefile.in input.h misc.h output.h parse.h
+
+ sexp_conv_OBJS = $(sexp_conv_SOURCES:.c=.$(OBJEXT)) $(getopt_OBJS)
+-sexp-conv$(EXEEXT): $(sexp_conv_OBJS) ../libnettle.a
++sexp-conv$(EXEEXT): $(sexp_conv_OBJS) ../$(LIBNETTLE_FORLINK)
+ $(LINK) $(sexp_conv_OBJS) -lnettle $(LIBS) -o $@
+
+-nettle-lfib-stream$(EXEEXT): nettle-lfib-stream.$(OBJEXT) ../libnettle.a
++nettle-lfib-stream$(EXEEXT): nettle-lfib-stream.$(OBJEXT) ../$(LIBNETTLE_FORLINK)
+ $(LINK) nettle-lfib-stream.$(OBJEXT) -lnettle $(LIBS) -o $@
+
+ pkcs1_conv_OBJS = $(pkcs1_conv_SOURCES:.c=.$(OBJEXT)) $(getopt_OBJS)
+-pkcs1-conv$(EXEEXT): $(pkcs1_conv_OBJS) ../libnettle.a ../libhogweed.a
++pkcs1-conv$(EXEEXT): $(pkcs1_conv_OBJS) ../$(LIBNETTLE_FORLINK) ../$(LIBHOGWEED_FORLINK)
+ $(LINK) $(pkcs1_conv_OBJS) -lhogweed -lnettle $(LIBS) -o $@
+
+ # FIXME: Avoid linking with gmp
+ nettle_hash_OBJS = $(nettle_hash_SOURCES:.c=.$(OBJEXT)) $(getopt_OBJS)
+-nettle-hash$(EXEEXT): $(nettle_hash_OBJS) ../libnettle.a
++nettle-hash$(EXEEXT): $(nettle_hash_OBJS) ../$(LIBNETTLE_FORLINK)
+ $(LINK) $(nettle_hash_OBJS) -lnettle $(LIBS) -o $@
+
+
View
50 dev-libs/nettle/nettle-2.6.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/nettle-2.6.ebuild,v 1.3 2013/01/18 03:39:56 radhermit Exp $
+
+EAPI="5"
+
+inherit eutils autotools
+
+DESCRIPTION="Low-level cryptographic library"
+HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
+SRC_URI="http://www.lysator.liu.se/~nisse/archive/${P}.tar.gz"
+
+LICENSE="|| ( LGPL-3 LGPL-2.1 )"
+SLOT="0/4" # subslot = libnettle soname version
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc +gmp static-libs test"
+
+DEPEND="gmp? ( dev-libs/gmp )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-shared.patch
+
+ sed -e '/CFLAGS=/s: -ggdb3::' \
+ -e 's/solaris\*)/sunldsolaris*)/' \
+ -i configure.ac || die
+
+ # conditionally build tests and examples required by tests
+ use test || sed -i '/SUBDIRS/s/testsuite examples//' Makefile.in || die
+
+ eautoreconf
+}
+
+src_configure() {
+ # --disable-openssl bug #427526
+ econf \
+ $(use_enable gmp public-key) \
+ $(use_enable static-libs static) \
+ $(use_enable doc documentation) \
+ --disable-openssl
+}
+
+src_install() {
+ default
+
+ if use doc ; then
+ dohtml nettle.html
+ dodoc nettle.pdf
+ fi
+}
View
1  dev-libs/userspace-rcu/Manifest
@@ -1,2 +1,3 @@
DIST userspace-rcu-0.7.3.tar.bz2 385350 SHA256 63f540a5d3c947fa3739711099fb87a66036d3c9560f26da763e500da296a1af SHA512 4e699d1b79a39428a964ce51790b46bbf8b565df19cd706b7590af60ad08eefb7212dea409b2c7dd48a8cc54b98e097c085c6134d1a523ed91e23b33e1a2405c WHIRLPOOL 134b5508c73a0ef58ea5f12673fab02b1f3a046236072b1973f59c490c56c1cd590678627067c94f411fd88b39461cab620dbc39e0dcace630911b849ae75644
DIST userspace-rcu-0.7.5.tar.bz2 383705 SHA256 0f7d4a1e0c6c6ecc75e7de0a4b80518c6ba93c97872981e196c758db7a2404e2 SHA512 de3d071723ce40428e8b1e9539f236769274c0ceb251bf736baa920ca8625f69e9cce7a400f59cebffdb7c38fb15842ef5feaf8a4bcd1eec0aa7463846644487 WHIRLPOOL a255bc2e4327ffde21a2003527f1621371b12046c7efbf1621ee437f33b2879ad13fcc641d374f58b21da72a4f30549543c9b08c9097643ee78a5c4916de101e
+DIST userspace-rcu-0.7.6.tar.bz2 393590 SHA256 71f2c0b75f3473e4d7aa6ac5111ca4d9cccccd5d131e87b53a07d35bd2c5900a SHA512 b6bdb512fed79a47205c16311b5d2a70e9133a486c0b9754f3ce54c2b4980b70c5a51abdc268e41b1f1d990f825a9995993ff5412e58374b96f2490fc0baad91 WHIRLPOOL 675ae2f5bc6e667323806ca4ffc96fb0ca3acda94b7c4b0e6a05861f35d867c5d4fcda619f0778b48d1c254a42b822eaee5a7bac5a174491d65878fcced2ec18
View
27 dev-libs/userspace-rcu/userspace-rcu-0.7.6.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/userspace-rcu/userspace-rcu-0.7.6.ebuild,v 1.1 2013/01/18 04:16:50 radhermit Exp $
+
+EAPI=5
+
+DESCRIPTION="userspace RCU (read-copy-update) library"
+HOMEPAGE="http://lttng.org/urcu"
+SRC_URI="http://lttng.org/files/urcu/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs test"
+
+DEPEND="test? ( sys-process/time )"
+
+src_configure() {
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -exec rm -f {} +
+}
View
4 dev-python/jsonpatch/jsonpatch-0.12.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jsonpatch/jsonpatch-0.12.ebuild,v 1.1 2013/01/17 17:13:33 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jsonpatch/jsonpatch-0.12.ebuild,v 1.2 2013/01/17 19:23:48 prometheanfire Exp $
EAPI=5
PYTHON_COMPAT=( python2_6 python2_7 )
@@ -18,4 +18,4 @@ KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/jsonpointer"
+RDEPEND="dev-python/jsonpointer[${PYTHON_USEDEP}]"
View
5 dev-python/python-glanceclient/metadata.xml
@@ -7,10 +7,7 @@
<name>Matthew Thode</name>
</maintainer>
<longdescription lang="en">
- This is a client for the OpenStack Nova API.
- There's a Python API (the novaclient module),
- and a command-line script (nova).
- Each implements 100% of the OpenStack Nova API.
+ This is a client for the OpenStack Glance API.
</longdescription>
</pkgmetadata>
View
10 dev-python/python-glanceclient/python-glanceclient-0.7.0.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-glanceclient/python-glanceclient-0.7.0.ebuild,v 1.1 2013/01/17 17:30:41 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-glanceclient/python-glanceclient-0.7.0.ebuild,v 1.4 2013/01/17 19:51:12 prometheanfire Exp $
EAPI=5
-PYTHON_COMPAT=( python2_6 python2_7 )
+PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
-DESCRIPTION="A client for the OpenStack Nova API"
+DESCRIPTION="A client for the OpenStack Glance API"
HOMEPAGE="https://github.com/openstack/python-glanceclient"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
@@ -26,10 +26,10 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
# =dev-python/pep8-1.3.3
# >=dev-python/sphinx-1.1.2 )"
RDEPEND="virtual/python-argparse[${PYTHON_USEDEP}]
- dev-python/python-keystoneclient
+ dev-python/python-keystoneclient[${PYTHON_USEDEP}]
<=dev-python/prettytable-0.7
dev-python/pyopenssl
- dev-python/warlock"
+ dev-python/warlock[${PYTHON_USEDEP}]"
#python_test() {
# "${PYTHON}" setup.py nosetests || die
View
12 dev-python/warlock/warlock-0.7.0.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/warlock/warlock-0.7.0.ebuild,v 1.1 2013/01/17 17:25:38 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/warlock/warlock-0.7.0.ebuild,v 1.2 2013/01/17 19:20:55 prometheanfire Exp $
EAPI=5
-PYTHON_COMPAT=( python2_6 python2_7 )
+PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
@@ -18,10 +18,10 @@ IUSE="test"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
test? ( virtual/python-unittest2[${PYTHON_USEDEP}]
- dev-python/jsonpatch
- dev-python/jsonschema )"
-RDEPEND="dev-python/jsonpatch
- dev-python/jsonschema"
+ dev-python/jsonpatch[${PYTHON_USEDEP}]
+ dev-python/jsonschema[${PYTHON_USEDEP}] )"
+RDEPEND="dev-python/jsonpatch[${PYTHON_USEDEP}]
+ dev-python/jsonschema[${PYTHON_USEDEP}]"
python_test() {
"${PYTHON}" test/test_core.py || die
View
7 dev-scheme/chicken/Manifest
@@ -1,3 +1,4 @@
-DIST chicken-3.3.0.tar.gz 4228441 RMD160 74035304164d5c8c2f2ed7571662452df86725f2 SHA1 3af69007f664ccdef988863f1c6ac24405c5500c SHA256 5ce2519bac9956de5700a5777b2bbc2cd89202ef2d2252a40a0d1e8c9854bec6
-DIST chicken-4.6.0.tar.gz 3019126 RMD160 f279b39b8294496a6e22b39b56d3fcf108d55405 SHA1 a801383786908022223c32337fb1c5814e6c26a5 SHA256 c55d1dadf9941b3efbc7be9181d5c7cbc304a20c614625fbf710c0acaa1cd245
-DIST chicken-4.7.3.tar.gz 3316152 RMD160 150cdd093e3a375db99f83a90ee1305c70f8f88c SHA1 47b139f8c4c6fa10af891ce36db24744973321c3 SHA256 00c82bc2208d74463a69356d2a30a3771f87048ea87fb9c024d464b3c9d4e230
+DIST chicken-3.3.0.tar.gz 4228441 SHA256 5ce2519bac9956de5700a5777b2bbc2cd89202ef2d2252a40a0d1e8c9854bec6
+DIST chicken-4.6.0.tar.gz 3019126 SHA256 c55d1dadf9941b3efbc7be9181d5c7cbc304a20c614625fbf710c0acaa1cd245
+DIST chicken-4.7.3.tar.gz 3316152 SHA256 00c82bc2208d74463a69356d2a30a3771f87048ea87fb9c024d464b3c9d4e230
+DIST chicken-4.8.0.tar.gz 3970818 SHA256 5b2e8c6b4b13b502d8c684b394d80ed490d2884c03789353d895ab85d19979ab SHA512 5ea40ca240d9d6ab9a250947288fda3cc1202b6cb689207dc603c1ca86f537f407b1c4a8020533ccfc7b48fa01d3bf8f7229f883a2a95edb3f39863d43aa6c63 WHIRLPOOL 52010977034e0661af4c692d828303ebaad8d6d2517908b2474e64c0f8840c0a8e8342577853d66c1921033926fdefa21db66857786e659d92260390e98b879f
View
70 dev-scheme/chicken/chicken-4.8.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/chicken/chicken-4.8.0.ebuild,v 1.1 2013/01/17 22:22:13 pchrist Exp $
+
+EAPI="3"
+
+inherit eutils multilib
+
+DESCRIPTION="Chicken is a Scheme interpreter and native Scheme to C compiler"
+HOMEPAGE="http://www.call-cc.org/"
+SRC_URI="http://code.call-cc.org/releases/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+IUSE="emacs parallel-build"
+
+DEPEND="sys-apps/texinfo
+ emacs? ( virtual/emacs )"
+RDEPEND="emacs? ( virtual/emacs app-emacs/scheme-complete )"
+
+# chicken's testsuite is not runnable before install
+# upstream has been notified of the issue
+RESTRICT=test
+
+src_prepare() {
+ if use "parallel-build"
+ then
+ epatch "${FILESDIR}"/${P}-parallel-build.patch
+ fi
+
+ #Because chicken's Upstream is in the habit of using variables that
+ #portage also uses :( eg. $ARCH and $A
+ sed 's,A\(\s?=\|)\),chicken&,' -i Makefile.cross-linux-mingw \
+ defaults.make rules.make \
+ || die "sed failed"
+
+ sed "s,ARCH,zARCH," -i Makefile.bsd Makefile.cross-linux-mingw \
+ Makefile.cygwin Makefile.haiku Makefile.linux Makefile.macosx \
+ Makefile.mingw Makefile.mingw-msys Makefile.solaris \
+ defaults.make rules.make \
+ || die "sed failed"
+
+ sed "s,\$(PREFIX)/lib,\$(PREFIX)/$(get_libdir)," -i defaults.make || die "sed failed"
+ sed "s,\$(DATADIR)/doc,\$(SHAREDIR)/doc/${P}," -i defaults.make || die "sed failed"
+}
+
+src_compile() {
+ OPTIONS="PLATFORM=linux PREFIX=/usr"
+ if use "parallel-build"
+ then
+ emake ${OPTIONS} C_COMPILER_OPTIMIZATION_OPTIONS="${CFLAGS}" \
+ LINKER_OPTIONS="${LDFLAGS}" \
+ HOSTSYSTEM="${CBUILD}" || die "emake failed"
+ else
+ emake -j1 ${OPTIONS} C_COMPILER_OPTIMIZATION_OPTIONS="${CFLAGS}" \
+ LINKER_OPTIONS="${LDFLAGS}" \
+ HOSTSYSTEM="${CBUILD}" || die "emake failed"
+ fi
+}
+
+src_install() {
+ # still can't run make in parallel for the install target
+ emake -j1 ${OPTIONS} DESTDIR="${D}" HOSTSYSTEM="${CBUILD}" \
+ LINKER_OPTIONS="${LDFLAGS}" \
+ install || die
+
+ rm "${D}"/usr/share/doc/${P}/LICENSE || die
+ dodoc NEWS || die
+}
View
74 dev-scheme/chicken/files/chicken-4.8.0-parallel-build.patch
@@ -0,0 +1,74 @@
+diff --git a/GNUmakefile b/GNUmakefile
+index 9bc40ca..c697f14 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -49,6 +49,9 @@ STANDARD_TARGETS \
+ fullcheck libs install-target install-dev bench
+
+ .PHONY: $(STANDARD_TARGETS) dist boot-chicken
++# Build this file's targets sequentially. This avoids executing overlapping
++# makes if the user specifies multiple targets.
++.NOTPARALLEL:
+
+ $(STANDARD_TARGETS):
+ $(MAKE) -f $(SRCDIR)/Makefile.$(PLATFORM) CONFIG=$(CONFIG) $@
+diff --git a/README b/README
+index 8d0d067..551b716 100644
+--- a/README
++++ b/README
+@@ -72,7 +72,7 @@
+ platforms.
+
+ Note that parallel builds (using the "-j" make(1) option) are
+- *not* supported.
++ also supported. Beware that parallel install will not work though.
+
+ If you invoke "make" later with different configuration parameters,
+ it is advisable to run:
+diff --git a/rules.make b/rules.make
+index 929b0a3..a8cb9b0 100644
+--- a/rules.make
++++ b/rules.make
+@@ -243,8 +243,8 @@ lib$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(A): $(APPLY_HACK_OBJECT) $(LIBCHIC
+
+ # import libraries and extensions
+
+-%.so: %.o
+- $(LINKER) $(LINKER_OPTIONS) $(LINKER_LINK_SHARED_DLOADABLE_OPTIONS) $^ $(LINKER_OUTPUT_OPTION) $@ \
++%.so: %.o $(PRIMARY_LIBCHICKEN)
++ $(LINKER) $(LINKER_OPTIONS) $(LINKER_LINK_SHARED_DLOADABLE_OPTIONS) $< $(LINKER_OUTPUT_OPTION) $@ \
+ $(LINKER_LIBRARY_PREFIX)$(PROGRAM_PREFIX)chicken$(PROGRAM_SUFFIX)$(LINKER_LIBRARY_SUFFIX) \
+ $(LIBRARIES)
+
+@@ -582,9 +582,9 @@ chicken-profile.c: $(SRCDIR)chicken-profile.scm
+ $(CHICKEN) $< $(CHICKEN_PROGRAM_OPTIONS) -output-file $@
+ chicken-install.c: $(SRCDIR)chicken-install.scm setup-download.c setup-api.c
+ $(CHICKEN) $< $(CHICKEN_PROGRAM_OPTIONS) -output-file $@
+-chicken-uninstall.c: $(SRCDIR)chicken-uninstall.scm
++chicken-uninstall.c: $(SRCDIR)chicken-uninstall.scm setup-api.c
+ $(CHICKEN) $< $(CHICKEN_PROGRAM_OPTIONS) -output-file $@
+-chicken-status.c: $(SRCDIR)chicken-status.scm
++chicken-status.c: $(SRCDIR)chicken-status.scm setup-api.c
+ $(CHICKEN) $< $(CHICKEN_PROGRAM_OPTIONS) -output-file $@
+ csc.c: $(SRCDIR)csc.scm
+ $(CHICKEN) $< $(CHICKEN_PROGRAM_OPTIONS) -output-file $@
+@@ -675,14 +675,17 @@ bench: $(CHICKEN_SHARED_EXECUTABLE) $(CSI_SHARED_EXECUTABLE) $(CSC_PROGRAM)$(EXE
+ .PHONY: boot-chicken
+
+ boot-chicken:
++ $(MAKE) -f Makefile.$(PLATFORM) PLATFORM=$(PLATFORM) CONFIG= confclean
+ $(MAKE) -f Makefile.$(PLATFORM) PLATFORM=$(PLATFORM) PREFIX=/nowhere CONFIG= \
+ CHICKEN=$(CHICKEN) PROGRAM_SUFFIX=-boot-stage1 STATICBUILD=1 \
+ C_COMPILER_OPTIMIZATION_OPTIONS= C_HACKED_APPLY= BUILDING_CHICKEN_BOOT=1 \
+- confclean chicken-boot-stage1$(EXE)
++ chicken-boot-stage1$(EXE)
++ $(MAKE) -f Makefile.$(PLATFORM) PLATFORM=$(PLATFORM) CONFIG= touchfiles
+ $(MAKE) -f Makefile.$(PLATFORM) PLATFORM=$(PLATFORM) PREFIX=/nowhere CONFIG= \
+ CHICKEN=.$(SEP)chicken-boot-stage1$(EXE) PROGRAM_SUFFIX=-boot \
+ STATICBUILD=1 C_COMPILER_OPTIMIZATION_OPTIONS= \
+- touchfiles chicken-boot$(EXE) confclean
++ chicken-boot$(EXE)
++ $(MAKE) -f Makefile.$(PLATFORM) PLATFORM=$(PLATFORM) CONFIG= confclean
+
+ .PHONY: touchfiles
+
View
2  games-action/trosh/Manifest
@@ -0,0 +1,2 @@
+DIST trosh-20.zip 5182303 SHA256 585342c1fd835017f83704be10a02151cfaafdae836ab89a5ffd0d7206b34465 SHA512 2a8988f5715340850a61acde54403c968947d41d5f0a1ac098c4cc3959f69f150cee567933fd5148a2c23c237210c10dc58005de1bd949d6db59cd794a0003ec WHIRLPOOL 0adbd2948162e177a64301021c5ddde19c7a88365b414019ffe4201a16b4ead614f4707dae370fbb195c98923cbdf0d01424c176a7726f6eb5d52ab05b5f544d
+DIST trosh.png 242 SHA256 567bf00d204e9de9c42a87fac040fdac2fcc17c114427c8175a3f859b455111f SHA512 85ff46c8c75b018a59a8e7dace85fc5ccf2439babedb0e4d134301eb9f7edfe5d7f4f3af1329f04257c16d978f27df38f10cb3ffbc4b424808a5f3c5c78bfc69 WHIRLPOOL 5831ffa87b90d3102c58fef94caff287ac727e7eda9b100ceff9d29a2a50c851e73126b7da28d8ae614887db40863c19f7136f44bb02398f0b92ed0d44ad226c
View
10 games-action/trosh/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>games</herd>
+ <maintainer>
+ <email>hasufell@gentoo.org</email>
+ <name>Julian Ospald</name>
+ </maintainer>
+</pkgmetadata>
+
View
51 games-action/trosh/trosh-20.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/trosh/trosh-20.ebuild,v 1.1 2013/01/17 21:40:07 hasufell Exp $
+
+EAPI=5
+
+inherit eutils gnome2-utils games
+
+DESCRIPTION="A game made in 20 hours for a friend. It has explosions"
+HOMEPAGE="http://stabyourself.net/trosh/"
+SRC_URI="http://stabyourself.net/dl.php?file=trosh/trosh-linux.zip -> ${P}.zip
+ http://dev.gentoo.org/~hasufell/distfiles/${PN}.png"
+
+LICENSE="WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=games-engines/love-0.8.0
+ media-libs/devil[png]"
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}
+
+src_install() {
+ local dir=${GAMES_DATADIR}/love/${PN}
+
+ exeinto "${dir}"
+ doexe ${PN}.love
+
+ dodoc {LICENSE,readme}.txt README
+
+ doicon -s 32 "${DISTDIR}"/${PN}.png
+ games_make_wrapper ${PN} "love ${PN}.love" "${dir}"
+ make_desktop_entry ${PN}
+
+ prepgamesdirs
+}
+
+pkg_preinst() {
+ games_pkg_preinst
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ games_pkg_postinst
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
View
1  games-emulation/vbam/Manifest
@@ -1 +1,2 @@
DIST vbam-1.8.0.1090.tar.xz 823216 SHA256 998df784fb80188c0cd02502856881fcbfb81e40799504fcef2022f22a1af5c4 SHA512 2ea033161621d8f9e21c369f9b27ab164bd87a331f28293c8bb2fec440766aaaffc2c17ac18009b8a004eec19057dbd786073733d85a728cf1624ad3e9a44ff2 WHIRLPOOL abe1d73005d338e7057d160974b8e42a43a13253d5866a80820f9248c68778765568e12afbbd996a4ce440cdbb3ddb79d88d4a045ae2753b1994c674a7b56a82
+DIST vbam-1.8.0.1149.tar.xz 824980 SHA256 7eb2c29a416faca9c7ab28cb953c276e76c51b6b45bd5ae83f7f9a32b8c6d252 SHA512 aaf2262780ee723077002c43ca317c81a85bf2350067aa504ad578d1280765f65baac9a8428e595b0c746db1bd37ce29f9bb1758aaef300e7d52b4da45652e46 WHIRLPOOL bc230cb7a485f198a8b3ca050b85b1e167a3b313edf36753c016c8e44a2a10a99a3163c649eb48ffbdb5747fbff35909e30aebd537bcb38c1a72ad0d783e969b
View
48 games-emulation/vbam/files/vbam-1.8.0.1149-desktop.patch
@@ -0,0 +1,48 @@
+--- vbam-1.8.0.1149/src/gtk/gvbam.desktop
++++ vbam-1.8.0.1149/src/gtk/gvbam.desktop
+@@ -1,11 +1,11 @@
+-[Desktop Entry]
+-Version=1.0
+-Encoding=UTF-8
+-Type=Application
+-Name=VBA-M
+-GenericName=GameBoy Advance Emulator
+-Comment=Nindendo GameBoy Advance Emulator
+-Exec=gvbam
+-Icon=vbam
+-Categories=Application;Game;Emulator;GTK
+-MimeType=application/x-gameboy-rom;application/x-gameboy-advance-rom;application/x-dmg-rom;application/x-agb-rom;application/x-gb-rom;application/x-gba-rom
++[Desktop Entry]
++Version=1.0
++Encoding=UTF-8
++Type=Application
++Name=VBA-M
++GenericName=GameBoy Advance Emulator
++Comment=Nindendo GameBoy Advance Emulator
++Exec=gvbam
++Icon=vbam
++Categories=Game;Emulator;GTK;
++MimeType=application/x-gameboy-rom;application/x-gameboy-advance-rom;application/x-dmg-rom;application/x-agb-rom;application/x-gb-rom;application/x-gba-rom;
+--- vbam-1.8.0.1149/src/wx/wxvbam.desktop
++++ vbam-1.8.0.1149/src/wx/wxvbam.desktop
+@@ -1,10 +1,10 @@
+-[Desktop Entry]
+-Version=1.0
+-Encoding=UTF-8
+-Type=Application
+-Name=VBA-M
+-GenericName=GameBoy Advance Emulator
+-Comment=Nindendo GameBoy Advance Emulator
+-Exec=wxvbam
+-Icon=vbam
+-Categories=Application;Game;Emulator
++[Desktop Entry]
++Version=1.0
++Encoding=UTF-8
++Type=Application
++Name=VBA-M
++GenericName=GameBoy Advance Emulator
++Comment=Nindendo GameBoy Advance Emulator
++Exec=wxvbam
++Icon=vbam
++Categories=Game;Emulator;
View
109 games-emulation/vbam/vbam-1.8.0.1149.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/vbam/vbam-1.8.0.1149.ebuild,v 1.2 2013/01/18 01:08:23 radhermit Exp $
+
+EAPI=4
+WX_GTK_VER="2.8"
+
+inherit eutils cmake-utils wxwidgets games
+
+ESVN_REPO_URI="https://vbam.svn.sourceforge.net/svnroot/vbam/trunk"
+
+DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
+HOMEPAGE="http://vba-m.ngemu.com"
+SRC_URI="http://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cairo ffmpeg gtk link lirc nls openal +sdl wxwidgets"
+REQUIRED_USE="|| ( sdl gtk wxwidgets )"
+
+RDEPEND=">=media-libs/libpng-1.4
+ media-libs/libsdl[joystick]
+ link? ( media-libs/libsfml )
+ sys-libs/zlib
+ virtual/glu
+ virtual/opengl
+ ffmpeg? ( virtual/ffmpeg )
+ gtk? ( >=dev-cpp/glibmm-2.4.0:2
+ >=dev-cpp/gtkmm-2.4.0:2.4
+ >=dev-cpp/gtkglextmm-1.2.0 )
+ lirc? ( app-misc/lirc )
+ nls? ( virtual/libintl )
+ wxwidgets? (
+ cairo? ( x11-libs/cairo )
+ openal? ( media-libs/openal )
+ x11-libs/wxGTK:2.8[X,opengl]
+ )"
+DEPEND="${RDEPEND}
+ x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
+ nls? ( sys-devel/gettext )
+ app-arch/xz-utils
+ virtual/pkgconfig"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-desktop.patch
+
+ # Fix issue with zlib-1.2.5.1 macros (bug #383179)
+ sed -i '1i#define OF(x) x' src/common/memgzio.c || die
+
+ sed -i "s:\(DESTINATION\) bin:\1 ${GAMES_BINDIR}:" \
+ CMakeLists.txt src/wx/CMakeLists.txt || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_enable cairo CAIRO)
+ $(cmake-utils_use_enable ffmpeg FFMPEG)
+ $(cmake-utils_use_enable gtk GTK)
+ $(cmake-utils_use_enable link LINK)
+ $(cmake-utils_use_enable lirc LIRC)
+ $(cmake-utils_use_enable nls NLS)
+ $(cmake-utils_use_enable openal OPENAL)
+ $(cmake-utils_use_enable sdl SDL)
+ $(cmake-utils_use_enable wxwidgets WX)
+ $(cmake-utils_use_enable x86 ASM_CORE)
+ $(cmake-utils_use_enable x86 ASM_SCALERS)
+ -DCMAKE_SKIP_RPATH=ON
+ -DDATA_INSTALL_DIR=share/games/${PN}
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ if use sdl ; then
+ dodoc doc/ReadMe.SDL.txt || die
+ doman debian/vbam.1 || die
+ fi
+
+ prepgamesdirs
+}
+
+pkg_preinst() {
+ games_pkg_preinst
+ if use gtk || use wxwidgets ; then
+ gnome2_icon_savelist
+ fi
+}
+
+pkg_postinst() {
+ games_pkg_postinst
+ if use gtk || use wxwidgets ; then
+ gnome2_icon_cache_update
+ fi
+ use gtk && fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+ if use gtk || use wxwidgets ; then
+ gnome2_icon_cache_update
+ fi
+ use gtk && fdo-mime_desktop_database_update
+}
View
30 games-emulation/vbam/vbam-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/vbam/vbam-9999.ebuild,v 1.2 2012/09/09 22:10:18 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/vbam/vbam-9999.ebuild,v 1.3 2013/01/18 01:08:23 radhermit Exp $
EAPI=4
WX_GTK_VER="2.8"
@@ -44,7 +44,8 @@ src_prepare() {
# Fix issue with zlib-1.2.5.1 macros (bug #383179)
sed -i '1i#define OF(x) x' src/common/memgzio.c || die
- sed -i -e "s:\(DESTINATION\) bin:\1 ${GAMES_BINDIR}:" CMakeLists.txt || die
+ sed -i "s:\(DESTINATION\) bin:\1 ${GAMES_BINDIR}:" \
+ CMakeLists.txt src/wx/CMakeLists.txt || die
}
src_configure() {
@@ -60,7 +61,6 @@ src_configure() {
$(cmake-utils_use_enable wxwidgets WX)
$(cmake-utils_use_enable x86 ASM_CORE)
$(cmake-utils_use_enable x86 ASM_SCALERS)
- -DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}"
-DCMAKE_SKIP_RPATH=ON
-DDATA_INSTALL_DIR=share/games/${PN}
)
@@ -81,3 +81,25 @@ src_install() {
prepgamesdirs
}
+
+pkg_preinst() {
+ games_pkg_preinst
+ if use gtk || use wxwidgets ; then
+ gnome2_icon_savelist
+ fi
+}
+
+pkg_postinst() {
+ games_pkg_postinst
+ if use gtk || use wxwidgets ; then
+ gnome2_icon_cache_update
+ fi
+ use gtk && fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+ if use gtk || use wxwidgets ; then
+ gnome2_icon_cache_update
+ fi
+ use gtk && fdo-mime_desktop_database_update
+}
View
3  games-mud/tintin/Manifest
@@ -1 +1,2 @@
-DIST tintin-2.00.8.tar.gz 257828 RMD160 f3ac710a14ba9b4689bbc2b9222bb254a00e2020 SHA1 59c919cfe1b1b8d217ca9608c5e76140e8c8aa38 SHA256 e364a7fa7ed35a2d166a081cce4682d5fe2481ee9ce72c6a409903d097e1ae45
+DIST tintin-2.00.8.tar.gz 257828 SHA256 e364a7fa7ed35a2d166a081cce4682d5fe2481ee9ce72c6a409903d097e1ae45
+DIST tintin-2.00.9.tar.gz 276024 SHA256 cafeee9b60de39d957def5782fb4f8cb29a05af69dc96d3e5807c2d3fb541275 SHA512 88880d7c45028fdc4e20d0acb065e7d578d6dac995a590974b62e418845227bf734f270a6908c8bad13b04265a1c08207e9974c2756b4635697950414e404ba6 WHIRLPOOL 779a39b6c280c0104dc3568d8ab1d7db67cd4e2945a1f501ed8471387a9fc4ccdc0bf7135ce926cb657ae6a95b5cbe7707da49187e8da31d9c8710851abb848a
View
11 games-mud/tintin/files/tintin-2.00.9-ldpermission.patch
@@ -0,0 +1,11 @@
+--- Makefile.in.old 2011-06-24 13:41:36.874647127 +0200
++++ Makefile.in 2011-06-24 13:44:40.024430170 +0200
+@@ -37,7 +37,7 @@
+
+ INCS = @MYINCLUDE@
+
+-LIBS = @MYLIB@ @LIBS@
++LIBS = @LIBS@
+
+ # If you prefer to be able to enter ISO latin-1 characters instead
+ # of being able to use the meta key for special emacs-like commands
View
38 games-mud/tintin/tintin-2.00.9.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-mud/tintin/tintin-2.00.9.ebuild,v 1.1 2013/01/17 23:16:26 mr_bones_ Exp $
+
+EAPI=2
+inherit games
+
+DESCRIPTION="(T)he k(I)cki(N) (T)ickin d(I)kumud clie(N)t"
+HOMEPAGE="http://tintin.sourceforge.net/"
+SRC_URI="mirror://sourceforge/tintin/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="sys-libs/zlib
+ dev-libs/libpcre
+ sys-libs/readline
+ sys-libs/ncurses"
+
+S=${WORKDIR}/tt/src
+
+PATCHES=( "${FILESDIR}"/${P}-ldpermission.patch )
+
+src_install () {
+ dogamesbin tt++ || die
+ dodoc ../{CREDITS,FAQ,README,SCRIPTS,TODO,docs/*}
+ prepgamesdirs
+}
+
+pkg_postinst() {
+ games_pkg_postinst
+ echo
+ ewarn "**** OLD TINTIN SCRIPTS ARE NOT 100% COMPATIBLE WITH THIS VERSION ****"
+ ewarn "read the README for more details."
+ echo
+}
View
1  games-puzzle/xye/Manifest
@@ -1 +1,2 @@
DIST xye-0.12.0.tar.gz 3074536 SHA256 0116afe64c64684feee3a3f9ea8e2308059afe3d3d30edc8c3731d573eb96a92 SHA512 c29d805239f401cd5f4e975651d49ab2fd12c12ab695e23e4303310497f46295208d7177bc5957287e2d6c43dfcc501f988e49c586e7f0616a13dc655c40a126 WHIRLPOOL abef97188564a8d380d06ab7c8da0d8f8cedb738e6db641735873f6878502a86244ee7842fcdfa4a9b5043f1fe2869255d00e072fa5057906eddb5c6ffb1296e
+DIST xye-0.12.1.tar.gz 2850776 SHA256 bbeb3265b0795f14deb2851b4a3bda7dde9b07d624a7ca5fb88cd7acabcf3967 SHA512 aadafdb7b8e0546435838279c2929803be8dde00f3f3c08668c35d0a8ccf5bad511e65629e3f7261140edcf0980d19fda2be1401593ac4c0410beede542e857b WHIRLPOOL 7a1aa2708361b4eddb266037af35e6915852ba1a5037fcfebd95c0a8caab54209ca1c9e3827acecff64772fd15b077f5cded64a50b5820abd7b3cde937bbc2e0
View
8 games-puzzle/xye/files/xye-0.12.0-gcc47.patch
@@ -1,5 +1,5 @@
---- src/editorsave.cpp.old 2012-10-17 09:47:46.413566575 +0200
-+++ src/editorsave.cpp 2012-10-17 09:48:17.314366174 +0200
+--- src/editorsave.cpp.old
++++ src/editorsave.cpp
@@ -642,7 +642,8 @@
file << "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n";
file << "<pack>\n<name>"<< stripXML(editorboard::filetitle) <<"</name><author>"<< stripXML(editorboard::author) <<"</author>\n<description>"<< stripXML(editorboard::description) <<"</description>\n";
@@ -10,8 +10,8 @@
editorboard::LoadLevelNumber(board, i);
file << "\n<level>\n";
file << "<title>"<< stripXML(board->title) <<"</title>\n";
---- src/gen.cpp.old 2012-10-17 09:41:40.825540267 +0200
-+++ src/gen.cpp 2012-10-17 09:41:57.087387319 +0200
+--- src/gen.cpp.old
++++ src/gen.cpp
@@ -21,6 +21,7 @@
#include<cstdio>
#include<iostream>
View
22 games-puzzle/xye/files/xye-0.12.1-gcc47.patch
@@ -0,0 +1,22 @@
+--- src/editorsave.cpp.old
++++ src/editorsave.cpp
+@@ -642,7 +642,8 @@
+ file << "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n";
+ file << "<pack>\n<name>"<< stripXML(editorboard::filetitle) <<"</name><author>"<< stripXML(editorboard::author) <<"</author>\n<description>"<< stripXML(editorboard::description) <<"</description>\n";
+
+- for (int i=first; i<editorboard::CountLevels(); i++) {
++ int i;
++ for (i=first; i<editorboard::CountLevels(); i++) {
+ editorboard::LoadLevelNumber(board, i);
+ file << "\n<level>\n";
+ file << "<title>"<< stripXML(board->title) <<"</title>\n";
+--- src/gen.cpp.old
++++ src/gen.cpp
+@@ -21,6 +21,7 @@
+ #include<cstdio>
+ #include<iostream>
+ #include<fstream>
++#include <unistd.h>
+
+ const float F_RAND_MAX = (float)(RAND_MAX);
+
View
41 games-puzzle/xye/xye-0.12.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/xye/xye-0.12.1.ebuild,v 1.1 2013/01/17 21:25:39 mr_bones_ Exp $
+
+EAPI=5
+inherit autotools eutils games
+
+DESCRIPTION="Free version of the classic game Kye"
+HOMEPAGE="http://xye.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xye/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="media-libs/libsdl[video]
+ media-libs/sdl-ttf
+ media-libs/sdl-image[png]
+ media-fonts/dejavu"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-gcc47.patch
+ sed -i -e '/^xye_LDFLAGS/d' Makefile.am || die
+ eautoreconf
+}
+
+src_install() {
+ dogamesbin "${PN}"
+ insinto "${GAMES_DATADIR}/${PN}"
+ doins -r levels res
+ rm -f "${D}${GAMES_DATADIR}/${PN}"/res/DejaVuSans*
+ dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${GAMES_DATADIR}/${PN}"/res/DejaVuSans.ttf
+ dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf "${GAMES_DATADIR}/${PN}"/res/DejaVuSans-Bold.ttf
+ dodoc AUTHORS ChangeLog README NEWS
+ dohtml ReadMe.html
+ doicon xye.svg
+ make_desktop_entry ${PN} Xye
+ prepgamesdirs
+}
View
4 gnome-base/gconf/gconf-2.32.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.32.4.ebuild,v 1.12 2013/01/17 15:27:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.32.4.ebuild,v 1.13 2013/01/17 20:39:19 pacho Exp $
EAPI="5"
GCONF_DEBUG="yes"
@@ -63,7 +63,7 @@ src_install() {
# Make sure this directory exists, bug #268070, upstream #572027
keepdir /etc/gconf/gconf.xml.system
- echo 'CONFIG_PROTECT_MASK='${EPREFIX}/etc/gconf'' > 50gconf
+ echo "CONFIG_PROTECT_MASK=\"${EPREFIX}/etc/gconf\"" > 50gconf
echo 'GSETTINGS_BACKEND="gconf"' >> 50gconf
doenvd 50gconf
dodir /root/.gconfd
View
4 gnome-base/gconf/gconf-3.2.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-3.2.5.ebuild,v 1.7 2013/01/17 15:27:44 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-3.2.5.ebuild,v 1.8 2013/01/17 20:39:19 pacho Exp $
EAPI="5"
GCONF_DEBUG="yes"
@@ -66,7 +66,7 @@ src_install() {
# Make sure this directory exists, bug #268070, upstream #572027
keepdir /etc/gconf/gconf.xml.system
- echo 'CONFIG_PROTECT_MASK='${EPREFIX}/etc/gconf'' > 50gconf
+ echo "CONFIG_PROTECT_MASK=\"${EPREFIX}/etc/gconf\"" > 50gconf
echo 'GSETTINGS_BACKEND="gconf"' >> 50gconf
doenvd 50gconf
dodir /root/.gconfd
View
59 media-libs/mediastreamer/files/mediastreamer-2.8.2-ffmpeg-1.0.patch
@@ -0,0 +1,59 @@
+https://bugs.gentoo.org/show_bug.cgi?id=445168
+
+commit f586917ea4d66f9ba8910f0967a8830e54d50784
+Author: Yann Diorcet <yann.diorcet@belledonne-communications.com>
+Date: Tue Jun 5 11:07:48 2012 +0200
+
+ Fixes for new versions of ffmpeg
+
+diff --git a/src/h264dec.c b/src/h264dec.c
+index c4a84ee..5229b5e 100644
+--- a/src/h264dec.c
++++ b/src/h264dec.c
+@@ -45,7 +45,9 @@ typedef struct _DecData{
+ static void ffmpeg_init(){
+ static bool_t done=FALSE;
+ if (!done){
++#ifdef FF_API_AVCODEC_INIT
+ avcodec_init();
++#endif
+ avcodec_register_all();
+ done=TRUE;
+ }
+diff --git a/src/videoenc.c b/src/videoenc.c
+index 21d016f..fb35760 100644
+--- a/src/videoenc.c
++++ b/src/videoenc.c
+@@ -39,6 +39,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+ static bool_t avcodec_initialized=FALSE;
+
++#ifndef FF_I_TYPE
++#define FF_I_TYPE AV_PICTURE_TYPE_I
++#endif
++
+ #ifdef ENABLE_LOG_FFMPEG
+
+ void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl)
+@@ -53,7 +57,9 @@ void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl)
+
+ void ms_ffmpeg_check_init(){
+ if(!avcodec_initialized){
++#ifdef FF_API_AVCODEC_INIT
+ avcodec_init();
++#endif
+ avcodec_register_all();
+ avcodec_initialized=TRUE;
+ #ifdef ENABLE_LOG_FFMPEG
+@@ -300,10 +306,10 @@ static void prepare_h263(EncState *s){
+ if (s->profile==0){
+ s->codec=CODEC_ID_H263;
+ }else{
++ /*
+ c->flags|=CODEC_FLAG_H263P_UMV;
+ c->flags|=CODEC_FLAG_AC_PRED;
+ c->flags|=CODEC_FLAG_H263P_SLICE_STRUCT;
+- /*
+ c->flags|=CODEC_FLAG_OBMC;
+ c->flags|=CODEC_FLAG_AC_PRED;
+ */
View
7 media-libs/mediastreamer/mediastreamer-2.8.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/mediastreamer-2.8.2.ebuild,v 1.3 2012/12/17 17:34:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mediastreamer/mediastreamer-2.8.2.ebuild,v 1.4 2013/01/17 21:56:29 aballier Exp $
EAPI="4"
@@ -68,7 +68,8 @@ src_prepare() {
|| die "patching help/Makefile.am failed"
epatch "${FILESDIR}/${P}-v4l-automagic.patch" \
- "${FILESDIR}/${P}-autopoint.patch"
+ "${FILESDIR}/${P}-autopoint.patch" \
+ "${FILESDIR}/${P}-ffmpeg-1.0.patch"
# linux/videodev.h dropped in 2.6.38
sed -i -e 's:linux/videodev.h ::' configure.ac || die
View
14 media-plugins/vdr-image/files/vdr-image-0.3.1-ffmpeg-1.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/show_bug.cgi?id=443428
+
+Index: image-0.3.1/liboutput/encode.c
+===================================================================
+--- image-0.3.1.orig/liboutput/encode.c
++++ image-0.3.1/liboutput/encode.c
+@@ -49,7 +49,6 @@ cEncode::cEncode(unsigned int nNumberOfF
+
+ bool cEncode::Register()
+ {
+- avcodec_init();
+ #if 0
+ // XXX to resolv: dosen't work with osdpip
+ register_avcodec(&mpeg2video_encoder);
View
7 media-plugins/vdr-image/vdr-image-0.3.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/vdr-image-0.3.1.ebuild,v 1.4 2013/01/09 18:15:48 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/vdr-image-0.3.1.ebuild,v 1.5 2013/01/17 22:32:32 aballier Exp $
EAPI="5"
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
IUSE="exif"
COMMON_DEPEND=">=media-video/vdr-1.5.8
- >=virtual/ffmpeg-0.4.8_p20080326
+ >=virtual/ffmpeg-0.10
>=media-libs/netpbm-10.0
exif? ( media-libs/libexif )"
@@ -37,7 +37,8 @@ src_prepare() {
vdr-plugin-2_src_prepare
- epatch "${FILESDIR}/${P}-gentoo.diff"