From f37fc2d9c5fcee5a5845cba2d7b263f41c2e1295 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 14 Jan 2013 15:42:19 +0400 Subject: [PATCH] Sync with portage [Mon Jan 14 15:42:18 MSK 2013]. --- app-forensics/libewf/Manifest | 1 + .../libewf/libewf-20121209-r1.ebuild | 48 +++ app-forensics/libewf/libewf-20130105.ebuild | 48 +++ app-forensics/libewf/metadata.xml | 2 + app-misc/boxes/Manifest | 1 + app-misc/boxes/boxes-1.1.1.ebuild | 32 ++ .../boxes/files/boxes-1.1.1-Makefile.patch | 62 ++++ app-misc/boxes/metadata.xml | 2 +- app-misc/gcal/Manifest | 1 + app-misc/gcal/gcal-3.6.2.ebuild | 33 ++ app-misc/gcal/metadata.xml | 4 +- app-misc/realpath/Manifest | 2 + app-misc/realpath/realpath-1.18.ebuild | 81 +++++ app-text/multitail/Manifest | 1 + app-text/multitail/metadata.xml | 12 +- app-text/multitail/multitail-5.2.11.ebuild | 48 +++ dev-java/oracle-jdk-bin/Manifest | 6 + .../oracle-jdk-bin-1.7.0.11.ebuild | 233 ++++++++++++++ dev-java/oracle-jre-bin/Manifest | 2 + .../oracle-jre-bin-1.7.0.11.ebuild | 168 ++++++++++ dev-lang/swi-prolog/Manifest | 2 + dev-lang/swi-prolog/swi-prolog-6.2.6.ebuild | 140 +++++++++ dev-libs/dbus-glib/dbus-glib-0.100-r2.ebuild | 30 +- dev-libs/libzip/libzip-0.10.1-r1.ebuild | 6 +- .../FLV-AudioExtractor-0.010.0.ebuild | 6 +- .../django-evolution-0.6.7-r1.ebuild | 21 +- dev-tex/metapost/Manifest | 1 + dev-tex/metapost/metapost-1.780.ebuild | 74 +++++ dev-util/nvidia-cuda-sdk/Manifest | 11 +- .../nvidia-cuda-sdk-4.2.9-asneeded.patch | 89 ++++++ dev-util/nvidia-cuda-sdk/metadata.xml | 19 +- .../nvidia-cuda-sdk-2.1.1215.2015.ebuild | 73 ----- .../nvidia-cuda-sdk-2.2.ebuild | 74 ----- .../nvidia-cuda-sdk-2.3.ebuild | 88 ------ .../nvidia-cuda-sdk-3.0.ebuild | 94 ------ .../nvidia-cuda-sdk-3.0_beta1.ebuild | 94 ------ .../nvidia-cuda-sdk-3.1.ebuild | 83 ----- .../nvidia-cuda-sdk-3.2.ebuild | 91 ------ .../nvidia-cuda-sdk-4.0.ebuild | 91 ------ .../nvidia-cuda-sdk-4.1.ebuild | 92 ------ .../nvidia-cuda-sdk-4.2.9-r1.ebuild | 112 +++++++ .../nvidia-cuda-sdk-5.0.35.ebuild | 136 +++++++++ dev-util/nvidia-cuda-toolkit/Manifest | 4 +- .../nvidia-cuda-toolkit/files/cuda-config.in | 28 ++ dev-util/nvidia-cuda-toolkit/metadata.xml | 19 +- .../nvidia-cuda-toolkit-3.2.ebuild | 141 --------- .../nvidia-cuda-toolkit-4.2.9-r1.ebuild | 106 +++++++ .../nvidia-cuda-toolkit-5.0.35.ebuild | 111 +++++++ media-libs/jpeg/Manifest | 1 + media-libs/jpeg/jpeg-9.ebuild | 66 ++++ metadata/dtd/timestamp.chk | 2 +- metadata/glsa/timestamp.chk | 2 +- .../app-forensics/libewf-20121209-r1 | 13 + .../md5-cache/app-forensics/libewf-20130105 | 13 + metadata/md5-cache/app-misc/boxes-1.1.1 | 10 + metadata/md5-cache/app-misc/gcal-3.6.2 | 13 + metadata/md5-cache/app-misc/realpath-1.18 | 13 + metadata/md5-cache/app-text/multitail-5.2.11 | 13 + .../dev-java/oracle-jdk-bin-1.7.0.11 | 14 + .../dev-java/oracle-jre-bin-1.7.0.11 | 14 + metadata/md5-cache/dev-lang/swi-prolog-6.2.6 | 13 + .../md5-cache/dev-libs/dbus-glib-0.100-r2 | 2 +- metadata/md5-cache/dev-libs/libzip-0.10.1-r1 | 4 +- .../dev-perl/FLV-AudioExtractor-0.010.0 | 4 +- .../dev-python/django-evolution-0.6.7-r1 | 2 +- metadata/md5-cache/dev-tex/metapost-1.780 | 11 + .../dev-util/nvidia-cuda-sdk-2.1.1215.2015 | 13 - .../md5-cache/dev-util/nvidia-cuda-sdk-2.2 | 13 - .../md5-cache/dev-util/nvidia-cuda-sdk-2.3 | 14 - .../md5-cache/dev-util/nvidia-cuda-sdk-3.0 | 14 - .../dev-util/nvidia-cuda-sdk-3.0_beta1 | 14 - .../md5-cache/dev-util/nvidia-cuda-sdk-3.1 | 14 - .../md5-cache/dev-util/nvidia-cuda-sdk-3.2 | 14 - .../md5-cache/dev-util/nvidia-cuda-sdk-4.0 | 14 - .../md5-cache/dev-util/nvidia-cuda-sdk-4.1 | 14 - .../dev-util/nvidia-cuda-sdk-4.2.9-r1 | 13 + .../md5-cache/dev-util/nvidia-cuda-sdk-5.0.35 | 13 + .../dev-util/nvidia-cuda-toolkit-3.2 | 13 - .../dev-util/nvidia-cuda-toolkit-4.2.9-r1 | 12 + .../dev-util/nvidia-cuda-toolkit-5.0.35 | 12 + metadata/md5-cache/media-libs/jpeg-9 | 10 + metadata/md5-cache/net-im/licq-1.7.0 | 13 + metadata/md5-cache/net-irc/hexchat-2.9.3 | 4 +- metadata/md5-cache/net-irc/hexchat-2.9.4 | 4 +- metadata/md5-cache/net-misc/batctl-2013.0.0 | 10 + metadata/md5-cache/net-misc/clusterssh-3.28 | 11 - ...coffee-9.03.1318 => t-coffee-9.03.1318-r1} | 6 +- metadata/md5-cache/sci-libs/cln-1.3.1 | 13 - metadata/md5-cache/sci-libs/cln-1.3.2 | 13 - metadata/md5-cache/sci-libs/djbfft-0.76 | 10 - metadata/md5-cache/sci-libs/vtk-5.10.1 | 2 +- metadata/md5-cache/sys-cluster/ceph-0.56.1 | 13 + metadata/md5-cache/sys-cluster/ceph-9999 | 11 + metadata/md5-cache/sys-fs/aufs-util-3.6 | 2 +- metadata/md5-cache/sys-fs/aufs-util-3.7 | 12 + metadata/md5-cache/sys-fs/aufs3-3_p20121015 | 13 - .../md5-cache/sys-fs/aufs3-3_p20121015-r1 | 13 - metadata/md5-cache/sys-fs/aufs3-3_p20121112 | 13 - .../{aufs3-3_p20121129 => aufs3-3_p20130114} | 8 +- .../md5-cache/sys-kernel/aufs-sources-3.6.10 | 4 +- .../md5-cache/sys-kernel/aufs-sources-3.6.11 | 4 +- .../md5-cache/sys-kernel/aufs-sources-3.6.6 | 15 - .../md5-cache/sys-kernel/aufs-sources-3.7.1 | 2 +- ...{aufs-sources-3.6.8 => aufs-sources-3.7.2} | 10 +- metadata/md5-cache/virtual/python-unittest2-1 | 4 +- metadata/md5-cache/www-apps/webdavcgi-0.8.3 | 2 +- metadata/md5-cache/x11-libs/libaosd-0.2.7 | 4 +- metadata/news/timestamp.chk | 2 +- metadata/timestamp | 2 +- metadata/timestamp.chk | 2 +- metadata/timestamp.x | 2 +- net-im/licq/Manifest | 1 + net-im/licq/licq-1.7.0.ebuild | 81 +++++ net-im/licq/metadata.xml | 4 + net-irc/hexchat/hexchat-2.9.3.ebuild | 6 +- net-irc/hexchat/hexchat-2.9.4.ebuild | 7 +- net-misc/batctl/Manifest | 3 +- net-misc/batctl/batctl-2013.0.0.ebuild | 36 +++ net-misc/clusterssh/Manifest | 1 - net-misc/clusterssh/clusterssh-3.28.ebuild | 37 --- profiles/use.local.desc | 4 + sci-biology/t-coffee/metadata.xml | 12 +- ...18.ebuild => t-coffee-9.03.1318-r1.ebuild} | 14 +- sci-libs/cln/Manifest | 1 - sci-libs/cln/cln-1.3.1.ebuild | 62 ---- sci-libs/cln/cln-1.3.2.ebuild | 50 --- sci-libs/cln/metadata.xml | 4 +- sci-libs/djbfft/djbfft-0.76.ebuild | 56 ---- sci-libs/djbfft/metadata.xml | 6 +- sci-libs/vtk/vtk-5.10.1.ebuild | 4 +- sys-cluster/ceph/Manifest | 1 + sys-cluster/ceph/ceph-0.56.1.ebuild | 103 +++++++ sys-cluster/ceph/ceph-9999.ebuild | 103 +++++++ sys-fs/aufs-util/Manifest | 1 + sys-fs/aufs-util/aufs-util-3.6.ebuild | 6 +- sys-fs/aufs-util/aufs-util-3.7.ebuild | 45 +++ sys-fs/aufs3/Manifest | 4 +- sys-fs/aufs3/aufs3-3_p20121015-r1.ebuild | 148 --------- sys-fs/aufs3/aufs3-3_p20121015.ebuild | 148 --------- sys-fs/aufs3/aufs3-3_p20121112.ebuild | 148 --------- ...121129.ebuild => aufs3-3_p20130114.ebuild} | 40 ++- .../files/3_p20121112/aufs3-base-0.patch | 70 ----- .../files/3_p20121112/aufs3-base-1.patch | 70 ----- .../files/3_p20121112/aufs3-base-2.patch | 70 ----- .../files/3_p20121112/aufs3-base-3.patch | 70 ----- .../files/3_p20121112/aufs3-base-4.patch | 70 ----- .../files/3_p20121112/aufs3-base-5.patch | 95 ------ .../files/3_p20121112/aufs3-base-6.patch | 70 ----- .../files/3_p20121112/aufs3-base-x-rcN.patch | 83 ----- .../3_p20121112/aufs3-standalone-0.patch | 257 ---------------- .../3_p20121112/aufs3-standalone-1.patch | 249 --------------- .../3_p20121112/aufs3-standalone-2.patch | 257 ---------------- .../3_p20121112/aufs3-standalone-3.patch | 257 ---------------- .../3_p20121112/aufs3-standalone-4.patch | 257 ---------------- .../3_p20121112/aufs3-standalone-5.patch | 288 ------------------ .../3_p20121112/aufs3-standalone-6.patch | 276 ----------------- .../3_p20121112/aufs3-standalone-x-rcN.patch | 276 ----------------- .../files/3_p20121129/aufs3-base-0.patch | 70 ----- .../files/3_p20121129/aufs3-base-1.patch | 70 ----- .../files/3_p20121129/aufs3-base-2.patch | 70 ----- .../files/3_p20121129/aufs3-base-3.patch | 70 ----- .../files/3_p20121129/aufs3-base-4.patch | 70 ----- .../files/3_p20121129/aufs3-base-5.patch | 95 ------ .../files/3_p20121129/aufs3-base-6.patch | 70 ----- .../files/3_p20121129/aufs3-base-x-rcN.patch | 83 ----- .../3_p20121129/aufs3-standalone-0.patch | 257 ---------------- .../3_p20121129/aufs3-standalone-1.patch | 249 --------------- .../3_p20121129/aufs3-standalone-2.patch | 257 ---------------- .../3_p20121129/aufs3-standalone-3.patch | 257 ---------------- .../3_p20121129/aufs3-standalone-4.patch | 257 ---------------- .../3_p20121129/aufs3-standalone-5.patch | 288 ------------------ .../3_p20121129/aufs3-standalone-6.patch | 276 ----------------- .../3_p20121129/aufs3-standalone-x-rcN.patch | 276 ----------------- sys-kernel/aufs-sources/Manifest | 7 +- .../aufs-sources/aufs-sources-3.6.10.ebuild | 9 +- .../aufs-sources/aufs-sources-3.6.11.ebuild | 9 +- .../aufs-sources/aufs-sources-3.6.6.ebuild | 52 ---- .../aufs-sources/aufs-sources-3.7.1.ebuild | 5 +- ...3.6.8.ebuild => aufs-sources-3.7.2.ebuild} | 19 +- .../python-unittest2-1.ebuild | 4 +- www-apps/webdavcgi/webdavcgi-0.8.3.ebuild | 19 +- www-client/seamonkey/files/icon/seamonkey.png | Bin 4172 -> 0 bytes x11-libs/libaosd/Manifest | 2 +- x11-libs/libaosd/libaosd-0.2.7.ebuild | 6 +- 184 files changed, 2464 insertions(+), 7488 deletions(-) create mode 100644 app-forensics/libewf/libewf-20121209-r1.ebuild create mode 100644 app-forensics/libewf/libewf-20130105.ebuild create mode 100644 app-misc/boxes/boxes-1.1.1.ebuild create mode 100644 app-misc/boxes/files/boxes-1.1.1-Makefile.patch create mode 100644 app-misc/gcal/gcal-3.6.2.ebuild create mode 100644 app-misc/realpath/realpath-1.18.ebuild create mode 100644 app-text/multitail/multitail-5.2.11.ebuild create mode 100644 dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.11.ebuild create mode 100644 dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.11.ebuild create mode 100644 dev-lang/swi-prolog/swi-prolog-6.2.6.ebuild create mode 100644 dev-tex/metapost/metapost-1.780.ebuild create mode 100644 dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-4.2.9-asneeded.patch delete mode 100644 dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-2.1.1215.2015.ebuild delete mode 100644 dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-2.2.ebuild delete mode 100644 dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-2.3.ebuild delete mode 100644 dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-3.0.ebuild delete mode 100644 dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-3.0_beta1.ebuild delete mode 100644 dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-3.1.ebuild delete mode 100644 dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-3.2.ebuild delete mode 100644 dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.0.ebuild delete mode 100644 dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.1.ebuild create mode 100644 dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.9-r1.ebuild create mode 100644 dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-5.0.35.ebuild create mode 100644 dev-util/nvidia-cuda-toolkit/files/cuda-config.in delete mode 100644 dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.2.ebuild create mode 100644 dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r1.ebuild create mode 100644 dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35.ebuild create mode 100644 media-libs/jpeg/jpeg-9.ebuild create mode 100644 metadata/md5-cache/app-forensics/libewf-20121209-r1 create mode 100644 metadata/md5-cache/app-forensics/libewf-20130105 create mode 100644 metadata/md5-cache/app-misc/boxes-1.1.1 create mode 100644 metadata/md5-cache/app-misc/gcal-3.6.2 create mode 100644 metadata/md5-cache/app-misc/realpath-1.18 create mode 100644 metadata/md5-cache/app-text/multitail-5.2.11 create mode 100644 metadata/md5-cache/dev-java/oracle-jdk-bin-1.7.0.11 create mode 100644 metadata/md5-cache/dev-java/oracle-jre-bin-1.7.0.11 create mode 100644 metadata/md5-cache/dev-lang/swi-prolog-6.2.6 create mode 100644 metadata/md5-cache/dev-tex/metapost-1.780 delete mode 100644 metadata/md5-cache/dev-util/nvidia-cuda-sdk-2.1.1215.2015 delete mode 100644 metadata/md5-cache/dev-util/nvidia-cuda-sdk-2.2 delete mode 100644 metadata/md5-cache/dev-util/nvidia-cuda-sdk-2.3 delete mode 100644 metadata/md5-cache/dev-util/nvidia-cuda-sdk-3.0 delete mode 100644 metadata/md5-cache/dev-util/nvidia-cuda-sdk-3.0_beta1 delete mode 100644 metadata/md5-cache/dev-util/nvidia-cuda-sdk-3.1 delete mode 100644 metadata/md5-cache/dev-util/nvidia-cuda-sdk-3.2 delete mode 100644 metadata/md5-cache/dev-util/nvidia-cuda-sdk-4.0 delete mode 100644 metadata/md5-cache/dev-util/nvidia-cuda-sdk-4.1 create mode 100644 metadata/md5-cache/dev-util/nvidia-cuda-sdk-4.2.9-r1 create mode 100644 metadata/md5-cache/dev-util/nvidia-cuda-sdk-5.0.35 delete mode 100644 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-3.2 create mode 100644 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-4.2.9-r1 create mode 100644 metadata/md5-cache/dev-util/nvidia-cuda-toolkit-5.0.35 create mode 100644 metadata/md5-cache/media-libs/jpeg-9 create mode 100644 metadata/md5-cache/net-im/licq-1.7.0 create mode 100644 metadata/md5-cache/net-misc/batctl-2013.0.0 delete mode 100644 metadata/md5-cache/net-misc/clusterssh-3.28 rename metadata/md5-cache/sci-biology/{t-coffee-9.03.1318 => t-coffee-9.03.1318-r1} (81%) delete mode 100644 metadata/md5-cache/sci-libs/cln-1.3.1 delete mode 100644 metadata/md5-cache/sci-libs/cln-1.3.2 delete mode 100644 metadata/md5-cache/sci-libs/djbfft-0.76 create mode 100644 metadata/md5-cache/sys-cluster/ceph-0.56.1 create mode 100644 metadata/md5-cache/sys-cluster/ceph-9999 create mode 100644 metadata/md5-cache/sys-fs/aufs-util-3.7 delete mode 100644 metadata/md5-cache/sys-fs/aufs3-3_p20121015 delete mode 100644 metadata/md5-cache/sys-fs/aufs3-3_p20121015-r1 delete mode 100644 metadata/md5-cache/sys-fs/aufs3-3_p20121112 rename metadata/md5-cache/sys-fs/{aufs3-3_p20121129 => aufs3-3_p20130114} (75%) delete mode 100644 metadata/md5-cache/sys-kernel/aufs-sources-3.6.6 rename metadata/md5-cache/sys-kernel/{aufs-sources-3.6.8 => aufs-sources-3.7.2} (61%) create mode 100644 net-im/licq/licq-1.7.0.ebuild create mode 100644 net-misc/batctl/batctl-2013.0.0.ebuild delete mode 100644 net-misc/clusterssh/clusterssh-3.28.ebuild rename sci-biology/t-coffee/{t-coffee-9.03.1318.ebuild => t-coffee-9.03.1318-r1.ebuild} (81%) delete mode 100644 sci-libs/cln/cln-1.3.1.ebuild delete mode 100644 sci-libs/cln/cln-1.3.2.ebuild delete mode 100644 sci-libs/djbfft/djbfft-0.76.ebuild create mode 100644 sys-cluster/ceph/ceph-0.56.1.ebuild create mode 100644 sys-cluster/ceph/ceph-9999.ebuild create mode 100644 sys-fs/aufs-util/aufs-util-3.7.ebuild delete mode 100644 sys-fs/aufs3/aufs3-3_p20121015-r1.ebuild delete mode 100644 sys-fs/aufs3/aufs3-3_p20121015.ebuild delete mode 100644 sys-fs/aufs3/aufs3-3_p20121112.ebuild rename sys-fs/aufs3/{aufs3-3_p20121129.ebuild => aufs3-3_p20130114.ebuild} (77%) delete mode 100644 sys-fs/aufs3/files/3_p20121112/aufs3-base-0.patch delete mode 100644 sys-fs/aufs3/files/3_p20121112/aufs3-base-1.patch delete mode 100644 sys-fs/aufs3/files/3_p20121112/aufs3-base-2.patch delete mode 100644 sys-fs/aufs3/files/3_p20121112/aufs3-base-3.patch delete mode 100644 sys-fs/aufs3/files/3_p20121112/aufs3-base-4.patch delete mode 100644 sys-fs/aufs3/files/3_p20121112/aufs3-base-5.patch delete mode 100644 sys-fs/aufs3/files/3_p20121112/aufs3-base-6.patch delete mode 100644 sys-fs/aufs3/files/3_p20121112/aufs3-base-x-rcN.patch delete mode 100644 sys-fs/aufs3/files/3_p20121112/aufs3-standalone-0.patch delete mode 100644 sys-fs/aufs3/files/3_p20121112/aufs3-standalone-1.patch delete mode 100644 sys-fs/aufs3/files/3_p20121112/aufs3-standalone-2.patch delete mode 100644 sys-fs/aufs3/files/3_p20121112/aufs3-standalone-3.patch delete mode 100644 sys-fs/aufs3/files/3_p20121112/aufs3-standalone-4.patch delete mode 100644 sys-fs/aufs3/files/3_p20121112/aufs3-standalone-5.patch delete mode 100644 sys-fs/aufs3/files/3_p20121112/aufs3-standalone-6.patch delete mode 100644 sys-fs/aufs3/files/3_p20121112/aufs3-standalone-x-rcN.patch delete mode 100644 sys-fs/aufs3/files/3_p20121129/aufs3-base-0.patch delete mode 100644 sys-fs/aufs3/files/3_p20121129/aufs3-base-1.patch delete mode 100644 sys-fs/aufs3/files/3_p20121129/aufs3-base-2.patch delete mode 100644 sys-fs/aufs3/files/3_p20121129/aufs3-base-3.patch delete mode 100644 sys-fs/aufs3/files/3_p20121129/aufs3-base-4.patch delete mode 100644 sys-fs/aufs3/files/3_p20121129/aufs3-base-5.patch delete mode 100644 sys-fs/aufs3/files/3_p20121129/aufs3-base-6.patch delete mode 100644 sys-fs/aufs3/files/3_p20121129/aufs3-base-x-rcN.patch delete mode 100644 sys-fs/aufs3/files/3_p20121129/aufs3-standalone-0.patch delete mode 100644 sys-fs/aufs3/files/3_p20121129/aufs3-standalone-1.patch delete mode 100644 sys-fs/aufs3/files/3_p20121129/aufs3-standalone-2.patch delete mode 100644 sys-fs/aufs3/files/3_p20121129/aufs3-standalone-3.patch delete mode 100644 sys-fs/aufs3/files/3_p20121129/aufs3-standalone-4.patch delete mode 100644 sys-fs/aufs3/files/3_p20121129/aufs3-standalone-5.patch delete mode 100644 sys-fs/aufs3/files/3_p20121129/aufs3-standalone-6.patch delete mode 100644 sys-fs/aufs3/files/3_p20121129/aufs3-standalone-x-rcN.patch delete mode 100644 sys-kernel/aufs-sources/aufs-sources-3.6.6.ebuild rename sys-kernel/aufs-sources/{aufs-sources-3.6.8.ebuild => aufs-sources-3.7.2.ebuild} (71%) delete mode 100644 www-client/seamonkey/files/icon/seamonkey.png diff --git a/app-forensics/libewf/Manifest b/app-forensics/libewf/Manifest index bf0bcbe19845..84adc5cc8762 100644 --- a/app-forensics/libewf/Manifest +++ b/app-forensics/libewf/Manifest @@ -1,3 +1,4 @@ DIST libewf-20100226.tar.gz 801413 SHA256 aedd2a6b3df6525ff535ab95cd569ebb361a4022eb4163390f26257913c2941a SHA512 6f8d053cd08ff699149e4f88d4d9a74d11e70f3ad73da17ec4c21d83254f2262657f8515b7bc3305074b3ad08e0be715ca0ee9b1c3a0e0f0cd832091f1650766 WHIRLPOOL 58bc62f5523c6a0d0dd9e299f697bdfa725ff95234389e5cef264004bb3462760938dbe65bc8603dfd610fdfe61d3ccbd9a96aa6dad28e49095e4a14865e7ab7 DIST libewf-20120813.tar.gz 1556190 SHA256 a127713185b11f9387a0b0ae2f7bb56d3bfbc9550c3411509ef081b5bbee5c9c SHA512 ba459a92b78c71a42e985b67666ba1cd15d41c9156109f51626983e43976cb11730f53d2c2c30f332905d9f95c19b5adba7ec1d5cb2e2f24ee80be93e2c25ff4 WHIRLPOOL 533a30fc60d791103b7cd024b62411e322556ad37d1636c2f46622db28d4d796368de7903b2f98abb74fd9766fe3c4d6a1b5538d22262275bf20d81ec62f37ae DIST libewf-20121209.tar.gz 1533967 SHA256 1a10c8ec2b4ed756e9becff49c5596c455702444b5ecde9d9943143cf46c5c9c SHA512 fd350a856650e74177526c7e8e1ab8219b05dd6d60439e8ed26fe3970d0c0503925a7f7b02555c7aab5d661f2a8ba016e5aaa694b2869f9d71a8a64a3945074d WHIRLPOOL 86149b7abe4ee04d58cbc30672f4f03c6a5cc0705cd49f38ae105ab20545f564cc7f91b3a460de5216e644ba64d5c174758aa440a54f4fe21ffe215401217898 +DIST libewf-20130105.tar.gz 1534184 SHA256 ea7397872942717ee307766b204651aa545fdbb0d3191ebf0bed98f34eddd50a SHA512 ce396c6badb29eaac04cf08e107fce5d3a89ccad62a283327ab66d332bc6c6b4a6eed30eaeb86f935702e6a3451bf6adb1ca7b03de904e822ace6b060a509091 WHIRLPOOL 1abb3e7ec234c7256c19a2beea2ffeb4d59d0f61b8f7f58468fc7d60482023bea521041ff706bdbdd454a5be66339808deafa34c2bcc64292f621225fff45afe diff --git a/app-forensics/libewf/libewf-20121209-r1.ebuild b/app-forensics/libewf/libewf-20121209-r1.ebuild new file mode 100644 index 000000000000..dc682615ae07 --- /dev/null +++ b/app-forensics/libewf/libewf-20121209-r1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-forensics/libewf/libewf-20121209-r1.ebuild,v 1.1 2013/01/14 05:39:32 radhermit Exp $ + +EAPI="5" + +inherit autotools-utils + +DESCRIPTION="Implementation of the EWF (SMART and EnCase) image format" +HOMEPAGE="http://libewf.sourceforge.net" +SRC_URI="mirror://sourceforge/libewf/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ppc ~x86" +# upstream bug #2597171, pyewf has implicit declarations +#IUSE="debug python rawio unicode" +IUSE="debug ewf +fuse rawio +ssl static-libs +uuid unicode" + +DEPEND=" + sys-libs/zlib + fuse? ( sys-fs/fuse ) + uuid? ( sys-apps/util-linux ) + ssl? ( dev-libs/openssl )" +RDEPEND="${DEPEND}" + +AUTOTOOLS_IN_SOURCE_BUILD=1 + +DOCS=( AUTHORS ChangeLog NEWS README documents/header.txt documents/header2.txt ) + +src_configure() { + local myeconfargs=( + $(use_enable debug debug-output) + $(use_enable debug verbose-output) + $(use_enable ewf v1-api) + $(use_enable rawio low-level-functions) + $(use_enable unicode wide-character-type) + $(use_with ssl openssl) + $(use_with uuid libuuid) + $(use_with fuse libfuse) + ) + autotools-utils_src_configure +} + +src_install() { + autotools-utils_src_install + doman manuals/*.1 manuals/*.3 +} diff --git a/app-forensics/libewf/libewf-20130105.ebuild b/app-forensics/libewf/libewf-20130105.ebuild new file mode 100644 index 000000000000..8288c9b7558f --- /dev/null +++ b/app-forensics/libewf/libewf-20130105.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-forensics/libewf/libewf-20130105.ebuild,v 1.1 2013/01/14 05:47:36 radhermit Exp $ + +EAPI="5" + +inherit autotools-utils + +DESCRIPTION="Implementation of the EWF (SMART and EnCase) image format" +HOMEPAGE="http://code.google.com/p/libewf/" +SRC_URI="http://libewf.googlecode.com/files/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ppc ~x86" +# upstream bug #2597171, pyewf has implicit declarations +#IUSE="debug python rawio unicode" +IUSE="debug ewf +fuse rawio +ssl static-libs +uuid unicode" + +DEPEND=" + sys-libs/zlib + fuse? ( sys-fs/fuse ) + uuid? ( sys-apps/util-linux ) + ssl? ( dev-libs/openssl )" +RDEPEND="${DEPEND}" + +AUTOTOOLS_IN_SOURCE_BUILD=1 + +DOCS=( AUTHORS ChangeLog NEWS README documents/header.txt documents/header2.txt ) + +src_configure() { + local myeconfargs=( + $(use_enable debug debug-output) + $(use_enable debug verbose-output) + $(use_enable ewf v1-api) + $(use_enable rawio low-level-functions) + $(use_enable unicode wide-character-type) + $(use_with ssl openssl) + $(use_with uuid libuuid) + $(use_with fuse libfuse) + ) + autotools-utils_src_configure +} + +src_install() { + autotools-utils_src_install + doman manuals/*.1 manuals/*.3 +} diff --git a/app-forensics/libewf/metadata.xml b/app-forensics/libewf/metadata.xml index cd98ec55dea2..f014d1166d39 100644 --- a/app-forensics/libewf/metadata.xml +++ b/app-forensics/libewf/metadata.xml @@ -6,5 +6,7 @@ Enables raw IO handling Enables the v2 API Enables the v1 API + Enable fuse support for ewfmount + Enable UUID support in the ewftools diff --git a/app-misc/boxes/Manifest b/app-misc/boxes/Manifest index ee4de60b1469..bde92ead41e5 100644 --- a/app-misc/boxes/Manifest +++ b/app-misc/boxes/Manifest @@ -1 +1,2 @@ +DIST boxes-1.1.1.src.tar.gz 139140 SHA256 d8529840281618e75a4adf313f08291b89c8cf83928c2c1f4b0ddcd236fb2420 SHA512 bf4060a8db284b8785f0479803562df943dcd6f02584c77c1b28ee193c240d832d2736fe77dee140f2a57e8e9171bc17f418ab1a0c930a656e567b5464c0bdb6 WHIRLPOOL 634205ecebf1fec2b21ceb270b38d1ce664d18053815284a8be3060299a13229a0b40cb348fa80adf30628f9da14ce4d27c1183575d7ec19e6a85a1ff9f48181 DIST boxes-1.1.src.tar.gz 138279 SHA256 c9f931fc9f8e0aeadb370518e3e66f1cbfa956ba7817bcb8f701630f70b711e3 SHA512 a2cad060fd0b673ae79f38e5bd8313df419408a80bda83324350211c0e82da5f46b28718bf15678c8b4dba15580e923f246081bbb10114d2f79d13bb9fc83acf WHIRLPOOL d305da5ba92553fd576ca111338015afcfb6d46257c2a18cba7ac7f52e23ec322692d67dd9867f724330cd35740285f2076043785d7c9fa9c9af7646d79ed195 diff --git a/app-misc/boxes/boxes-1.1.1.ebuild b/app-misc/boxes/boxes-1.1.1.ebuild new file mode 100644 index 000000000000..ed7c3806fd45 --- /dev/null +++ b/app-misc/boxes/boxes-1.1.1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/boxes/boxes-1.1.1.ebuild,v 1.1 2013/01/14 07:21:57 jlec Exp $ + +EAPI=5 + +inherit eutils toolchain-funcs + +DESCRIPTION="Draw any kind of boxes around your text" +HOMEPAGE="http://boxes.thomasjensen.com/" +SRC_URI="http://boxes.thomasjensen.com/download/${P}.src.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="" + +src_prepare() { + epatch "${FILESDIR}"/${P}-Makefile.patch +} + +src_compile() { + emake CC="$(tc-getCC)" +} + +src_install() { + dobin src/boxes + doman doc/boxes.1 + dodoc README + insinto /usr/share/boxes + doins boxes-config +} diff --git a/app-misc/boxes/files/boxes-1.1.1-Makefile.patch b/app-misc/boxes/files/boxes-1.1.1-Makefile.patch new file mode 100644 index 000000000000..1cdaffa35965 --- /dev/null +++ b/app-misc/boxes/files/boxes-1.1.1-Makefile.patch @@ -0,0 +1,62 @@ + Makefile | 2 +- + src/Makefile | 8 +++----- + src/regexp/Makefile | 2 +- + 3 files changed, 5 insertions(+), 7 deletions(-) + +diff --git a/Makefile b/Makefile +index 4bfd625..2c75625 100644 +--- a/Makefile ++++ b/Makefile +@@ -80,7 +80,7 @@ + + + # The following line (GLOBALCONF) is the only line you should need to edit! +-GLOBALCONF = /usr/share/boxes ++GLOBALCONF = /usr/share/boxes/boxes-config + BVERSION = 1.1.1 + + SNAPFILE = boxes-SNAP-$(shell date +%Y%m%d) +diff --git a/src/Makefile b/src/Makefile +index 7cfab9f..9ed467b 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -86,8 +86,7 @@ + LEX = flex + YACC = bison + CC = gcc +-CFLAGS = -ansi -I. -Iregexp -Wall -W $(CFLAGS_ADDTL) +-LDFLAGS = -Lregexp ++CFLAGS += -ansi -I. -Iregexp $(CFLAGS_ADDTL) + + GEN_HDR = parser.h + GEN_SRC = parser.c lex.yy.c +@@ -106,14 +105,13 @@ ALL_OBJ = $(GEN_SRC:.c=.o) $(ORIG_NORM:.c=.o) + + + build: +- $(MAKE) CFLAGS_ADDTL=-O boxes +- strip boxes ++ $(MAKE) boxes + debug: + $(MAKE) CFLAGS_ADDTL=-g boxes + + boxes: $(ALL_OBJ) + $(MAKE) -C regexp CC=$(CC) libregexp.a +- $(CC) $(LDFLAGS) $(ALL_OBJ) -o boxes -lregexp ++ $(CC) $(LDFLAGS) $(ALL_OBJ) -o boxes -Lregexp -lregexp + + boxes.h: + @echo File boxes.h not found or not current. Please run make in the parent directory. +diff --git a/src/regexp/Makefile b/src/regexp/Makefile +index 0bd0ace..53966c9 100644 +--- a/src/regexp/Makefile ++++ b/src/regexp/Makefile +@@ -42,7 +42,7 @@ + #============================================================================ + + +-CFLAGS = -O -I. $(CFLAGS_ADDTL) ++CFLAGS += -I. $(CFLAGS_ADDTL) + + ALL_CL = regexp/regexp.c regexp/regsub.c + C_SRC = $(notdir $(ALL_CL)) diff --git a/app-misc/boxes/metadata.xml b/app-misc/boxes/metadata.xml index 40149c995561..f23b9cae1593 100644 --- a/app-misc/boxes/metadata.xml +++ b/app-misc/boxes/metadata.xml @@ -1,5 +1,5 @@ - shell-tools + shell-tools diff --git a/app-misc/gcal/Manifest b/app-misc/gcal/Manifest index 14eb435bafe3..204cbc04c33b 100644 --- a/app-misc/gcal/Manifest +++ b/app-misc/gcal/Manifest @@ -1 +1,2 @@ DIST gcal-3.6.1.tar.xz 1623788 SHA256 cfaed3fef4b037a4995ca1ec03d7ac2fce528079678287b2d067709768d3b9cf SHA512 73df9297d05e76c5bef1f6c2e85e1782c874dad4f0ff23bb8a57463f9ae6e0edd16543b0fc40d0f1ed3ca62d688ce01da4d05eb3c3785e28330a915d5062f8de WHIRLPOOL 180c7ca450f0a5ab6c510476afae0c7ca4e546460a56aad23849afcc1833a6bfb11ed65f9315dcf684ef2cc0043dbff674605c45528bde6d9b5fcbd871cfa80f +DIST gcal-3.6.2.tar.xz 1638776 SHA256 1c3f20e81b7a0ceb3b80668704dfeb7b0e7fe309aa3d6bccb5743f23cff12cda SHA512 fd5954eeef82e5683115e8fde220c949ac87702c77bd7bec321337bd508dcd867b3c4f86c288c5c8e69240cb656d21eed47930a572aca1595d22521ed03cd458 WHIRLPOOL 4e3ec708c9cf22bbcf79011af0bc4b47ab61db0fc716ff3e6113f7d9bfdf2563ed8e9f2afbc2ba8c6d3e7cadb69c14a65292b38ce64aea6edd9b37325546537c diff --git a/app-misc/gcal/gcal-3.6.2.ebuild b/app-misc/gcal/gcal-3.6.2.ebuild new file mode 100644 index 000000000000..dda82165cb7b --- /dev/null +++ b/app-misc/gcal/gcal-3.6.2.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/gcal/gcal-3.6.2.ebuild,v 1.1 2013/01/14 07:32:34 jlec Exp $ + +EAPI=5 + +inherit eutils flag-o-matic toolchain-funcs + +DESCRIPTION="The GNU Calendar - a replacement for cal" +HOMEPAGE="http://www.gnu.org/software/gcal/" +SRC_URI="mirror://gnu/gcal/${P}.tar.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="ncurses nls unicode" + +DEPEND=" + app-arch/xz-utils + nls? ( >=sys-devel/gettext-0.17 )" +RDEPEND="nls? ( virtual/libintl )" + +DOCS=( BUGS LIMITATIONS NEWS README THANKS TODO ) + +src_configure() { + tc-export CC + append-flags -D_GNU_SOURCE + econf \ + --disable-rpath \ + $(use_enable nls) \ + $(use_enable ncurses term) \ + $(use_enable unicode) +} diff --git a/app-misc/gcal/metadata.xml b/app-misc/gcal/metadata.xml index c4c17efb31ff..d8de67ce3e0b 100644 --- a/app-misc/gcal/metadata.xml +++ b/app-misc/gcal/metadata.xml @@ -1,8 +1,8 @@ - shell-tools - + shell-tools + Gcal is a program similar the standard calendar programs BSD "cal" and "calendar". Gcal displays hybrid and proleptic Julian and Gregorian calendar sheets, respectively, for one month, three months or a whole year. It also diff --git a/app-misc/realpath/Manifest b/app-misc/realpath/Manifest index 2e0e954f0b7c..71d10b2cdc64 100644 --- a/app-misc/realpath/Manifest +++ b/app-misc/realpath/Manifest @@ -1,2 +1,4 @@ DIST realpath_1.17.tar.gz 17800 SHA256 214962d9c6e5a0a446d9cf3368bd1ab6cf2c209fbce1fe52e852763e70da984b SHA512 d4f8105e9256b140918dfa400eaac07bec9c29bced7284ab2a3a96282b13b59dca32ab0af38836dfe89dd4e3bf8b038ef4cf61a96d19951f46ac13264ceeec96 WHIRLPOOL a0b96eb70e5aa27fd76d1f4635de950c1adcac8ce3b2a9414fcd54df5df2b01818f3641b3fc049650a05373ffb45dad2a918bfe949fb057592338d9320b9f0a5 DIST realpath_1.17_i386.deb 16372 SHA256 07f47353d2552aec26c679c32b2335302cd1fe54e5c1a290ec4b708fd1b0d104 SHA512 15704a27f3f140c4d69411bfd9c319e3205e7b70cccefdc5bec94ad10d6b6c6ad948c2fa51cf2ed69c8884928ba6dcb83a865185f3b010dc6eb343c2125c2118 WHIRLPOOL abf52c219d3b4f8a186bec4549d9e50f933924ea4676298b12c8da3373e3eb82dac301729153cb8ea427d5321ce4500c2872d55c9c83602abaf04392a1a8bbe1 +DIST realpath_1.18.tar.gz 17618 SHA256 e085f617874ef34453be553a2900c15969d78836ce6476b1c6382a69ea4f75de SHA512 98daa53b7a6d4b40ea3ff9ea89b7cb97782dd53f031e41a228a5aa8d2a41ae7920cbc1e2213f568098496e5c25da1381f08fb939f8668733a3c391f744fd16ed WHIRLPOOL c643e4098eb5474956cc4d1ada9a2676b3a494ece47fb2f298cc1a5aa1457d4b494476f65c55f131e4dd309a2ed12224f53071cc5e0863a9cc59b45137ec2526 +DIST realpath_1.18_i386.deb 16426 SHA256 e9b2103ed8b8041ea6c02e587242b18a4f4b4d4ee6d8c990b4969af1d688d1fd SHA512 fb2062041f8089a5ff07f76a9833e9d8bbe9560d72d4d5803c9524aeb782f9f4a135921b9984432ccfa361edc785a0f33785377ddf031a07ed316861a00a6f37 WHIRLPOOL e22ca8a14c1e329c8576001b325a96bf110eda8f82b368ee1bff7da35a68805a4fe19174f5518d6fd614f5c2df5c939b6316e4898e2f4ad75fd465413444fc13 diff --git a/app-misc/realpath/realpath-1.18.ebuild b/app-misc/realpath/realpath-1.18.ebuild new file mode 100644 index 000000000000..2e356f7b0725 --- /dev/null +++ b/app-misc/realpath/realpath-1.18.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/realpath/realpath-1.18.ebuild,v 1.1 2013/01/14 07:26:41 jlec Exp $ + +EAPI=5 + +inherit eutils flag-o-matic multilib prefix toolchain-funcs + +DESCRIPTION="Return the canonicalized absolute pathname" +HOMEPAGE="http://packages.debian.org/unstable/utils/realpath" +SRC_URI=" + mirror://debian/pool/main/r/${PN}/${PN}_${PV}.tar.gz + nls? ( mirror://debian/pool/main/r/${PN}/${PN}_${PV}_i386.deb )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="nls" + +RDEPEND=" + !sys-freebsd/freebsd-bin + nls? ( virtual/libintl )" +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext ) + x86-interix? ( dev-libs/gnulib ) + elibc_mintlib? ( virtual/libiconv )" + +src_unpack() { + unpack ${PN}_${PV}.tar.gz + + if use nls; then + # Unpack the .deb file, in order to get the preprocessed man page + # translations. This way we avoid a dependency on app-text/po4a. + mkdir deb + cd deb + unpack ${PN}_${PV}_i386.deb + unpack ./data.tar.gz + fi +} + +src_prepare() { + use nls || epatch "${FILESDIR}"/${PN}-1.16-nonls.patch + epatch \ + "${FILESDIR}"/${PN}-1.17-build.patch \ + "${FILESDIR}"/${PN}-1.14-no-po4a.patch \ + "${FILESDIR}"/${PN}-1.15-prefix.patch + eprefixify common.mk +} + +src_compile() { + tc-export CC + use nls && use !elibc_glibc && append-libs -lintl + [[ ${CHOST} == *-mint* ]] && append-libs "-liconv" + if [[ ${CHOST} == *-irix* || ${CHOST} == *-interix[35]* ]] ; then + append-flags -I"${EPREFIX}"/usr/$(get_libdir)/gnulib/include + append-ldflags -L"${EPREFIX}"/usr/$(get_libdir)/gnulib/$(get_libdir) + append-libs -lgnu + fi + + local subdir + for subdir in src man $(usex nls po ''); do + emake MAKE_VERBOSE=yes VERSION="${PV}" -C ${subdir} + done +} + +src_install() { + emake \ + VERSION="${PV}" \ + SUBDIRS="src man $(usex nls po '')" \ + DESTDIR="${D}" \ + install + newdoc debian/changelog ChangeLog.debian + + if use nls; then + local dir + for dir in "${WORKDIR}"/deb/usr/share/man/*; do + [ -f "${dir}"/man1/realpath.1 ] || continue + newman "${dir}"/man1/realpath.1 realpath.${dir##*/}.1 + done + fi +} diff --git a/app-text/multitail/Manifest b/app-text/multitail/Manifest index 6de35296bd1d..380726243c33 100644 --- a/app-text/multitail/Manifest +++ b/app-text/multitail/Manifest @@ -1,2 +1,3 @@ DIST multitail-5.2.10.tgz 165812 SHA256 947577050ea907da11b2a86d4716a3309559a33327b2e1342a02b24a38a15c57 SHA512 7c3bd022b89328687b0e2cd96344ef7376e3af993993d26f0936919e3c8fd2145ea2bcc234b6e38335f2373938673d5fb80c3f8d92f4c5478f118c68256fffa2 WHIRLPOOL d2cc0c29797b9b1b8cf444516a28b701ae1f036f81e9bf0ef9b14808ba37828a8666c8c885b8f894f2d3abe6b3f39ba5e23296b41f69bfd25114e91b9d49efac +DIST multitail-5.2.11.tgz 163769 SHA256 2f0fe12b974adb82b24c8fde98b8ed582535c758493ac8200c1a46449359c2e5 SHA512 ed4fe1aab1cff1b4cb80551d166e53982490208b7830b78bc733a75c4d2afd3b7fa547ad811147fd9e6450431e6477fe0c8c7f8797730a87b35add63b097548b WHIRLPOOL 4ee6a4a69f67ce01b453b85146ec589f31ec8ddb9b89ae81d944d0800041278f378d03d744c4d45c2976d6da1fae1b47da3a4918ab06053e2bce6414a19f6dcb DIST multitail-5.2.9.tgz 165013 SHA256 b90c65e061d4fe5a8c36dd478d3e618eba42ae4abb5570dde063e9d66e9397f3 SHA512 0d643e499f04f9497cc3a9e82de10fe0f6d6f7f69eb3e200c409c0b7815548516a2aba77912d3961db689673b78afc46f78b062029522c3836d4732231d8b7be WHIRLPOOL 385add81418a7d9b1dd3b5db27334dffcb75931934908600a9c723afec79bec63ff3f8a577def59972c457683542ddb60ee4449e43cadfb3b05713b05c6a5a10 diff --git a/app-text/multitail/metadata.xml b/app-text/multitail/metadata.xml index 74daa2e7d112..68d82602a73d 100644 --- a/app-text/multitail/metadata.xml +++ b/app-text/multitail/metadata.xml @@ -1,10 +1,10 @@ - shell-tools - - wschlich@gentoo.org - Wolfram Schlich - Primary maintainer - + shell-tools + + wschlich@gentoo.org + Wolfram Schlich + Primary maintainer + diff --git a/app-text/multitail/multitail-5.2.11.ebuild b/app-text/multitail/multitail-5.2.11.ebuild new file mode 100644 index 000000000000..e9184460b395 --- /dev/null +++ b/app-text/multitail/multitail-5.2.11.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-text/multitail/multitail-5.2.11.ebuild,v 1.1 2013/01/14 07:12:27 jlec Exp $ + +EAPI=5 + +inherit eutils flag-o-matic toolchain-funcs + +DESCRIPTION="Tail with multiple windows" +HOMEPAGE="http://www.vanheusden.com/multitail/index.html" +SRC_URI="http://www.vanheusden.com/multitail/${P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux" +IUSE="debug doc examples" + +DEPEND="sys-libs/ncurses" +RDEPEND="${DEPEND}" + +src_prepare() { + epatch "${FILESDIR}"/5.2.2-as-needed.patch + + use x86-interix && epatch "${FILESDIR}"/${PN}-5.2.6-interix.patch + + sed -e '/gcc/d' -i Makefile || die +} + +src_configure() { + tc-export CC + use debug && append-flags "-D_DEBUG" + use prefix && sed "s:DESTDIR=/:DESTDIR=${EROOT}:g" -i Makefile +} + +src_install () { + dobin multitail + + insinto /etc + doins multitail.conf + + dodoc Changes readme.txt thanks.txt + doman multitail.1 + + use doc && dohtml manual.html + + docinto examples + use examples && dodoc colors-example.{pl,sh} convert-{geoip,simple}.pl +} diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest index 2eb05eebb0fb..73d471538f81 100644 --- a/dev-java/oracle-jdk-bin/Manifest +++ b/dev-java/oracle-jdk-bin/Manifest @@ -15,6 +15,12 @@ DIST jdk-7u10-solaris-sparcv9-demos.tar.gz 901123 SHA256 ade404b770eb9e90e779191 DIST jdk-7u10-solaris-sparcv9.tar.gz 18420859 SHA256 ba304ffd6e954ebcce393ca13fdd2f52a0e24e92bcd35da7d3d8305a8fc77c09 SHA512 4d9076cd7967fd7c30c621cf1e0add9f56ce520cbd151c3a8a397d0f462fe4a9b4e8a89a8fdea6d5ff42e54f6721d19b04955960413ce88978995fe86dbf2a7f WHIRLPOOL 4a129f39a3ac07043a7711723d89dc2e20e09d8296b1ca5c4c52d2169d4e7493ecbcf17124bbaf64ff9430004810c7962d94476f1f4c86a50c7d0c4178e952bd DIST jdk-7u10-solaris-x64-demos.tar.gz 864557 SHA256 3fbb897476d97beb34137ecb32d3405829e6a6e7bbc5f26e9a6cebcb34520712 SHA512 4b946daa3b45760c100f6a72a7d3f5eff31cff9813b99ce4b30dbf3ad8782ec271956dc42e662db28a0f34e2be5719c690ac44f591269638245ddb2ef0935bf2 WHIRLPOOL 4a1b4d9f9bdad8d7c14ee36cf1308a5e4703ac2b050622946f8c8a3face118492915486f48af2d834893f1265e2c94e3dc0ec8faf84e190b8efde76050c2c1a7 DIST jdk-7u10-solaris-x64.tar.gz 15751555 SHA256 50c4317a5f031e1257210dd0b2c66c2576b2889916f8c5858730e448bf748f46 SHA512 a0ead555853133c686fa4b4933175398b16ad3d2042e185355fbb8bacfabff9131600d5ed4252d45717dd0f284a2b6eb21aef1191abd03c544ee7b693f1318bf WHIRLPOOL c8d6ac251d6b80ba12b65b104d4c295eaebfd756fa99518ad5af27e96d66378c0a4c76a732084254fd4d72f7d37710dacd7078c40031a9692db3e1fe01f4ff09 +DIST jdk-7u11-linux-i586.tar.gz 97470187 SHA256 7f8efcbba7d32236a1a9858660ae4e42e32510a487cebffbcf934999deb53d35 SHA512 f7e2d360a08ca39203245c0b4ed0880b1105d86387edadcf3f240c1164a06ddcc3f44036dd0c825609c972bb5c123d836a3ff39790b36379375892a084eb799f WHIRLPOOL 6c6492e1e56abfa5acfab55cb1ca4020f75581f221a6f5ad05fe5be46af84420ebec36a69b07e58d1a726cce9ed412c10e51015f9c30ee95450e4dc461bd7f4c +DIST jdk-7u11-linux-x64.tar.gz 96158031 SHA256 8ae77f5fd43e72dc87135af1c4ee2e294bd6debcec00778509519e0d1f8e5c35 SHA512 827123cb190e4ee356204ba82cea2fafe6e0054a1882ca860d79ddd18f08ea09d590f00b272da8de7d57c10fd332a7c3c93ba91be46186ea1ee20dc01a1a811e WHIRLPOOL b621f5c848e55b124eb0f9a52a3199b76aa56c62f0938583384b5ed545cbbdc9b94008af307c10d059214c230e1219d4d4e7bc4723bc1ea604716e0f3e8c7d69 +DIST jdk-7u11-solaris-i586.tar.gz 96387338 SHA256 54abb5f664e2a8f878f85ee1076285fb97e432a96d6bdd19cb38462b4649b40c SHA512 89f2f7fbaef358d0d26678ae61e5e058481709e809379f6e3ed184a610f58756e609a3d0584c70921d9f8e76003e75fd1de0b6c44516dd676777031a62fe13bd WHIRLPOOL 6467c0720dc5e7dc254a0ef38c2583aeadf28de3b00774773e2020d922441aed9e0a5415f32798b9d4c1d467d05f99dfa1d540275dd47195d30776911c171326 +DIST jdk-7u11-solaris-sparc.tar.gz 99873516 SHA256 7c3e87765ff00d4bcc872f67f98855492184de66e34d99af27b330a0ca406401 SHA512 389ce205eb5e4bbc8c044cadf00ebfff6dcb9227fc81c14ba01f8c14c444abaf89e876f1b1ba16fdba6c2b573976e6b34c7131b50624c46992720c95ea934dc4 WHIRLPOOL 545263677f73e7dab4422753b6df7b8740e22074b3c868dfa557804b30573cb1555a9abb9d3abb53bf43f49f9b0636ed893dbac212f411175ab0efbc2716be68 +DIST jdk-7u11-solaris-sparcv9.tar.gz 18335505 SHA256 af448282e961d32f0a47dde38c3034e84e0a2a1505c636618562cacf8bc794c9 SHA512 dbb942a45b135702d509b202acc28d781f8c3cbbbdba45c01db5472446c514e78a04cecdb8f44f921567c86d3b14a404d7fe9d1de749272c73b99d6965941b55 WHIRLPOOL db4f597092856712d56be8e2843c25c23558adbee90c6c72f4aa8a1afc25aef31caec28aadda22fbf4f06433ed30d35aed1e2bb9e7bf13af462a9adb2bb2cff4 +DIST jdk-7u11-solaris-x64.tar.gz 15674980 SHA256 fadee8ecefe37e407ac68167d797eee80ea7461eff49f437bd386b325077ed07 SHA512 29eb96b246b2f6dca43e09c9d1b5ad4ef12632f1be5ef039d3297f068e4c9261208638928e8f1c2521a26d37e08590977d42ec9d7bc00ff41ca48a4342d509e6 WHIRLPOOL 9e772a8b243e5867d748a35dac436c4b0db9551535961c9294179fe06ebe7c220ad8f5309a1fe894c4673e11d4417e8c81c8a3f3d625bb64578e7447b0517398 DIST jdk-7u9-linux-i586-demos.tar.gz 14751397 SHA256 5aa1098fde7b22d0b8b5c8e436c39a11fa52eb37cc52a63ead3732040f3ae2c6 SHA512 1f03b8194109baa64490d840f7ef39f47f7c74c026b01a8a0f2f89cb562577ff3dbdd70ee180ee4694c4e706990ea3dc9b81d0038a7d59f895c1b8f1d1b563f0 WHIRLPOOL 69d314418ca249a23a211de5062939ec7853f187a919250a5cc5d71f3b17723920076ebc56c59e1f9883ebe0c7feb1da4a51e30bc84c1a537678b9f1447bf61c DIST jdk-7u9-linux-i586.tar.gz 97361259 SHA256 47e86ceb7f59c821a8d0c54f34530bca84e10c1849ed46da7f4fdb5f621bc8d6 SHA512 7353984417b91482fc4d0c1c8597c49f431d4b63502b446d0bea6f5d1080a7504ce0b8801debe75b38eb18551abc3f81264901f3df159b8f6af5e17668603122 WHIRLPOOL defb1480299e37009a95dda609e2efebf8c3a73f48c88f491983daea070459e1fd33f947fdb9ef73c96a1c832fdd6e38eac5f76627ab219e87c8ee3c16780f47 DIST jdk-7u9-linux-x64-demos.tar.gz 14762315 SHA256 76b07b6cca4c251b344abc09cf23788621e21bab963979478d77d76cfdde604b SHA512 376a5ab162aad26e85d802295515fae2b1b8d9e85acff0dc9e4695cdecbfabdf25391f3f180f4d7c8793cfe40d48fc9ab27e7c04da5617c1b30e7bf9372b9217 WHIRLPOOL 72782a69856db15712a45ab58caf168a25d0c46feb06711e43c6ff8cb23ae48cc9ccba9a68a66ba66440c01fa80735c842dc7bb4ef81e9a679cb00fb664c61fe diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.11.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.11.ebuild new file mode 100644 index 000000000000..0bf15999da79 --- /dev/null +++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.11.ebuild @@ -0,0 +1,233 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.11.ebuild,v 1.1 2013/01/14 06:59:45 sera Exp $ + +EAPI="5" + +inherit eutils java-vm-2 prefix versionator + +# This URIs need to be updated when bumping! +JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html" +JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html" +# This is a list of archs supported by this update. +# Currently arm comes and goes. +AT_AVAILABLE=( amd64 x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris ) +# Sometimes some or all of the demos are missing, this is to not have to rewrite half +# the ebuild when it happens. +#DEMOS_AVAILABLE=( amd64 arm x86 x64-solaris x86-solaris sparc-solaris sparc64-solaris ) +DEMOS_AVAILABLE=() +FX_VERSION="2_2_4" + +MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)" +S_PV="$(replace_version_separator 3 '_')" + +AT_x86="jdk-${MY_PV}-linux-i586.tar.gz" +AT_amd64="jdk-${MY_PV}-linux-x64.tar.gz" +AT_arm="jdk-${MY_PV}-linux-arm-sfp.tar.gz" +AT_x86_solaris="jdk-${MY_PV}-solaris-i586.tar.gz" +AT_x64_solaris="${AT_x86_solaris} jdk-${MY_PV}-solaris-x64.tar.gz" +AT_sparc_solaris="jdk-${MY_PV}-solaris-sparc.tar.gz" +AT_sparc64_solaris="${AT_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9.tar.gz" + +FXDEMOS_linux="javafx_samples-${FX_VERSION}-linux.zip" + +DEMOS_x86="${FXDEMOS_linux} jdk-${MY_PV}-linux-i586-demos.tar.gz" +DEMOS_amd64="${FXDEMOS_linux} jdk-${MY_PV}-linux-x64-demos.tar.gz" +DEMOS_arm="${FXDEMOS_linux} jdk-${MY_PV}-linux-arm-sfp-demos.tar.gz" +DEMOS_x86_solaris="jdk-${MY_PV}-solaris-i586-demos.tar.gz" +DEMOS_x64_solaris="${DEMOS_x86_solaris} jdk-${MY_PV}-solaris-x64-demos.tar.gz" +DEMOS_sparc_solaris="jdk-${MY_PV}-solaris-sparc-demos.tar.gz" +DEMOS_sparc64_solaris="${DEMOS_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9-demos.tar.gz" + +JCE_DIR="UnlimitedJCEPolicy" +JCE_FILE="${JCE_DIR}JDK7.zip" + +DESCRIPTION="Oracle's Java SE Development Kit" +HOMEPAGE="http://www.oracle.com/technetwork/java/javase/" +for d in "${AT_AVAILABLE[@]}"; do + SRC_URI+=" ${d}? (" + SRC_URI+=" $(eval "echo \${$(echo AT_${d/-/_})}")" + if has ${d} "${DEMOS_AVAILABLE[@]}"; then + SRC_URI+=" examples? ( $(eval "echo \${$(echo DEMOS_${d/-/_})}") )" + fi + SRC_URI+=" )" +done +unset d +SRC_URI+=" jce? ( ${JCE_FILE} )" + +LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )" +SLOT="1.7" +KEYWORDS="-arm ~amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="+X alsa derby doc examples +fontconfig jce nsplugin pax_kernel source" + +RESTRICT="fetch strip" +QA_PREBUILT="*" + +RDEPEND=" + X? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXtst + ) + alsa? ( media-libs/alsa-lib ) + doc? ( dev-java/java-sdk-docs:1.7 ) + fontconfig? ( media-libs/fontconfig ) + !prefix? ( sys-libs/glibc )" +# scanelf won't create a PaX header, so depend on paxctl to avoid fallback +# marking. #427642 +DEPEND=" + jce? ( app-arch/unzip ) + examples? ( kernel_linux? ( app-arch/unzip ) ) + pax_kernel? ( sys-apps/paxctl )" + +S="${WORKDIR}"/jdk${S_PV} + +check_tarballs_available() { + local uri=$1; shift + local dl= unavailable= + for dl in "${@}"; do + [[ ! -f "${DISTDIR}/${dl}" ]] && unavailable+=" ${dl}" + done + + if [[ -n "${unavailable}" ]]; then + if [[ -z ${_check_tarballs_available_once} ]]; then + einfo + einfo "Oracle requires you to download the needed files manually after" + einfo "accepting their license through a javascript capable web browser." + einfo + _check_tarballs_available_once=1 + fi + einfo "Download the following files:" + for dl in ${unavailable}; do + einfo " ${dl}" + done + einfo "at '${uri}'" + einfo "and move them to '${DISTDIR}'" + einfo + fi +} + +pkg_nofetch() { + local distfiles=( $(eval "echo \${$(echo AT_${ARCH/-/_})}") ) + if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then + distfiles+=( $(eval "echo \${$(echo DEMOS_${ARCH/-/_})}") ) + fi + check_tarballs_available "${JDK_URI}" "${distfiles[@]}" + + use jce && check_tarballs_available "${JCE_URI}" "${JCE_FILE}" +} + +src_prepare() { + if use jce; then + mv "${WORKDIR}"/${JCE_DIR} "${S}"/jre/lib/security/ || die + fi +} + +src_compile() { + # This needs to be done before CDS - #215225 + java-vm_set-pax-markings "${S}" + + # see bug #207282 + einfo "Creating the Class Data Sharing archives" + if use x86; then + bin/java -client -Xshare:dump || die + fi + bin/java -server -Xshare:dump || die + + # Create files used as storage for system preferences. + mkdir jre/.systemPrefs || die + touch jre/.systemPrefs/.system.lock || die + touch jre/.systemPrefs/.systemRootModFile || die +} + +src_install() { + local dest="/opt/${P}" + local ddest="${ED}${dest}" + + # We should not need the ancient plugin for Firefox 2 anymore, plus it has + # writable executable segments + if use x86; then + rm -vf {,jre/}lib/i386/libjavaplugin_oji.so \ + {,jre/}lib/i386/libjavaplugin_nscp*.so + rm -vrf jre/plugin/i386 + fi + # Without nsplugin flag, also remove the new plugin + local arch=${ARCH}; + use x86 && arch=i386; + if ! use nsplugin; then + rm -vf {,jre/}lib/${arch}/libnpjp2.so \ + {,jre/}lib/${arch}/libjavaplugin_jni.so + fi + + dodoc COPYRIGHT + dohtml README.html + + dodir "${dest}" + cp -pPR bin include jre lib man "${ddest}" || die + + if use derby; then + cp -pPR db "${ddest}" || die + fi + + if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then + cp -pPR demo sample "${ddest}" || die + if use kernel_linux; then + cp -pPR "${WORKDIR}"/javafx-samples-${FX_VERSION//_/.} \ + "${ddest}"/javafx-samples || die + fi + fi + + if use jce; then + dodir "${dest}"/jre/lib/security/strong-jce + mv "${ddest}"/jre/lib/security/US_export_policy.jar \ + "${ddest}"/jre/lib/security/strong-jce || die + mv "${ddest}"/jre/lib/security/local_policy.jar \ + "${ddest}"/jre/lib/security/strong-jce || die + dosym "${dest}"/jre/lib/security/${JCE_DIR}/US_export_policy.jar \ + "${dest}"/jre/lib/security/US_export_policy.jar + dosym "${dest}"/jre/lib/security/${JCE_DIR}/local_policy.jar \ + "${dest}"/jre/lib/security/local_policy.jar + fi + + if use nsplugin; then + install_mozilla_plugin "${dest}"/jre/lib/${arch}/libnpjp2.so + fi + + if use source; then + cp src.zip "${ddest}" || die + fi + + # Install desktop file for the Java Control Panel. + # Using ${PN}-${SLOT} to prevent file collision with jre and or other slots. + # make_desktop_entry can't be used as ${P} would end up in filename. + newicon jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \ + sun-jcontrol-${PN}-${SLOT}.png || die + sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT}#" \ + -e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \ + -e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \ + -e "s#Application;##" \ + -e "/Encoding/d" \ + jre/lib/desktop/applications/sun_java.desktop \ + > "${T}"/jcontrol-${PN}-${SLOT}.desktop || die + domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop + + # Prune all fontconfig files so libfontconfig will be used and only install + # a Gentoo specific one if fontconfig is disabled. + # http://docs.oracle.com/javase/7/docs/technotes/guides/intl/fontconfig.html + rm "${ddest}"/jre/lib/fontconfig.* + if ! use fontconfig; then + cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die + eprefixify "${T}"/fontconfig.properties + insinto "${dest}"/jre/lib/ + doins "${T}"/fontconfig.properties + fi + + # Remove empty dirs we might have copied + find "${D}" -type d -empty -exec rmdir -v {} + || die + + set_java_env + java-vm_revdep-mask + java-vm_sandbox-predict /dev/random /proc/self/coredump_filter +} diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest index acc0b7d44070..2d83216401f3 100644 --- a/dev-java/oracle-jre-bin/Manifest +++ b/dev-java/oracle-jre-bin/Manifest @@ -1,5 +1,7 @@ DIST UnlimitedJCEPolicyJDK7.zip 7426 SHA256 7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d SHA512 02eca7da8f3fffea388431d5352290535a63d53a1f5c795d6511ccba62445787a0ee6ad4bc1852e5262860b6d607ba2a8c6a3dbb0c3e1d7c3a67ac7bbc783204 WHIRLPOOL 02460c7ca54f5f62c3f349addf8e2a101f7a56987e9f62365fac3f703b0c93ac5de4d55697a3d04f78b547b072e0acc95a0720d2ce3b429d2fd5936d50edd1ac DIST jre-7u10-linux-i586.tar.gz 48107401 SHA256 0e91c275a87dc1ba049df3cfef16eb958199d80e55bea6a3555900d309615199 SHA512 62f6d6c983fa48e21fef52fc73f13aa30c8b0512fc8d243d341ac465c10c19cd3d8a3f0b93f127e42eac102c0b00cc65502acb8f7dd85593f75a7cd73c5ef8ae WHIRLPOOL be81fa175a52d498598c15b19c3d7ea42fe1814647ac9d0b8684a1a0da6dd0676e7b39514ea400bfcacdb51e4689352beca358bfeef4d3e6cd1219259f8d4786 DIST jre-7u10-linux-x64.tar.gz 46789584 SHA256 a2a45566f4a87e70c0e13577d3bf2b7eeabcdda3279958a75ded1ece96e070d1 SHA512 9d931f53b83d87458adda191ca4cef7374a3768999c961f8634e77f9bd3fe830e615d85406f5c1d47a3eb3d18d062ee4d5f9c86bc4741eab8ae7cc1752c76219 WHIRLPOOL 01dbdd4ced63598152dfd1662bf2d67a39970493694ffb9ff9d0823579d71a0cc8ace67ae39b8a357797e3f4cb523cb7bcf74c630346f3db73fca292a55e54c3 +DIST jre-7u11-linux-i586.tar.gz 48084234 SHA256 08b6b5cb322305d9b7a5d5b56a180299b4d23bd4f88f093d5dbcfe0b9da3ceda SHA512 a5ad0fd31bf0dc4c1b31a8734e2f9c1b006c0dbc3f891c6c693ed3f194c5fa7bddbbd33c1038ebb6bdd997156e92abbacd0ec2b3b2cf358387e9a5cd6db3f051 WHIRLPOOL bfb4be916b3f48d2998bebf8f63f160c98231366dde1332c54c29272a510c286f917b697a35f68900b412d6e0a01d239db3aaf955d8045cc1e8d0b30b1a9be3d +DIST jre-7u11-linux-x64.tar.gz 46780809 SHA256 c4f80063fbe4fc6c6b80bdf97971288a142aa1de1e8c790b684c223f4e09068e SHA512 e32518217a53720742f8ad8b1e8116d05dee2bc063b9dbc78bd8d4d87b35a3fe4f24207ed91cf978a469857aa8ffd96502f271a30c2ad0f5b11f938bb7f73082 WHIRLPOOL 2eb8f89022786a70b6734af116a3140a636f7470edc4aadfbc7e0d2bbab8a9596e520a0912d7c3382c053b229d31f64ff0798e03db2a66affd21071eae9e3cc1 DIST jre-7u9-linux-i586.tar.gz 47995690 SHA256 37310199e770f10d8e5f9410757062655b66723ca2b8c4dd29d9a4e9bd7d98bd SHA512 f3d4fcbd14e3b7c12a3caec5458f60378d1d5e86de89669bd8baa0d137915bba5049cce50304f7e9241e4f3baf96371be80a157763581faa9b87b0f1defffe3f WHIRLPOOL 478482805554188d844ac7d1ced6c6e7fcd1ae5d07a3f527c4a388de887f075e1f4cd840d7859a81cc6176e34db354c6229064619c57e841368974f5325afb52 DIST jre-7u9-linux-x64.tar.gz 46684531 SHA256 16b573b3f4c18f088fc30786e5d62efc594448e7407180ffaf13a3c67cc4ed0b SHA512 390c9118c0f93f36b37488b9efa29cf1dafb1e17ae8396c89b19b2da6a42fb3e3ad748c629fa6fe07b88ed33baaa17cefc0c7eefe702a87b879826bdf8fa1be6 WHIRLPOOL 20b908a64dbb3a96843f09e514436bec2d70ffa5e1f749b7336954fc2aaf96fb5c487ca95f12ea888b30a23aff213893e95b451ff7ea03e032f9ba1d7a4cf0cc diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.11.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.11.ebuild new file mode 100644 index 000000000000..506a67915d60 --- /dev/null +++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.11.ebuild @@ -0,0 +1,168 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.11.ebuild,v 1.1 2013/01/14 07:14:27 sera Exp $ + +EAPI="5" + +inherit java-vm-2 eutils prefix versionator + +MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)" +S_PV="$(replace_version_separator 3 '_')" + +X86_AT="jre-${MY_PV}-linux-i586.tar.gz" +AMD64_AT="jre-${MY_PV}-linux-x64.tar.gz" + +# This URIs need updating when bumping! +JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre7-downloads-1880261.html" +JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html" + +JCE_DIR="UnlimitedJCEPolicy" +JCE_FILE="${JCE_DIR}JDK7.zip" + +DESCRIPTION="Oracle's Java SE Runtime Environment" +HOMEPAGE="http://www.oracle.com/technetwork/java/javase/" +SRC_URI=" + x86? ( ${X86_AT} ) + amd64? ( ${AMD64_AT} ) + jce? ( ${JCE_FILE} )" + +LICENSE="Oracle-BCLA-JavaSE" +SLOT="1.7" +KEYWORDS="~amd64 ~x86" +IUSE="X alsa fontconfig jce nsplugin pax_kernel" + +RESTRICT="fetch strip" +QA_PREBUILT="*" + +RDEPEND=" + X? ( + x11-libs/libXext + x11-libs/libXi + x11-libs/libXrender + x11-libs/libXtst + x11-libs/libX11 + ) + alsa? ( media-libs/alsa-lib ) + fontconfig? ( media-libs/fontconfig ) + !prefix? ( sys-libs/glibc )" +# scanelf won't create a PaX header, so depend on paxctl to avoid fallback +# marking. #427642 +DEPEND=" + jce? ( app-arch/unzip ) + pax_kernel? ( sys-apps/paxctl )" + +S="${WORKDIR}/jre${S_PV}" + +pkg_nofetch() { + if use x86; then + AT=${X86_AT} + elif use amd64; then + AT=${AMD64_AT} + fi + + einfo "Please download '${AT}' from:" + einfo "'${JRE_URI}'" + einfo "and move it to '${DISTDIR}'" + + if use jce; then + einfo "Also download '${JCE_FILE}' from:" + einfo "'${JCE_URI}'" + einfo "and move it to '${DISTDIR}'" + fi +} + +src_prepare() { + if use jce; then + mv "${WORKDIR}"/${JCE_DIR} lib/security/ || die + fi +} + +src_compile() { + # This needs to be done before CDS - #215225 + java-vm_set-pax-markings "${S}" + + # see bug #207282 + einfo "Creating the Class Data Sharing archives" + if use x86; then + bin/java -client -Xshare:dump || die + fi + bin/java -server -Xshare:dump || die + + # Create files used as storage for system preferences. + mkdir .systemPrefs || die + touch .systemPrefs/.system.lock || die + touch .systemPrefs/.systemRootModFile || die +} + +src_install() { + local dest="/opt/${P}" + local ddest="${ED}${dest}" + + # We should not need the ancient plugin for Firefox 2 anymore, plus it has + # writable executable segments + if use x86; then + rm -vf lib/i386/libjavaplugin_oji.so \ + lib/i386/libjavaplugin_nscp*.so + rm -vrf plugin/i386 + fi + # Without nsplugin flag, also remove the new plugin + local arch=${ARCH}; + use x86 && arch=i386; + if ! use nsplugin; then + rm -vf lib/${arch}/libnpjp2.so \ + lib/${arch}/libjavaplugin_jni.so + fi + + dodir "${dest}" + cp -pPR bin lib man "${ddest}" || die + + # Remove empty dirs we might have copied + find "${D}" -type d -empty -exec rmdir -v {} + || die + + dodoc COPYRIGHT README + + if use jce; then + dodir ${dest}/lib/security/strong-jce + mv "${ddest}"/lib/security/US_export_policy.jar \ + "${ddest}"/lib/security/strong-jce || die + mv "${ddest}"/lib/security/local_policy.jar \ + "${ddest}"/lib/security/strong-jce || die + dosym "${dest}"/lib/security/${JCE_DIR}/US_export_policy.jar \ + "${dest}"/lib/security/US_export_policy.jar + dosym "${dest}"/lib/security/${JCE_DIR}/local_policy.jar \ + "${dest}"/lib/security/local_policy.jar + fi + + if use nsplugin; then + install_mozilla_plugin "${dest}"/lib/${arch}/libnpjp2.so + fi + + # Install desktop file for the Java Control Panel. + # Using ${PN}-${SLOT} to prevent file collision with jre and or other slots. + # make_desktop_entry can't be used as ${P} would end up in filename. + newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \ + sun-jcontrol-${PN}-${SLOT}.png || die + sed -e "s#Name=.*#Name=Java Control Panel for Oracle JRE ${SLOT}#" \ + -e "s#Exec=.*#Exec=/opt/${P}/bin/jcontrol#" \ + -e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \ + -e "s#Application;##" \ + -e "/Encoding/d" \ + lib/desktop/applications/sun_java.desktop > \ + "${T}"/jcontrol-${PN}-${SLOT}.desktop || die + domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop + + # Prune all fontconfig files so libfontconfig will be used and only install + # a Gentoo specific one if fontconfig is disabled. + # http://docs.oracle.com/javase/7/docs/technotes/guides/intl/fontconfig.html + rm "${ddest}"/lib/fontconfig.* || die + if ! use fontconfig; then + cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die + eprefixify "${T}"/fontconfig.properties + insinto "${dest}"/lib/ + doins "${T}"/fontconfig.properties + fi + + set_java_env + java-vm_revdep-mask + java-vm_sandbox-predict /dev/random /proc/self/coredump_filter +} diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest index 15e607b3cdce..127679a8917e 100644 --- a/dev-lang/swi-prolog/Manifest +++ b/dev-lang/swi-prolog/Manifest @@ -1,10 +1,12 @@ DIST pl-6.2.0.tar.gz 14353730 SHA256 be358eacd50bc7013cdcdd1aa763e67c5b1d40f7bbf1833a7a48c0123a6455a8 SHA512 a8e265eecd26fde41732bd965a6201ee61101a31ffbc8ead89f9563e91a6bc85382c7aa0eb6e3eb79cfa7e3f3f7fe89f50776553dd2198eba48b2369c20f5616 WHIRLPOOL 0812b03c4a8e61a17afa7835d2f21ef5b68b8fa0badc09aeba8e7179aff41a783a928a22e55b3773caeaa15d384054ba0e948e0c4111fc067c65c3173dc68b04 DIST pl-6.2.2.tar.gz 14353692 SHA256 e2d5a62756ea0001f65a2411dfe7d380e1d2ab7b365fe12bc6e110d966fe43dd SHA512 fad8bd48ef496258b86527e9764c748b25a83c25dcc7aa4921fcc78df730e7c442a8c3524356b36f2cb92cdb71a116475f7039e4c829c7f41fc6994ce0fa636e WHIRLPOOL f133afa09055d506e4fbf8e3214b5f290b890a7c42e6bb046d97318fbc8f961be33d788a79076597b4434974d7444bf67ba193829faebe2c768ff13c2ed7801e DIST pl-6.2.5.tar.gz 14404112 SHA256 0613e40ebfe7329e542a042587f2e593a74f5710dbbfcf1e116ddba1e6c35167 SHA512 a61084b3f501874bcd44633ab351c01d2e92941e26e5ff9b95b76bf94c7f459e4217f12e5dad21b7b0b6a2ddb821e205f40351d6602eb80414b119e32da373eb WHIRLPOOL 0fe91154a01160c9ba3519c722cfce4e09a5b4c1fd7319563ff1b696fd74ef300b978416f14dfbed9669e5c24f97be4709181a9029029ad08a068a32c1658bb6 +DIST pl-6.2.6.tar.gz 14407455 SHA256 9412f0753a61c30dbcf1afac01fe7c9168002854709e00e09c21f959e1232146 SHA512 0bd8b057241c284e5530965236ac79895153f7ff4b42d72dea67f4c1296f0319c0ed7db363bb17a099686c1742ade4ad06d8f916637ff70f84e2c00d6c122b52 WHIRLPOOL ac5b0ba0fbfab919ebfd00cc01977e82973c23522f6a601416b4fdcfdddb1f902ab87016058aaa1d62533dea512b8f931f440433814e8cb3e0f8b66f7139204e DIST pl-6.3.6.tar.gz 14492653 SHA256 0020d2aaff1c47bb2487c6053f231ca7070d97317f2d55993c3263fa2975a88a SHA512 b6179e813c63bba215578f53169890b484477fb7e5efd1be8247afc47c1fe03839dbdd13a21d9a4c96d4b395e813181b4e682e2cb161c47ab4e22f637192f5b8 WHIRLPOOL f792bfa371404d92930b6bec8061adc31b16f0518f0e02bc7584ca843e50785b9d6c0312c8a64c9192145a83150e0744b0b17d3be46008b3babf4713596ae4f6 DIST pl-6.3.7.tar.gz 14492539 SHA256 1c4c9f79b54f609ee329104112519485b189bf604afd235fb3854e1aeeccb13f SHA512 dd76d368973a7cf1ca104412fb070ab9576ed97d9472ae42309d5ea25dc52f27dac330fd351ccccd35b2090cc26189d472f2d1929563a3689e40e744673f9b3f WHIRLPOOL 0c62732fb44ee6b476c9175ad0a1a49fa403b753e07647e13bbf9caff3de097e78081181119b9d5b06ecbb8bfd243d9de7012766370a2f6c40b1c2aacd5a71ac DIST swi-prolog-6.2.0-gentoo-patchset-5.tar.gz 5340 SHA256 94d1ca1c17bba09c00e8d29bf599598574667f2093996651a357eb168e5a3f7a SHA512 2a7bc9998c117a9e509f1bab73898f668922225af97f31a2569f689b89edba6776f6117f32e7023db22354e4fedefb557e7603be31fc5a696f939d271f1aebf2 WHIRLPOOL 5e05b315ff8914eb54ec4b91ce455c98604ae7b514acbafea9f72d70fcb6f68a77579e03a3b292a57c0f8dfe0d3cb6d07fe5fb9b29cdcbd051919dffc5fd5904 DIST swi-prolog-6.2.2-gentoo-patchset-0.tar.gz 4303 SHA256 824dd784cf3b7e1b45b65e6a923289de6e6e28d3cf0b797e071e4185f2c05f9f SHA512 5c9c579971172e7300c01120bb70c273ea37a9f962d9ede3d0e7bd45dba6441b7f3244b568643bc6f16b8eabd3099b4cbee25f5be17ac4cebe54c06547cf530f WHIRLPOOL db8349096acd6341de46465ee7c914d19087227fb31064cf3bc21593f2c25660bff2d7d7080e78dff92508bb29dde4da0248ce8b290809aa8543882c82cd0638 DIST swi-prolog-6.2.5-gentoo-patchset-1.tar.gz 2692 SHA256 c4e59e4240effb3383465997020e4056e5967aa4f9bcf0b010a564d1f49bbd71 SHA512 2f31fae8df581931bee3b38bee1687f9fb12567a9f267a01eba5dd011377cea05b3249df942c4b719bb0c2f7cfb86c5665794948083c3090a6854b04fb25ac4e WHIRLPOOL 49685d66ee2ec6ad4a654356bb6d290d8bd81e79c42241786c235d610493b78583cfb2c44be4b20ba49f49891d9da69b90bf5b5c0f9fc59f272c20ff6475c204 +DIST swi-prolog-6.2.6-gentoo-patchset-0.tar.gz 2701 SHA256 9ab62cb8b19816af66adb4b52344ca59449210a6413c08c9edaf4e3fa5cdf3ad SHA512 a0c5961fd3ceb1e8ee59be6a03bd801fa95ecede3eba41d9b66682e39095e532207e87029c13aaa0e8cb90c03e96e6e41889e433b3627df9b864adad9f45851b WHIRLPOOL eafe59ebc256ccef608b635cf8559866e38f0c52667dac96f984ce1fe195de636176fa8f9653d882a87b6619dd56e0019c01efbd413bfbcb48d457dcfb46fac6 DIST swi-prolog-6.3.6-gentoo-patchset-0.tar.gz 1920 SHA256 1e31ddd82e611cce1299252e67c8c764d5c0d189e7f2586e5fd45bd02f100bbc SHA512 8b562c9f80ff6f8f6fa34596d0444d2ea559ef7d1e46b0080594b99513f8a224416ad2e395aee9245076cc1e8ce8722730488c03e513339acb690b314b60da0a WHIRLPOOL e5bcf46be03074668644fceeaee4901e0861f5bc5a531b9fb4bd10322910eb83f47a5870c6d5359b778ed1a96d423aa16e223cd252496e19581946efc0ac1bed DIST swi-prolog-6.3.7-gentoo-patchset-0.tar.gz 1912 SHA256 19cfbe7e9d9ad5e3eff777552fa46e9abc4b152e98391188b83e420b75bb74a3 SHA512 3f523a7379606158e2650ef07096fd18b1996d903b176ddcaea2b2ac6b9bb8b41b2037b9cafae2eb8b513a5ea92e07d03142f37a04f172c0eeb3af98e5945a48 WHIRLPOOL 500fc258311fd1e221b2865932f157507926e3af628e2bf0ed80184ced982df3dc4b77627d340c2d69a1e304e6745f17a0d83bb23f07feb3ad5ee027d7f168bd diff --git a/dev-lang/swi-prolog/swi-prolog-6.2.6.ebuild b/dev-lang/swi-prolog/swi-prolog-6.2.6.ebuild new file mode 100644 index 000000000000..b0aafce09655 --- /dev/null +++ b/dev-lang/swi-prolog/swi-prolog-6.2.6.ebuild @@ -0,0 +1,140 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-6.2.6.ebuild,v 1.1 2013/01/14 09:47:59 keri Exp $ + +EAPI=4 + +inherit eutils flag-o-matic java-pkg-opt-2 multilib + +PATCHSET_VER="0" + +DESCRIPTION="free, small, and standard compliant Prolog compiler" +HOMEPAGE="http://www.swi-prolog.org/" +SRC_URI="http://www.swi-prolog.org/download/stable/src/pl-${PV}.tar.gz + mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos" +IUSE="archive debug doc gmp hardened java minimal odbc readline ssl static-libs test zlib X" + +RDEPEND="sys-libs/ncurses + archive? ( app-arch/libarchive ) + zlib? ( sys-libs/zlib ) + odbc? ( dev-db/unixODBC ) + readline? ( sys-libs/readline ) + gmp? ( dev-libs/gmp ) + ssl? ( dev-libs/openssl ) + java? ( >=virtual/jdk-1.4 ) + X? ( + virtual/jpeg + x11-libs/libX11 + x11-libs/libXft + x11-libs/libXpm + x11-libs/libXt + x11-libs/libICE + x11-libs/libSM )" + +DEPEND="${RDEPEND} + X? ( x11-proto/xproto ) + java? ( test? ( =dev-java/junit-3.8* ) )" + +S="${WORKDIR}/pl-${PV}" + +src_prepare() { + EPATCH_FORCE=yes + EPATCH_SUFFIX=patch + epatch "${WORKDIR}"/${PV} + + # OSX/Intel ld doesn't like an archive without table of contents + sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die +} + +src_configure() { + append-flags -fno-strict-aliasing + use ppc && append-flags -mno-altivec + use hardened && append-flags -fno-unit-at-a-time + use debug && append-flags -DO_DEBUG + + # ARCH is used in the configure script to figure out host and target + # specific stuff + export ARCH=${CHOST} + + cd "${S}"/src + econf \ + --libdir="${EPREFIX}"/usr/$(get_libdir) \ + $(use_enable gmp) \ + $(use_enable readline) \ + $(use_enable static-libs static) \ + --enable-shared \ + --enable-custom-flags COFLAGS="${CFLAGS}" + + if ! use minimal ; then + local jpltestconf + if use java && use test ; then + jpltestconf="--with-junit=$(java-config --classpath junit)" + fi + + cd "${S}/packages" + econf \ + --libdir="${EPREFIX}"/usr/$(get_libdir) \ + $(use_with archive) \ + --with-chr \ + --with-clib \ + --with-clpqr \ + --with-cpp \ + --with-http \ + $(use_with java jpl) \ + ${jpltestconf} \ + --with-nlp \ + $(use_with odbc) \ + --with-PDT \ + --with-pldoc \ + --with-plunit \ + --with-protobufs \ + --with-R \ + --with-RDF \ + --with-semweb \ + --with-sgml \ + $(use_with ssl) \ + --with-table \ + --with-tipc \ + --with-utf8proc \ + $(use_with X xpce) \ + $(use_with zlib) \ + COFLAGS='"${CFLAGS}"' + fi +} + +src_compile() { + cd "${S}"/src + emake + + if ! use minimal ; then + cd "${S}/packages" + emake + fi +} + +src_test() { + cd "${S}/src" + emake check + + if ! use minimal ; then + cd "${S}/packages" + emake check + fi +} + +src_install() { + emake -C src DESTDIR="${D}" install + + if ! use minimal ; then + emake -C packages DESTDIR="${D}" install + if use doc ; then + emake -C packages DESTDIR="${D}" html-install + fi + fi + + dodoc ReleaseNotes/relnotes-5.10 INSTALL README VERSION +} diff --git a/dev-libs/dbus-glib/dbus-glib-0.100-r2.ebuild b/dev-libs/dbus-glib/dbus-glib-0.100-r2.ebuild index 56cb0f47b770..263672a172fd 100644 --- a/dev-libs/dbus-glib/dbus-glib-0.100-r2.ebuild +++ b/dev-libs/dbus-glib/dbus-glib-0.100-r2.ebuild @@ -1,9 +1,8 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/dbus-glib-0.100-r2.ebuild,v 1.1 2013/01/13 17:50:03 eva Exp $ - -EAPI="5" +# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/dbus-glib-0.100-r2.ebuild,v 1.2 2013/01/14 08:35:48 ssuominen Exp $ +EAPI=5 inherit bash-completion-r1 eutils DESCRIPTION="D-Bus bindings for glib" @@ -15,15 +14,12 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="debug doc static-libs test" -RDEPEND=" - >=dev-libs/expat-2 +RDEPEND=">=dev-libs/expat-2 >=dev-libs/glib-2.26 - >=sys-apps/dbus-1.6.2 -" + >=sys-apps/dbus-1.6.2" DEPEND="${RDEPEND} virtual/pkgconfig - doc? ( >=dev-util/gtk-doc-1.4 ) -" + doc? ( >=dev-util/gtk-doc-1.4 )" # out of sources build directory BD=${WORKDIR}/${P}-build @@ -35,18 +31,17 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-0.100-fix-tests.patch # Wrong sections.txt file in the tarball; https://bugs.freedesktop.org/show_bug.cgi?id=55830 - cp "${FILESDIR}/${P}-dbus-glib-sections.txt" doc/reference/dbus-glib-sections.txt || die + cp "${FILESDIR}"/${P}-dbus-glib-sections.txt doc/reference/dbus-glib-sections.txt || die } src_configure() { - # gtk-doc needs to be built when using out-of-source build local myconf=( --localstatedir="${EPREFIX}"/var --enable-bash-completion $(use_enable debug verbose-mode) $(use_enable debug asserts) - $(use_enable doc gtk-doc) $(use_enable static-libs static) + $(use_enable doc gtk-doc) ) mkdir "${BD}" @@ -70,23 +65,26 @@ src_configure() { src_compile() { cd "${BD}" einfo "Running make in ${BD}" - default + emake if use test; then cd "${TBD}" einfo "Running make in ${TBD}" - default + emake fi } src_test() { cd "${TBD}" - default + emake check } src_install() { + # NEWS file is obsolete + dodoc AUTHORS ChangeLog HACKING README + cd "${BD}" - default + emake DESTDIR="${D}" install newbashcomp "${ED}"/etc/bash_completion.d/dbus-bash-completion.sh dbus rm -rf "${ED}"/etc/bash_completion.d || die diff --git a/dev-libs/libzip/libzip-0.10.1-r1.ebuild b/dev-libs/libzip/libzip-0.10.1-r1.ebuild index fa782418aa9b..93b19e9ebfdc 100644 --- a/dev-libs/libzip/libzip-0.10.1-r1.ebuild +++ b/dev-libs/libzip/libzip-0.10.1-r1.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/dev-libs/libzip/libzip-0.10.1-r1.ebuild,v 1.6 2012/07/25 01:58:55 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libzip/libzip-0.10.1-r1.ebuild,v 1.7 2013/01/14 09:57:59 pinkbyte Exp $ EAPI=4 @@ -15,7 +15,7 @@ SRC_URI="http://www.nih.at/libzip/${MY_P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos" IUSE="static-libs" DEPEND="sys-libs/zlib" diff --git a/dev-perl/FLV-AudioExtractor/FLV-AudioExtractor-0.010.0.ebuild b/dev-perl/FLV-AudioExtractor/FLV-AudioExtractor-0.010.0.ebuild index 3db8f557e96b..35e3882a1220 100644 --- a/dev-perl/FLV-AudioExtractor/FLV-AudioExtractor-0.010.0.ebuild +++ b/dev-perl/FLV-AudioExtractor/FLV-AudioExtractor-0.010.0.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/dev-perl/FLV-AudioExtractor/FLV-AudioExtractor-0.010.0.ebuild,v 1.1 2012/12/12 09:53:30 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-perl/FLV-AudioExtractor/FLV-AudioExtractor-0.010.0.ebuild,v 1.2 2013/01/14 09:50:10 pinkbyte Exp $ EAPI=5 @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Extract audio from Flash Videos" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="" DEPEND="virtual/perl-ExtUtils-MakeMaker" diff --git a/dev-python/django-evolution/django-evolution-0.6.7-r1.ebuild b/dev-python/django-evolution/django-evolution-0.6.7-r1.ebuild index c637fe908063..e25ebad23ebe 100644 --- a/dev-python/django-evolution/django-evolution-0.6.7-r1.ebuild +++ b/dev-python/django-evolution/django-evolution-0.6.7-r1.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/django-evolution/django-evolution-0.6.7-r1.ebuild,v 1.1 2013/01/13 09:21:23 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/django-evolution/django-evolution-0.6.7-r1.ebuild,v 1.2 2013/01/14 05:45:14 idella4 Exp $ EAPI=5 @@ -26,22 +26,15 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${MY_P} -python_test() { - testing() { - local exit_status=0 - "$(PYTHON)" tests/runtests.py || exit_status=1 - return $exit_status - } - python_execute_function testing -} +#python_test() { +# "${PYTHON}" tests/runtests.py || exit_status=1 +#} src_install() { distutils-r1_src_install - local msg="Remove tests to avoid file collisions" - rmtests() { - rm -rf "${ED}"/$(python_get_sitedir)/tests/ - } - python_execute_function --action-message "$msg" rmtests + einfo "Remove tests to avoid file collisions" + rm -rf $(find "${ED}" -name tests) || die + dodoc -r docs/ } diff --git a/dev-tex/metapost/Manifest b/dev-tex/metapost/Manifest index 81b25f6a0ff5..50b951fa7dd2 100644 --- a/dev-tex/metapost/Manifest +++ b/dev-tex/metapost/Manifest @@ -1,2 +1,3 @@ DIST metapost-1.212-src.tar.bz2 4862803 SHA256 bed4fa92cf86c668d4180f6c644f2a00a5cee17be3f0c00dcfc32c6ff842903a SHA512 ec66d756ff4505ce49d74b0a3fbdc715d4cf95eb3e3a3acd2f704310ae3d1bf3cb87bc75aaa2b1f74d32182ac6815ce658ece42a2f8c880d2d065f52c22fbe42 WHIRLPOOL 15c14f54511cbdebda5dfba8a90ff407d4779f2cd0bf341dfe3c80dac06c66d9d3b8963c54a8f531bce25a536455a03ca27ca6a3bb3b1ee502c5ccf4923b7987 +DIST metapost-1.780-src.tar.bz2 7723409 SHA256 aca382bb1c6b4f52d389c0170cad57c4961fa8de634de34ea47b0a37cfabde58 SHA512 3002da0706fcd33a2d183f42b770b7c2d72759a8ba0e49ae24e4a5cee5dd9cd0842e7e8d854e22962beaff4dfd1b943a63f41ee07a7743bb7d50a0cdfb4dd4ff WHIRLPOOL 3095ac3cda9bd65487074882c6cc9d8bf2210d04b69ed741290054f1622a5c29ce9af986cc5b819b910db2757eb14565e1ce9a1968a2f29ae72bca50ce2c90d1 DIST metapost-beta-1.504-src.tar.bz2 4784579 SHA256 94d37e092c953141cf95c62f6fb441fdbdb786e6c0df5f6b5d6af41658e99562 SHA512 40bf7304df0de3d1df069ab48f5d08b9ddaa7bcba9332c6076dc9fed3a6371351c9bdc6504c297835d454d6c97db15b2f2620a629801089c1acffb9ea9c76771 WHIRLPOOL c62271ebb343d6dd43527f6bda7cbeb5ea9ead9580fc7ea65e343cd69317b2bb8b196b3016eb65a6435a463551ff9e2a45c9eb7d460e4b72973b86c5af02abd4 diff --git a/dev-tex/metapost/metapost-1.780.ebuild b/dev-tex/metapost/metapost-1.780.ebuild new file mode 100644 index 000000000000..430fe88786e2 --- /dev/null +++ b/dev-tex/metapost/metapost-1.780.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-tex/metapost/metapost-1.780.ebuild,v 1.1 2013/01/14 10:48:16 aballier Exp $ + +EAPI=4 + +DESCRIPTION="System for producing graphics" +HOMEPAGE="http://tug.org/metapost.html" +SRC_URI="http://foundry.supelec.fr/gf/download/frsrelease/395/1879/${P}-src.tar.bz2" + +LICENSE="GPL-2 LGPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +RDEPEND="dev-libs/kpathsea + >=app-admin/eselect-mpost-0.3 + x11-libs/cairo + x11-libs/pixman + media-libs/libpng" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +S=${WORKDIR}/${P}/source/texk/web2c + +src_configure() { + econf \ + --disable-all-pkgs \ + --enable-shared \ + --disable-largefile \ + --disable-ptex \ + --enable-mp \ + --with-system-cairo \ + --with-system-libpng \ + --without-ptexenc \ + --with-system-kpathsea \ + --with-system-xpdf \ + --with-system-freetype \ + --with-system-freetype2 \ + --with-system-gd \ + --with-system-teckit \ + --with-system-t1lib \ + --with-system-icu \ + --with-system-graphite \ + --with-system-zziplib \ + --with-system-poppler \ + --with-system-zlib \ + --with-system-pixman \ + --disable-native-texlive-build \ + --without-mf-x-toolkit --without-x +} + +src_compile() { + emake mpost +} + +src_install() { + emake DESTDIR="${D}" \ + SUBDIRS="" \ + bin_PROGRAMS="mpost" \ + nodist_man_MANS="" \ + dist_man_MANS="" \ + install-binPROGRAMS + # Rename it + mv "${D}/usr/bin/mpost" "${D}/usr/bin/mpost-${P}" || die "renaming failed" + + cd "${WORKDIR}/${P}" + dodoc README CHANGES +} + +pkg_postinst(){ + einfo "Calling eselect mpost update" + eselect mpost update +} diff --git a/dev-util/nvidia-cuda-sdk/Manifest b/dev-util/nvidia-cuda-sdk/Manifest index add8c3b8e2a0..9b2c6e00afb1 100644 --- a/dev-util/nvidia-cuda-sdk/Manifest +++ b/dev-util/nvidia-cuda-sdk/Manifest @@ -1,11 +1,6 @@ DIST NVIDIA_CUDA_SDK_2.02.0807.1535_linux.run 41918865 SHA256 5ceb6ac9d973b7d3544ed5ee3c52de40451ca234df587fb93bd3c5b73f5610c4 -DIST cuda-sdk-linux-2.10.1215.2015-3233425.run 46618139 SHA256 5d9521f049312fc00fef9e9ed6fa2bd8475e0d309dab109da4b663461d9855bb +DIST cuda_5.0.35_linux_32_fedora16-1.run 583244929 SHA256 11927b4c0fb23dbf98457b852914b8458ef41cc1b7ea67bce892f2cc6a77d34e SHA512 d1cda0d53fdc86ac6412c5c92a16efd761d3f15f08878e1aa1c17bdf3bad824a0cebb5c211ad89b8dd15a439eddd0f93efe82ed0850dc93adcd3dab529f6daca WHIRLPOOL 11bc905a4a63171009569d6655b40f0d49034f71c0a93a83e1b656e91a4250c813e0a16fdfda87e9fbe4d250a312beb0c9ad073bfb0420fb4e06fdd26faf3cc9 +DIST cuda_5.0.35_linux_64_fedora16-1.run 701310481 SHA256 c2889c779215eea1c3cc6d4b092eb4208b7e1063704b6e5e8d48d04e961c3c0a SHA512 83903587d1715dd3a64db6bd676c0586edb81495da1bec22aac9995de31ca0b0db2460cccf4af0845befe0cee308ab019760c3c88eb351b6db0f255f7d93e546 WHIRLPOOL 33b998c66ebfa059d77eedb6b8465183f5ef4444ed5fe55f622efe6a2eeeef8e50e2cb09b0de4e61e15b5320495123ce46e1b47fc4cbbe96f3bde0ac93ff5dbc DIST cudasdk_2.2_linux.run 55951278 SHA256 1962a0a0795a8d2aef7c4e113319bd0bb376a7bb553405d94d731e594ef316fb -DIST cudasdk_2.3_linux.run 66005555 SHA256 26ec80755b124a8484c93a6481a3c19f4fa7fdae96b087fd889346981c463873 -DIST gpucomputingsdk_3.0-beta1_linux.run 108531376 SHA256 43b1ffe2a069f5e509efcd476d47a2595bad0db8a6967d91375e706445b9b016 -DIST gpucomputingsdk_3.0_linux.run 100306703 SHA256 7a3afdd52023cfa49bc67182729ce498cc85fa370dcd4bd33c299fb75945ec5e -DIST gpucomputingsdk_3.1_linux.run 222010279 SHA256 57d71cf889df7bbbc8b18ba5e74b2dd9e5a64951867c007d63577c2e07afd7ce -DIST gpucomputingsdk_3.2.16_linux.run 127914287 SHA256 e815d80e183f4a77ddd5e3d5611432c387102c786d12a57c983b69ad74ce3e45 -DIST gpucomputingsdk_4.0.17_linux.run 129498736 SHA256 d62baf4963ca58d7db711e0366439e2c63bc84ce6c513c8a9dfa82a0fc51f102 -DIST gpucomputingsdk_4.1.28_linux.run 155378846 SHA256 1d6c6b6b25ae70d7a725cb89a06644b7101a63c1508bce69daacd32b32b0f6f9 DIST gpucomputingsdk_4.2.9_linux.run 152436489 SHA256 b6a53afcf8f8422b5075aa37cec6730b0b9896d50867ee9105da05d62e95b8bb SHA512 1975f005ebd1520005d0a45ac680c8b49806705b8ed64738366b7166f384a304de3d655a05900b6da1088441024b149a1e963296ef78041c524ecbb1bb5e5315 WHIRLPOOL b8ce1f1f6a54b2d52f2531cfbb46f2a48e0b37f0c1dd898ff6222483afed7ac26c6bc57da31cafb0c30b3636b780ace3e3c679f25c6c4eaa26b0e39da00dcb8f +DIST nvidia-cuda-sdk-5.0.35-asneeded.patch.xz 8892 SHA256 b79db5453350a1149771236e4dbdc4dc1504afd8f19472240c009f51048a27bc SHA512 7797a0ea6b0090e2d452acd644976a950c3b5cb3890073be41021fd3c6c1581a130bc7a8ee2da03131785de8dae6b9f09aff3a01a390ef909508e8c0c55863c8 WHIRLPOOL 0708a2d2eea767a490ce817b70292c2b2e6bfc8e1afb7b2f1bc73a3d170ebbd957a0d5be3a620611bc394cdefc4d37b7e43e2aa83e710396bc083aebc807429c diff --git a/dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-4.2.9-asneeded.patch b/dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-4.2.9-asneeded.patch new file mode 100644 index 000000000000..f639b967bda0 --- /dev/null +++ b/dev-util/nvidia-cuda-sdk/files/nvidia-cuda-sdk-4.2.9-asneeded.patch @@ -0,0 +1,89 @@ +--- a/sdk/C/common/common.mk ++++ b/sdk/C/common/common.mk +@@ -268,18 +268,18 @@ endif + + # If dynamically linking to CUDA and CUDART, we exclude the libraries from the LIB + ifeq ($(USECUDADYNLIB),1) +- LIB += ${OPENGLLIB} $(PARAMGLLIB) $(RENDERCHECKGLLIB) ${LIB} -ldl -rdynamic ++ LIB += $(RENDERCHECKGLLIB) ${OPENGLLIB} $(PARAMGLLIB) ${LIB} -ldl -rdynamic + else + # static linking, we will statically link against CUDA and CUDART + ifeq ($(USEDRVAPI),1) +- LIB += -lcuda ${OPENGLLIB} $(PARAMGLLIB) $(RENDERCHECKGLLIB) ${LIB} ++ LIB += -lcuda $(RENDERCHECKGLLIB) ${OPENGLLIB} $(PARAMGLLIB) ${LIB} + else + ifeq ($(emu),1) + LIB += -lcudartemu + else + LIB += -lcudart + endif +- LIB += ${OPENGLLIB} $(PARAMGLLIB) $(RENDERCHECKGLLIB) ${LIB} ++ LIB += $(RENDERCHECKGLLIB) ${OPENGLLIB} $(PARAMGLLIB) ${LIB} + endif + endif + +--- a/sdk/CUDALibraries/common/common_cudalib.mk ++++ b/sdk/CUDALibraries/common/common_cudalib.mk +@@ -253,7 +253,7 @@ ifeq ($(USEPARAMGL),1) + endif + + ifeq ($(USERENDERCHECKGL),1) +- RENDERCHECKGLLIB := -lrendercheckgl_$(LIB_ARCH)$(LIBSUFFIX) ++ RENDERCHECKGLLIB := -L../../../C/lib -lrendercheckgl_$(LIB_ARCH)$(LIBSUFFIX) + endif + + ifeq ($(USENVCUVID), 1) +--- a/sdk/CUDALibraries/src/boxFilterNPP/Makefile ++++ b/sdk/CUDALibraries/src/boxFilterNPP/Makefile +@@ -38,7 +38,7 @@ include ../../common/common_npplib.mk + # Targets + ################################################################################ + all: +- $(CXX) $(INC) $(LIB) -o boxFilterNPP boxFilterNPP.cpp -lUtilNPP_$(LIB_ARCH) -lfreeimage$(FREEIMAGELIBARCH) ++ $(CXX) $(INC) -o boxFilterNPP boxFilterNPP.cpp -lUtilNPP_$(LIB_ARCH) -lfreeimage$(FREEIMAGELIBARCH) $(LIB) + mkdir -p ../../bin + mkdir -p ../../bin/$(OSLOWER)/ + mkdir -p ../../bin/$(OSLOWER)/debug +--- a/sdk/CUDALibraries/src/freeImageInteropNPP/Makefile ++++ b/sdk/CUDALibraries/src/freeImageInteropNPP/Makefile +@@ -38,7 +38,7 @@ include ../../common/common_npplib.mk + # Targets + ################################################################################ + all: +- $(CXX) $(INC) $(LIB) -o freeImageInteropNPP freeImageInteropNPP.cpp -lUtilNPP_$(LIB_ARCH) -lfreeimage$(FREEIMAGELIBARCH) ++ $(CXX) $(INC) -o freeImageInteropNPP freeImageInteropNPP.cpp -lUtilNPP_$(LIB_ARCH) -lfreeimage$(FREEIMAGELIBARCH) $(LIB) + mkdir -p ../../bin + mkdir -p ../../bin/$(OSLOWER) + mkdir -p ../../bin/$(OSLOWER)/release +--- a/sdk/CUDALibraries/src/histEqualizationNPP/Makefile ++++ b/sdk/CUDALibraries/src/histEqualizationNPP/Makefile +@@ -38,7 +38,7 @@ include ../../common/common_npplib.mk + # Targets + ################################################################################ + all: +- $(CXX) $(INC) $(LIB) -o histEqualizationNPP histEqualizationNPP.cpp -lUtilNPP_$(LIB_ARCH) -lfreeimage$(FREEIMAGELIBARCH) ++ $(CXX) $(INC) -o histEqualizationNPP histEqualizationNPP.cpp -lUtilNPP_$(LIB_ARCH) -lfreeimage$(FREEIMAGELIBARCH) $(LIB) + mkdir -p ../../bin + mkdir -p ../../bin/$(OSLOWER) + mkdir -p ../../bin/$(OSLOWER)/release +--- a/sdk/CUDALibraries/src/imageSegmentationNPP/Makefile ++++ b/sdk/CUDALibraries/src/imageSegmentationNPP/Makefile +@@ -38,7 +38,7 @@ include ../../common/common_npplib.mk + # Targets + ################################################################################ + all: +- $(CXX) $(INC) $(LIB) -o imageSegmentationNPP imageSegmentationNPP.cpp -lUtilNPP_$(LIB_ARCH) -lfreeimage$(FREEIMAGELIBARCH) ++ $(CXX) $(INC) -o imageSegmentationNPP imageSegmentationNPP.cpp -lUtilNPP_$(LIB_ARCH) -lfreeimage$(FREEIMAGELIBARCH) $(LIB) + mkdir -p ../../bin + mkdir -p ../../bin/$(OSLOWER) + mkdir -p ../../bin/$(OSLOWER)/release +--- a/sdk/CUDALibraries/src/randomFog/Makefile ++++ b/sdk/CUDALibraries/src/randomFog/Makefile +@@ -45,6 +45,7 @@ CCFILES := randomFog.cpp rng.cpp + USECURAND := 1 + USEGLLIB := 1 + USEGLUT := 1 ++USERENDERCHECKGL := 1 + + ################################################################################ + # Rules and targets diff --git a/dev-util/nvidia-cuda-sdk/metadata.xml b/dev-util/nvidia-cuda-sdk/metadata.xml index 7045b9a4796e..986ba17d5545 100644 --- a/dev-util/nvidia-cuda-sdk/metadata.xml +++ b/dev-util/nvidia-cuda-sdk/metadata.xml @@ -1,21 +1,20 @@ - - spock@gentoo.org - Michał Januszewski - - - + + jlec@gentoo.org + Justin Lecher + + + Build binaries for device emulation mode. These binaries will not require a CUDA-capable GPU to run. - + Build OpenCL binaries. - + Build CUDA binaries. - + - diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-2.1.1215.2015.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-2.1.1215.2015.ebuild deleted file mode 100644 index 8a918f64df5e..000000000000 --- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-2.1.1215.2015.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-2.1.1215.2015.ebuild,v 1.8 2012/02/05 05:48:44 vapier Exp $ - -inherit eutils unpacker toolchain-funcs - -DESCRIPTION="NVIDIA CUDA Software Development Kit" -HOMEPAGE="http://developer.nvidia.com/cuda" - -SRC_URI="http://developer.download.nvidia.com/compute/cuda/2_1/SDK/cuda-sdk-linux-2.10.1215.2015-3233425.run" -LICENSE="CUDPP" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug emulation" - -RDEPEND=">=dev-util/nvidia-cuda-toolkit-2.1 - >=x11-drivers/nvidia-drivers-180.22 - media-libs/freeglut" -DEPEND="${RDEPEND} - =sys-devel/gcc-4.5 to build sucessfully." - eerror "Please use gcc-config to switch to a compatible GCC version." - die ">=sys-devel/gcc-4.4 required" - fi - echo $(gcc-major-version) $(gcc-minor-version) -} - -src_compile() { - if ! use examples; then - return - fi - local myopts="" - - if use debug; then - myopts="${myopts} dbg=1" - fi - - cd "${S}/sdk" - - if use cuda; then - cd C - emake cuda-install=/opt/cuda ${myopts} || die - cd .. - fi - - if use opencl; then - cd OpenCL - emake || die - cd .. - fi -} - -src_install() { - cd "${S}/sdk" - - if ! use doc; then - rm -rf *.txt doc */doc */Samples.htm */releaseNotesData - fi - - if ! use examples; then - rm -rf bin */bin */tools - fi - - for f in $(find .); do - local t="$(dirname ${f})" - if [[ "${t/obj\/}" != "${t}" || "${t##*.}" == "a" ]]; then - continue - fi - - if [[ ! -d "${f}" ]]; then - if [[ -x "${f}" ]]; then - exeinto "/opt/cuda/sdk/${t}" - doexe "${f}" - else - insinto "/opt/cuda/sdk/${t}" - doins "${f}" - fi - fi - done -} diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.9-r1.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.9-r1.ebuild new file mode 100644 index 000000000000..92b99478c86c --- /dev/null +++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.9-r1.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-4.2.9-r1.ebuild,v 1.1 2013/01/14 10:19:19 jlec Exp $ + +EAPI=4 + +inherit cuda eutils toolchain-funcs unpacker versionator + +MYD=$(get_version_component_range 1)_$(get_version_component_range 2) +DESCRIPTION="NVIDIA CUDA Software Development Kit" +HOMEPAGE="http://developer.nvidia.com/cuda" +SRC_URI="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel/sdk/gpucomputingsdk_${PV}_linux.run" + +LICENSE="CUDPP" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="debug +doc +examples opencl +cuda" + +RDEPEND=" + >=dev-util/nvidia-cuda-toolkit-${PV} + media-libs/freeglut + examples? ( + >=x11-drivers/nvidia-drivers-296 + media-libs/glew + )" +DEPEND="${RDEPEND}" + +S=${WORKDIR} + +pkg_setup() { + if use cuda || use opencl; then + cuda_pkg_setup + fi +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-asneeded.patch + sed \ + -e 's:-O2::g' \ + -e 's:-O3::g' \ + -e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \ + -e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \ + -e "/LINKFLAGS/s:=:= ${LDFLAGS} :g" \ + -e "/CC/s:gcc:$(tc-getCC):g" \ + -e "/CXX/s:g++:$(tc-getCXX):g" \ + -e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \ + -e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \ + -e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \ + -e 's:-Wimplicit::g' \ + -e 's:GLEW_x86_64:GLEW:g' \ + -i $(find sdk -type f -name "*.mk") || die + + find sdk/shared/inc/GL -delete || die + find sdk -type f -name "*\.a" -delete || die +} + +src_compile() { + use examples || return + local myopts verbose="verbose=1" + use debug && myopts+=" dbg=1" + cd sdk + use cuda && emake -C C cuda-install="${EPREFIX}/opt/cuda" ${myopts} ${verbose} + use opencl && emake -C OpenCL ${verbose} +} + +src_install() { + local i j f t crap="" + cd sdk + if use doc; then + ebegin "Installing docs ..." + for i in *; do + if [[ -d ${i} ]]; then + for j in doc releaseNotesData; do + docinto ${i} + [[ -d ${i}/${j} ]] && dodoc -r ${i}/${j} + done + fi + done + dodoc -r doc + dohtml {.,*}/*htm* + eend + fi + + crap+=" *.txt doc */doc */Samples.htm* */releaseNotesData" + + if ! use examples; then + crap+=" */bin */tools" + fi + + ebegin "Cleaning before installation..." + find ${crap} -delete || die + find . \( -name Makefile -o -name "*.mk" \) -delete || die + eend + + ebegin "Moving files..." + for f in $(find .); do + local t="$(dirname ${f})" + if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then + continue + fi + if [[ ! -d ${f} ]]; then + if [[ -x ${f} ]]; then + exeinto /opt/cuda/sdk/${t} + doexe ${f} + else + insinto /opt/cuda/sdk/${t} + doins ${f} + fi + fi + done + eend +} diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-5.0.35.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-5.0.35.ebuild new file mode 100644 index 000000000000..52388d60de1f --- /dev/null +++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-5.0.35.ebuild @@ -0,0 +1,136 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-5.0.35.ebuild,v 1.1 2013/01/14 10:19:19 jlec Exp $ + +EAPI=4 + +inherit cuda eutils flag-o-matic toolchain-funcs unpacker versionator + +MYD=$(get_version_component_range 1)_$(get_version_component_range 2) +DISTRO=fedora16-1 + +DESCRIPTION="NVIDIA CUDA Software Development Kit" +HOMEPAGE="http://developer.nvidia.com/cuda" +CURI="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel-update-1/installers/" +SRC_URI=" + http://dev.gentoo.org/~jlec/distfiles/${P}-asneeded.patch.xz + amd64? ( ${CURI}/cuda_${PV}_linux_64_${DISTRO}.run ) + x86? ( ${CURI}/cuda_${PV}_linux_32_${DISTRO}.run )" + +LICENSE="CUDPP" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="debug +doc +examples opencl +cuda" + +RDEPEND=" + >=dev-util/nvidia-cuda-toolkit-${PV} + media-libs/freeglut + examples? ( + media-libs/freeimage + media-libs/glew + >=x11-drivers/nvidia-drivers-304.54 + )" +DEPEND="${RDEPEND}" + +S=${WORKDIR}/sdk + +# nvcc doesn't support LDFLAGS +QA_FLAGS_IGNORED=( + opt/cuda/sdk/0_Simple/simpleMPI/simpleMPI + opt/cuda/sdk/0_Simple/cdpSimplePrint/cdpSimplePrint + opt/cuda/sdk/0_Simple/cdpSimpleQuicksort/cdpSimpleQuicksort + opt/cuda/sdk/6_Advanced/cdpAdvancedQuicksort/cdpAdvancedQuicksort + opt/cuda/sdk/6_Advanced/cdpLUDecomposition/cdpLUDecomposition + opt/cuda/sdk/6_Advanced/cdpQuadtree/cdpQuadtree + opt/cuda/sdk/bin/linux/release/cdpLUDecomposition + opt/cuda/sdk/bin/linux/release/cdpSimpleQuicksort + opt/cuda/sdk/bin/linux/release/simpleMPI + opt/cuda/sdk/bin/linux/release/cdpAdvancedQuicksort + opt/cuda/sdk/bin/linux/release/cdpQuadtree + opt/cuda/sdk/bin/linux/release/cdpSimplePrint + ) + +src_unpack() { + unpacker + unpacker run_files/cuda-samples*run +} + +pkg_setup() { + if use cuda || use opencl; then + cuda_pkg_setup + fi +} + +src_prepare() { + epatch "${WORKDIR}"/${P}-asneeded.patch + sed \ + -e 's:-O2::g' \ + -e 's:-O3::g' \ + -e "/LINK/s:gcc:$(tc-getCC) ${LDFLAGS}:g" \ + -e "/LINK/s:g++:$(tc-getCXX) ${LDFLAGS}:g" \ + -e "/LINKFLAGS/s:=:= ${LDFLAGS} :g" \ + -e "/CC/s:gcc:$(tc-getCC):g" \ + -e "/GCC/s:g++:$(tc-getCXX):g" \ + -e "/NVCCFLAGS/s|\(:=\)|\1 ${NVCCFLAGS} |g" \ + -e "/ CFLAGS/s|\(:=\)|\1 ${CFLAGS}|g" \ + -e "/ CXXFLAGS/s|\(:=\)|\1 ${CXXFLAGS}|g" \ + -e 's:-Wimplicit::g' \ + -e "s|../../common/lib/linux/\$(OS_ARCH)/libGLEW.a|$(pkg-config --libs glew)|g" \ + -e "s|../../common/lib/\$(OSLOWER)/libGLEW.a|$(pkg-config --libs glew)|g" \ + -e "s|../../common/lib/\$(OSLOWER)/\$(OS_ARCH)/libGLEW.a|$(pkg-config --libs glew)|g" \ + -i $(find . -type f -name "Makefile") || die + + export RAWLDFLAGS="$(raw-ldflags)" + + find common/inc/GL -delete || die + find . -type f -name "*\.a" -delete || die +} + +src_compile() { + use examples || return + local myopts verbose="verbose=1" + use debug && myopts+=" dbg=1" + emake \ + cuda-install="${EPREFIX}/opt/cuda" \ + CUDA_PATH="${EPREFIX}/opt/cuda/" \ + ${myopts} ${verbose} +} + +src_install() { + local i j f t crap="" + if use doc; then + ebegin "Installing docs ..." + dodoc -r doc releaseNotesData + dohtml *htm* + eend + fi + + crap+=" *.txt doc Samples.htm* releaseNotesData" + + if ! use examples; then + crap+=" */bin */tools" + fi + + ebegin "Cleaning before installation..." + find ${crap} -delete || die + find . \( -name Makefile -o -name "*.mk" \) -delete || die + eend + + ebegin "Moving files..." + for f in $(find .); do + local t="$(dirname ${f})" + if [[ ${t/obj\/} != ${t} || ${t##*.} == a ]]; then + continue + fi + if [[ ! -d ${f} ]]; then + if [[ -x ${f} ]]; then + exeinto /opt/cuda/sdk/${t} + doexe ${f} + else + insinto /opt/cuda/sdk/${t} + doins ${f} + fi + fi + done + eend +} diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest index db0983c2cc31..830ce1eebcec 100644 --- a/dev-util/nvidia-cuda-toolkit/Manifest +++ b/dev-util/nvidia-cuda-toolkit/Manifest @@ -1,5 +1,5 @@ -DIST cudatoolkit_3.2.16_linux_32_ubuntu10.04.run 88078059 SHA256 7be5e8d81fae0acaa5fd711ce623ab709f5ed44654319487f169a7d0997ab184 -DIST cudatoolkit_3.2.16_linux_64_ubuntu10.04.run 114204677 SHA256 20e9d40f5cb94f7fb42920008746eaa32afb126790c3e22c742a1435ba389cf8 +DIST cuda_5.0.35_linux_32_fedora16-1.run 583244929 SHA256 11927b4c0fb23dbf98457b852914b8458ef41cc1b7ea67bce892f2cc6a77d34e SHA512 d1cda0d53fdc86ac6412c5c92a16efd761d3f15f08878e1aa1c17bdf3bad824a0cebb5c211ad89b8dd15a439eddd0f93efe82ed0850dc93adcd3dab529f6daca WHIRLPOOL 11bc905a4a63171009569d6655b40f0d49034f71c0a93a83e1b656e91a4250c813e0a16fdfda87e9fbe4d250a312beb0c9ad073bfb0420fb4e06fdd26faf3cc9 +DIST cuda_5.0.35_linux_64_fedora16-1.run 701310481 SHA256 c2889c779215eea1c3cc6d4b092eb4208b7e1063704b6e5e8d48d04e961c3c0a SHA512 83903587d1715dd3a64db6bd676c0586edb81495da1bec22aac9995de31ca0b0db2460cccf4af0845befe0cee308ab019760c3c88eb351b6db0f255f7d93e546 WHIRLPOOL 33b998c66ebfa059d77eedb6b8465183f5ef4444ed5fe55f622efe6a2eeeef8e50e2cb09b0de4e61e15b5320495123ce46e1b47fc4cbbe96f3bde0ac93ff5dbc DIST cudatoolkit_4.0.17_linux_32_ubuntu10.10.run 143474501 SHA256 e578f3e800f348005785ec17fef14fbc4c77fa975153aa4a7c89530b501ca8a3 DIST cudatoolkit_4.0.17_linux_64_ubuntu10.10.run 211915750 SHA256 613eccb8402bc9f9dc9a571c9c24a5fa2ab2d9a9e249ec62fd26c4c81a9bb1c1 DIST cudatoolkit_4.1.28_linux_32_ubuntu11.04.run 198302412 SHA256 30f8d7ddabccad7f80b01bcc3beb7590bb0f4e82944f757c21e849e9e411c309 diff --git a/dev-util/nvidia-cuda-toolkit/files/cuda-config.in b/dev-util/nvidia-cuda-toolkit/files/cuda-config.in new file mode 100644 index 000000000000..ca0d1d77e107 --- /dev/null +++ b/dev-util/nvidia-cuda-toolkit/files/cuda-config.in @@ -0,0 +1,28 @@ +#!/bin/bash + +SUPPORT_GCC_VERSIONS_BY_CUDA="CUDA_SUPPORTED_GCC" + +_print_help() { + cat <<- EOF + Usage: + $(basename $0) [options] + + -s | --supported Returns by current CUDA supported gcc versions + -h | --help Shows this help + EOF +} + +case ${1} in + -s|--supported) + echo "${SUPPORT_GCC_VERSIONS_BY_CUDA}" + exit 0 + ;; + -h|--help) + _print_help + exit -1 + ;; + *) + _print_help + exit 1 + ;; +esac diff --git a/dev-util/nvidia-cuda-toolkit/metadata.xml b/dev-util/nvidia-cuda-toolkit/metadata.xml index 676cbf61007c..5e09419f5bfa 100644 --- a/dev-util/nvidia-cuda-toolkit/metadata.xml +++ b/dev-util/nvidia-cuda-toolkit/metadata.xml @@ -1,17 +1,18 @@ - - spock@gentoo.org - Michał Januszewski - - - + sci + + jlec@gentoo.org + Justin Lecher + + + Installs the NVIDIA CUDA visual profiler. - + Installs the CUDA debugger. - + Install the dev-util/eclipse-sdk plugins + - diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.2.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.2.ebuild deleted file mode 100644 index e6d79e172ea5..000000000000 --- a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.2.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-3.2.ebuild,v 1.11 2012/09/24 00:44:31 vapier Exp $ - -EAPI=2 - -inherit eutils multilib unpacker - -DESCRIPTION="NVIDIA CUDA Toolkit" -HOMEPAGE="http://developer.nvidia.com/cuda" -RESTRICT="binchecks" - -CUDA_V=${PV//_/-} -DIR_V=${CUDA_V//./_} -DIR_V=${DIR_V//beta/Beta} - -BASE_URI="http://developer.download.nvidia.com/compute/cuda/${DIR_V}_prod/toolkit" -SRC_URI="amd64? ( ${BASE_URI}/cudatoolkit_${CUDA_V}.16_linux_64_ubuntu10.04.run ) - x86? ( ${BASE_URI}/cudatoolkit_${CUDA_V}.16_linux_32_ubuntu10.04.run )" - -LICENSE="NVIDIA" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debugger doc profiler" - -RDEPEND="${DEPEND} - >=sys-devel/binutils-2.20 - >=sys-devel/gcc-4.0 - profiler? ( x86? ( - x11-libs/qt-gui:4 - x11-libs/qt-core:4 - x11-libs/qt-assistant:4 - x11-libs/qt-sql:4[sqlite] ) - media-libs/libpng:1.2 - ) - debugger? ( >=sys-libs/libtermcap-compat-2.0.8-r2 ) - !<=x11-drivers/nvidia-drivers-256.53" - -S="${WORKDIR}" - -#QA_FLAGS_IGNORED_x86="opt/cuda/.*" -#QA_FLAGS_IGNORED_amd64="opt/cuda/.*" - -src_install() { - local DEST=/opt/cuda - - into ${DEST} - dobin bin/* - dolib $(get_libdir)/* - - if ! use debugger; then - rm -f "${D}/${DEST}/bin/cuda-gdb" - fi - - chmod a-x "${D}/${DEST}/bin/nvcc.profile" - - # TODO: Manuals are missing from this release. Remove the following - # commented-out lines if they are not restored in the next releases. - # doman does not respect DESTTREE - #insinto ${DEST}/man/man1 - #doins man/man1/* - #insinto ${DEST}/man/man3 - #doins man/man3/* - #prepman ${DEST} - - insinto ${DEST}/include - doins -r include/* - - insinto ${DEST}/src - doins src/* - - if use doc ; then - insinto ${DEST}/doc - doins -r doc/* - fi - - cat > "${T}/env" << EOF -PATH=${DEST}/bin -ROOTPATH=${DEST}/bin -LDPATH=${DEST}/$(get_libdir) -MANPATH=${DEST}/man -EOF - newenvd "${T}/env" 99cuda - - if use profiler; then - local target="computeprof" - - into ${DEST}/${target} - dobin ${target}/bin/${target} - - cat > "${T}/env" << EOF -PATH=${DEST}/${target}/bin -ROOTPATH=${DEST}/${target}/bin -EOF - if use x86 ; then - dosym /usr/bin/assistant ${DEST}/${target}/bin - - insinto ${DEST}/${target}/bin - doins ${target}/bin/cudaapitrace.so - else - dobin ${target}/bin/assistant - insinto ${DEST}/${target}/bin - doins ${target}/bin/*.so* - insinto ${DEST}/${target}/bin/sqldrivers - doins ${target}/bin/sqldrivers/* - - cat >> "${T}/env" << EOF -LDPATH=${DEST}/${target}/bin -EOF - fi - - newenvd "${T}/env" 99${target} - - if use doc; then - insinto ${DEST}/${target} - doins ${target}/*.txt - insinto ${DEST}/${target}/doc - doins ${target}/doc/* - insinto ${DEST}/${target}/projects - doins ${target}/projects/* - fi - - make_desktop_entry /opt/cuda/computeprof/bin/computeprof "NVIDIA Compute Visual Profiler" - fi - - export CONF_LIBDIR_OVERRIDE="lib" - # HACK: temporary workaround until CONF_LIBDIR_OVERRIDE is respected. - export LIBDIR_amd64="lib" - - into ${DEST}/open64 - dobin open64/bin/* - libopts -m0755 - dolib open64/lib/* -} - -pkg_postinst() { - elog "If you want to natively run the code generated by this version of the" - elog "CUDA toolkit, you will need >=x11-drivers/nvidia-drivers-260.19.21." - elog "" - elog "Run '. /etc/profile' before using the CUDA toolkit. " -} diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r1.ebuild new file mode 100644 index 000000000000..713420ae4733 --- /dev/null +++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r1.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-4.2.9-r1.ebuild,v 1.1 2013/01/14 07:47:16 jlec Exp $ + +EAPI=5 + +inherit cuda unpacker + +MYD=$(get_version_component_range 1)_$(get_version_component_range 2) +DISTRO=ubuntu11.04 + +DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)" +HOMEPAGE="http://developer.nvidia.com/cuda" +CURI="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel/toolkit" +SRC_URI=" + amd64? ( ${CURI}/cudatoolkit_${PV}_linux_64_${DISTRO}.run ) + x86? ( ${CURI}/cudatoolkit_${PV}_linux_32_${DISTRO}.run )" + +SLOT="0" +LICENSE="NVIDIA" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="debugger doc eclipse profiler" + +DEPEND="" +RDEPEND="${DEPEND} + || ( + sys-devel/gcc:4.4 + sys-devel/gcc:4.5 + sys-devel/gcc:4.6 + ) + !<=x11-drivers/nvidia-drivers-270.41 + debugger? ( sys-libs/libtermcap-compat ) + profiler? ( >=virtual/jre-1.6 )" + +S="${WORKDIR}" + +QA_PREBUILT="opt/cuda/*" + +pkg_setup() { + # We don't like to run cuda_pkg_setup as it depends on us + : +} + +src_prepare() { + local cuda_supported_gcc + + cuda_supported_gcc="4.4 4.5 4.6" + + sed \ + -e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \ + "${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die + + find cuda-installer.pl install-linux.pl libnvvp/jre run_files -delete || die +} + +src_install() { + local cudadir=/opt/cuda + local ecudadir="${EPREFIX}"${cudadir} + + if use doc; then + dodoc doc/*{txt,pdf} + dohtml -r doc/html/* + fi + + find doc -delete || die + + use debugger || rm -r bin/cuda-gdb extras/Debugger + use eclipse || find libnsight -delete + + if use profiler; then + # hack found in install-linux.pl + cat > bin/nvvp <<- EOF + #!${EPREFIX}bin/sh + LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \ + UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 ${ecudadir}/libnvvp/nvvp + EOF + chmod a+x bin/nvvp + else + rm -r extras/CUPTI libnvvp + fi + + dodir ${cudadir} + mv * "${ED}"${cudadir} + + cat > "${T}"/99cuda <<- EOF + PATH=${ecudadir}/bin:${ecudadir}/libnvvp + ROOTPATH=${ecudadir}/bin + LDPATH=${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib") + EOF + doenvd "${T}"/99cuda + + dobin "${T}"/cuda-config +} + +pkg_postinst() { + local a + a="$(version_sort $(cuda-config -s))"; a=($a) + if [[ $(tc-getCC) == *gcc* ]] && \ + version_is_at_least "$(gcc-version)" ${a[1]}; then + ewarn "gcc >= ${a[1]} will not work with CUDA" + ewarn "Make sure you set an earlier version of gcc with gcc-config" + ewarn "or append --compiler-bindir= pointing to a gcc bindir like" + ewarn "${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${a[1]}" + ewarn "to the nvcc compiler flags" + fi +} diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35.ebuild new file mode 100644 index 000000000000..9b1edbc9fde2 --- /dev/null +++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-5.0.35.ebuild,v 1.1 2013/01/14 07:47:16 jlec Exp $ + +EAPI=5 + +inherit cuda unpacker + +MYD=$(get_version_component_range 1)_$(get_version_component_range 2) +DISTRO=fedora16-1 + +DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)" +HOMEPAGE="http://developer.nvidia.com/cuda" +CURI="http://developer.download.nvidia.com/compute/cuda/${MYD}/rel-update-1/installers/" +SRC_URI=" + amd64? ( ${CURI}/cuda_${PV}_linux_64_${DISTRO}.run ) + x86? ( ${CURI}/cuda_${PV}_linux_32_${DISTRO}.run )" + +SLOT="0" +LICENSE="NVIDIA" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="debugger doc eclipse profiler" + +DEPEND="" +RDEPEND="${DEPEND} + || ( + sys-devel/gcc:4.4 + sys-devel/gcc:4.5 + sys-devel/gcc:4.6 + ) + !<=x11-drivers/nvidia-drivers-270.41 + debugger? ( sys-libs/libtermcap-compat ) + profiler? ( >=virtual/jre-1.6 )" + +S="${WORKDIR}" + +QA_PREBUILT="opt/cuda/*" + +pkg_setup() { + # We don't like to run cuda_pkg_setup as it depends on us + : +} + +src_unpack() { + unpacker + unpacker run_files/cudatoolkit*run +} + +src_prepare() { + local cuda_supported_gcc + + cuda_supported_gcc="4.4 4.5 4.6" + + sed \ + -e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \ + "${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die + + find cuda-installer.pl install-linux.pl jre run_files -delete || die +} + +src_install() { + local cudadir=/opt/cuda + local ecudadir="${EPREFIX}"${cudadir} + + if use doc; then + dodoc doc/{*.txt,pdf/*} + dohtml -r doc/html/* + fi + + find doc -delete || die + + use debugger || rm -r bin/cuda-gdb extras/Debugger + use eclipse || find libnsight -delete + + if use profiler; then + # hack found in install-linux.pl + cat > bin/nvvp <<- EOF + #!${EPREFIX}bin/sh + LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \ + UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 ${ecudadir}/libnvvp/nvvp + EOF + chmod a+x bin/nvvp + else + rm -r extras/CUPTI libnvvp + fi + + dodir ${cudadir} + mv * "${ED}"${cudadir} + + cat > "${T}"/99cuda <<- EOF + PATH=${ecudadir}/bin:${ecudadir}/libnvvp + ROOTPATH=${ecudadir}/bin + LDPATH=${ecudadir}/lib$(use amd64 && echo "64:${ecudadir}/lib") + EOF + doenvd "${T}"/99cuda + + dobin "${T}"/cuda-config +} + +pkg_postinst() { + local a + a="$(version_sort $(cuda-config -s))"; a=($a) + if [[ $(tc-getCC) == *gcc* ]] && \ + version_is_at_least "$(gcc-version)" ${a[1]}; then + ewarn "gcc >= ${a[1]} will not work with CUDA" + ewarn "Make sure you set an earlier version of gcc with gcc-config" + ewarn "or append --compiler-bindir= pointing to a gcc bindir like" + ewarn "${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${a[1]}" + ewarn "to the nvcc compiler flags" + fi +} diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest index d3d5c11e333f..e4576e64de7e 100644 --- a/media-libs/jpeg/Manifest +++ b/media-libs/jpeg/Manifest @@ -1,4 +1,5 @@ DIST jpeg-6b-patches-2.tar.bz2 3703 SHA256 62d8496764330c57cc29137ee46c3cd76ce6463680f9e2e63af8bc4483439b2d SHA512 df507129c2d87e19dd524b212eae5168c72e591fec4c87bd5aa2a50ac47646ab62fcf23d3d08b5891f35c679733532c173ffe99e1e79764bfa19f73c9de742d2 WHIRLPOOL 00ec2f8ab1d5bae74ba5c92e13db6987de1c2be4ad46e19837ecd3a0e5b15c2e2a16d072bfac462c80183772c71402953a007fd4fcf1aab3af82b10fec6a30c5 DIST jpegsrc.v6b.tar.gz 613261 SHA256 75c3ec241e9996504fe02a9ed4d12f16b74ade713972f3db9e65ce95cd27e35d SHA512 5d37d3695105fc345ca269ab98cd991472e5de72f702c9a8a652a7d114a40eb99670c69a87ecb24bf64e96318fc0ee2bcb44c497d9d3d2a67378c99e4eb348fe WHIRLPOOL ab649fd5ff29dfbcdf52f337b73c65e29d577c3fd0a1c910590177d83985115c8e8e4c392e196f7a497d6346072b40053999171f0cd74ee3325e74c005c5ba9b DIST jpegsrc.v8d.tar.gz 991456 SHA256 00029b1473f0f0ea72fbca3230e8cb25797fbb27e58ae2e46bb8bf5a806fe0b3 SHA512 7a8b4cff5b1caf6a7281c5dce4e1efa1b68360bd64dd2e619b60c9e1d49f22624bc8780b681bfab073e7b1d4b7f41008a464a58f0eeeacb0a40ff996d7eb5753 WHIRLPOOL 7489605809b43cfac02230b89013075806df32246b37eb12ac05ef890ee690f85744887e296f5a21fa64012570aa298d2aa54e4469066f4c21dd40141f3bd8a8 +DIST jpegsrc.v9.tar.gz 987900 SHA256 c4e29e9375aaf60b4b79db87a58b063fb5b84f923bee97a88280b3d159e7e535 SHA512 c6a2fa316fad8230ffd137469643276f1fef52667536712eae69b24afeea283415e8182a284c0457b54c6e49d6e93cf90d7ace1f2fed129c1e7f64b51c699c29 WHIRLPOOL e8b597539e10e68e085a750580b498320b664684d475cf75221a6643287d4e210ee3758f017149a3c2f461e0d9eb625d5930ae7c02862307761e62e4e2b57231 DIST libjpeg8_8d-1.debian.tar.gz 13676 SHA256 70ec6689b0ad85739802cf3ebbdcc12ea01e21edd8f931c614b25b44cf199057 SHA512 7def4f13524f0af3b9adf35a370027a18f43b9a635f56a17d5bb7883370db8b18b8a12737d0f0cb4b0287ccf8fb474eb5f754de6b398ffe7d522c54e5bf68040 WHIRLPOOL 94526c31d401eb14c9bf0f7115e13a27886ad58863e25d6653eba2b2f5ef260ec272368d2b9d9934bd75b1e5b5f1afc97230e540248efc24d6e85e5680399d27 diff --git a/media-libs/jpeg/jpeg-9.ebuild b/media-libs/jpeg/jpeg-9.ebuild new file mode 100644 index 000000000000..fcbf145ccd70 --- /dev/null +++ b/media-libs/jpeg/jpeg-9.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-9.ebuild,v 1.1 2013/01/14 11:00:43 ssuominen Exp $ + +EAPI=5 +inherit eutils libtool toolchain-funcs + +DESCRIPTION="Library to load, handle and manipulate images in the JPEG format" +HOMEPAGE="http://jpegclub.org/ http://www.ijg.org/" +SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz + mirror://debian/pool/main/libj/lib${PN}8/lib${PN}8_8d-1.debian.tar.gz" + +LICENSE="IJG" +SLOT="0" +# Waiting for libjpeg-turbo to gain .so.9 support! +KEYWORDS="" +#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="static-libs" + +DOCS="change.log example.c README *.txt" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-7-maxmem_sysconf.patch + elibtoolize +} + +src_configure() { + # Fix building against this library on eg. Solaris and DragonFly BSD, see: + # http://mail-index.netbsd.org/pkgsrc-bugs/2010/01/18/msg035644.html + local ldverscript= + [[ ${CHOST} == *-solaris* ]] && ldverscript="--disable-ld-version-script" + + econf \ + $(use_enable static-libs static) \ + --enable-maxmem=64 \ + ${ldverscript} +} + +src_compile() { + default + + # Build exifautotran and jpegexiforient + cd ../debian/extra + emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}" +} + +src_install() { + default + prune_libtool_files + + # Install exifautotran and jpegexiforient + newdoc ../debian/changelog changelog.debian + cd ../debian/extra + emake \ + DESTDIR="${D}" prefix="${EPREFIX}"/usr \ + INSTALL="install -m755" INSTALLDIR="install -d -m755" \ + install +} + +pkg_postinst() { + ewarn "If you are switching from media-libs/libjpeg-turbo you might need to" + ewarn "rebuild reverse dependencies:" + ewarn + ewarn "# emerge gentoolkit" + ewarn "# revdep-rebuild --library libjpeg.so.8" +} diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk index f7eb41cda23f..d2628ec8ba59 100644 --- a/metadata/dtd/timestamp.chk +++ b/metadata/dtd/timestamp.chk @@ -1 +1 @@ -Mon, 14 Jan 2013 05:06:51 +0000 +Mon, 14 Jan 2013 11:06:52 +0000 diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk index f7eb41cda23f..d2628ec8ba59 100644 --- a/metadata/glsa/timestamp.chk +++ b/metadata/glsa/timestamp.chk @@ -1 +1 @@ -Mon, 14 Jan 2013 05:06:51 +0000 +Mon, 14 Jan 2013 11:06:52 +0000 diff --git a/metadata/md5-cache/app-forensics/libewf-20121209-r1 b/metadata/md5-cache/app-forensics/libewf-20121209-r1 new file mode 100644 index 000000000000..8e48fc73804f --- /dev/null +++ b/metadata/md5-cache/app-forensics/libewf-20121209-r1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=sys-libs/zlib fuse? ( sys-fs/fuse ) uuid? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl ) +DESCRIPTION=Implementation of the EWF (SMART and EnCase) image format +EAPI=5 +HOMEPAGE=http://libewf.sourceforge.net +IUSE=debug ewf +fuse rawio +ssl static-libs +uuid unicode +KEYWORDS=~amd64 ~hppa ~ppc ~x86 +LICENSE=BSD +RDEPEND=sys-libs/zlib fuse? ( sys-fs/fuse ) uuid? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl ) +SLOT=0 +SRC_URI=mirror://sourceforge/libewf/libewf-20121209.tar.gz +_eclasses_=autotools 5116b10b2150724f41b564f1cc863e47 autotools-utils f4dc5b0e643575b9bd31a2bd7deeee31 eutils d40dc948067bd3db1c8ebf7d51897313 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 +_md5_=0c172d074d8debd5a75350fb6a4b670b diff --git a/metadata/md5-cache/app-forensics/libewf-20130105 b/metadata/md5-cache/app-forensics/libewf-20130105 new file mode 100644 index 000000000000..21864e9ead22 --- /dev/null +++ b/metadata/md5-cache/app-forensics/libewf-20130105 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=sys-libs/zlib fuse? ( sys-fs/fuse ) uuid? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl ) +DESCRIPTION=Implementation of the EWF (SMART and EnCase) image format +EAPI=5 +HOMEPAGE=http://code.google.com/p/libewf/ +IUSE=debug ewf +fuse rawio +ssl static-libs +uuid unicode +KEYWORDS=~amd64 ~hppa ~ppc ~x86 +LICENSE=BSD +RDEPEND=sys-libs/zlib fuse? ( sys-fs/fuse ) uuid? ( sys-apps/util-linux ) ssl? ( dev-libs/openssl ) +SLOT=0 +SRC_URI=http://libewf.googlecode.com/files/libewf-20130105.tar.gz +_eclasses_=autotools 5116b10b2150724f41b564f1cc863e47 autotools-utils f4dc5b0e643575b9bd31a2bd7deeee31 eutils d40dc948067bd3db1c8ebf7d51897313 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 +_md5_=bb34599f4567da1a30984f0c0a86ee71 diff --git a/metadata/md5-cache/app-misc/boxes-1.1.1 b/metadata/md5-cache/app-misc/boxes-1.1.1 new file mode 100644 index 000000000000..c58628142988 --- /dev/null +++ b/metadata/md5-cache/app-misc/boxes-1.1.1 @@ -0,0 +1,10 @@ +DEFINED_PHASES=compile install prepare +DESCRIPTION=Draw any kind of boxes around your text +EAPI=5 +HOMEPAGE=http://boxes.thomasjensen.com/ +KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 +LICENSE=GPL-2 +SLOT=0 +SRC_URI=http://boxes.thomasjensen.com/download/boxes-1.1.1.src.tar.gz +_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 +_md5_=da3699e193c401573191cb43b5f34430 diff --git a/metadata/md5-cache/app-misc/gcal-3.6.2 b/metadata/md5-cache/app-misc/gcal-3.6.2 new file mode 100644 index 000000000000..2258492f68f8 --- /dev/null +++ b/metadata/md5-cache/app-misc/gcal-3.6.2 @@ -0,0 +1,13 @@ +DEFINED_PHASES=configure +DEPEND=app-arch/xz-utils nls? ( >=sys-devel/gettext-0.17 ) +DESCRIPTION=The GNU Calendar - a replacement for cal +EAPI=5 +HOMEPAGE=http://www.gnu.org/software/gcal/ +IUSE=ncurses nls unicode +KEYWORDS=~amd64 ~arm ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos +LICENSE=GPL-3 +RDEPEND=nls? ( virtual/libintl ) +SLOT=0 +SRC_URI=mirror://gnu/gcal/gcal-3.6.2.tar.xz +_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 +_md5_=5c9d1699bd610f2479eb5fa42a1bac28 diff --git a/metadata/md5-cache/app-misc/realpath-1.18 b/metadata/md5-cache/app-misc/realpath-1.18 new file mode 100644 index 000000000000..5e1fa76a9d81 --- /dev/null +++ b/metadata/md5-cache/app-misc/realpath-1.18 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile install prepare unpack +DEPEND=!sys-freebsd/freebsd-bin nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) x86-interix? ( dev-libs/gnulib ) elibc_mintlib? ( virtual/libiconv ) +DESCRIPTION=Return the canonicalized absolute pathname +EAPI=5 +HOMEPAGE=http://packages.debian.org/unstable/utils/realpath +IUSE=nls +KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris +LICENSE=GPL-2 +RDEPEND=!sys-freebsd/freebsd-bin nls? ( virtual/libintl ) +SLOT=0 +SRC_URI=mirror://debian/pool/main/r/realpath/realpath_1.18.tar.gz nls? ( mirror://debian/pool/main/r/realpath/realpath_1.18_i386.deb ) +_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 9aa8a023e062fca0ba79362d9d0cc488 prefix 21058c21ca48453d771df15500873ede toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 +_md5_=685c04c691e69919513884ee020f0a9a diff --git a/metadata/md5-cache/app-text/multitail-5.2.11 b/metadata/md5-cache/app-text/multitail-5.2.11 new file mode 100644 index 000000000000..785bab38717a --- /dev/null +++ b/metadata/md5-cache/app-text/multitail-5.2.11 @@ -0,0 +1,13 @@ +DEFINED_PHASES=configure install prepare +DEPEND=sys-libs/ncurses +DESCRIPTION=Tail with multiple windows +EAPI=5 +HOMEPAGE=http://www.vanheusden.com/multitail/index.html +IUSE=debug doc examples +KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux +LICENSE=GPL-2 +RDEPEND=sys-libs/ncurses +SLOT=0 +SRC_URI=http://www.vanheusden.com/multitail/multitail-5.2.11.tgz +_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 +_md5_=d31c817520698f5164d4fe3448fe2d96 diff --git a/metadata/md5-cache/dev-java/oracle-jdk-bin-1.7.0.11 b/metadata/md5-cache/dev-java/oracle-jdk-bin-1.7.0.11 new file mode 100644 index 000000000000..b60e7562c8f6 --- /dev/null +++ b/metadata/md5-cache/dev-java/oracle-jdk-bin-1.7.0.11 @@ -0,0 +1,14 @@ +DEFINED_PHASES=compile install nofetch postinst postrm prepare prerm setup +DEPEND=jce? ( app-arch/unzip ) examples? ( kernel_linux? ( app-arch/unzip ) ) pax_kernel? ( sys-apps/paxctl ) =dev-java/java-config-2* || ( app-admin/eselect-java =virtual/jdk-1.4 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) X? ( x11-proto/xproto ) java? ( test? ( =dev-java/junit-3.8* ) ) java? ( >=dev-java/java-config-2.1.9-r1 ) +DESCRIPTION=free, small, and standard compliant Prolog compiler +EAPI=4 +HOMEPAGE=http://www.swi-prolog.org/ +IUSE=archive debug doc gmp hardened java minimal odbc readline ssl static-libs test zlib X elibc_FreeBSD java +KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos +LICENSE=LGPL-2.1 +RDEPEND=sys-libs/ncurses archive? ( app-arch/libarchive ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.1.9-r1 ) +SLOT=0 +SRC_URI=http://www.swi-prolog.org/download/stable/src/pl-6.2.6.tar.gz mirror://gentoo/swi-prolog-6.2.6-gentoo-patchset-0.tar.gz +_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de java-pkg-opt-2 f9bbbe5092225a2059aa9e6a3a2b52f1 java-utils-2 2d9eb3508fa5d6759e39354b74545567 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_md5_=d3f75792be4b508305a389892527eb3c diff --git a/metadata/md5-cache/dev-libs/dbus-glib-0.100-r2 b/metadata/md5-cache/dev-libs/dbus-glib-0.100-r2 index 6e611eaafcfb..a041c2c43f21 100644 --- a/metadata/md5-cache/dev-libs/dbus-glib-0.100-r2 +++ b/metadata/md5-cache/dev-libs/dbus-glib-0.100-r2 @@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/expat-2 >=dev-libs/glib-2.26 >=sys-apps/dbus-1.6.2 SLOT=0 SRC_URI=http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.100.tar.gz _eclasses_=bash-completion-r1 fcc2dafb65a2b662dd4b076f2103f6a6 eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=f65216b002006725b85e9c54fcff52da +_md5_=84831cfc9d08be030ef49c7135a31063 diff --git a/metadata/md5-cache/dev-libs/libzip-0.10.1-r1 b/metadata/md5-cache/dev-libs/libzip-0.10.1-r1 index a752b7a023a0..2c4445f87366 100644 --- a/metadata/md5-cache/dev-libs/libzip-0.10.1-r1 +++ b/metadata/md5-cache/dev-libs/libzip-0.10.1-r1 @@ -4,10 +4,10 @@ DESCRIPTION=Library for manipulating zip archives EAPI=4 HOMEPAGE=http://www.nih.at/libzip/ IUSE=static-libs -KEYWORDS=~alpha amd64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos +KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos LICENSE=BSD RDEPEND=sys-libs/zlib SLOT=0 SRC_URI=http://www.nih.at/libzip/libzip-0.10.1.tar.gz _eclasses_=autotools 5116b10b2150724f41b564f1cc863e47 autotools-utils f4dc5b0e643575b9bd31a2bd7deeee31 eutils d40dc948067bd3db1c8ebf7d51897313 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=ef084d338295c1e867052abb52db6b8f +_md5_=b79ac5457e7cbfc567290b93d2da7fbb diff --git a/metadata/md5-cache/dev-perl/FLV-AudioExtractor-0.010.0 b/metadata/md5-cache/dev-perl/FLV-AudioExtractor-0.010.0 index d0e1d89387ee..56028e4242c8 100644 --- a/metadata/md5-cache/dev-perl/FLV-AudioExtractor-0.010.0 +++ b/metadata/md5-cache/dev-perl/FLV-AudioExtractor-0.010.0 @@ -3,10 +3,10 @@ DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl[-build] DESCRIPTION=Extract audio from Flash Videos EAPI=5 HOMEPAGE=http://search.cpan.org/dist/FLV-AudioExtractor/ -KEYWORDS=~amd64 ~x86 +KEYWORDS=amd64 ~x86 LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 ) RDEPEND=dev-perl/Moose dev-lang/perl[-build] SLOT=0 SRC_URI=mirror://cpan/authors/id/F/FV/FVOX/FLV-AudioExtractor-0.01.tar.gz _eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 perl-module 825d3d7654c88c5c4dec7400d3612578 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=5aad09450c37feeb2b44cb7d47f7e35b +_md5_=36a0ddf69f060daf1d50738ce1352cf1 diff --git a/metadata/md5-cache/dev-python/django-evolution-0.6.7-r1 b/metadata/md5-cache/dev-python/django-evolution-0.6.7-r1 index 981c92e7932c..53e39d1c54ee 100644 --- a/metadata/md5-cache/dev-python/django-evolution-0.6.7-r1 +++ b/metadata/md5-cache/dev-python/django-evolution-0.6.7-r1 @@ -10,4 +10,4 @@ RDEPEND=dev-python/setuptools[python_targets_python2_5?,python_targets_python2_6 SLOT=0 SRC_URI=mirror://pypi/d/django_evolution/django_evolution-0.6.7.tar.gz _eclasses_=distutils-r1 ddac14029e0508e83c9cb6ddf6ac30fa eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python-r1 b9091432451f035281bf6fc17720e820 python-utils-r1 069a968fde0ceb8a9cd5c6a89d77cbc2 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=4af7c761314d15b47c157b31f8871533 +_md5_=eeb875e04502816ede1ead3b31fd3c0d diff --git a/metadata/md5-cache/dev-tex/metapost-1.780 b/metadata/md5-cache/dev-tex/metapost-1.780 new file mode 100644 index 000000000000..8ed2d397b1d6 --- /dev/null +++ b/metadata/md5-cache/dev-tex/metapost-1.780 @@ -0,0 +1,11 @@ +DEFINED_PHASES=compile configure install postinst +DEPEND=dev-libs/kpathsea >=app-admin/eselect-mpost-0.3 x11-libs/cairo x11-libs/pixman media-libs/libpng virtual/pkgconfig +DESCRIPTION=System for producing graphics +EAPI=4 +HOMEPAGE=http://tug.org/metapost.html +KEYWORDS=~amd64 +LICENSE=GPL-2 LGPL-3 +RDEPEND=dev-libs/kpathsea >=app-admin/eselect-mpost-0.3 x11-libs/cairo x11-libs/pixman media-libs/libpng +SLOT=0 +SRC_URI=http://foundry.supelec.fr/gf/download/frsrelease/395/1879/metapost-1.780-src.tar.bz2 +_md5_=a113d0bb482580ec80934f6a0e8d308a diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-2.1.1215.2015 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-2.1.1215.2015 deleted file mode 100644 index 9a84cf872ed5..000000000000 --- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-2.1.1215.2015 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile install setup unpack -DEPEND=>=dev-util/nvidia-cuda-toolkit-2.1 >=x11-drivers/nvidia-drivers-180.22 media-libs/freeglut =dev-util/nvidia-cuda-toolkit-2.1 >=x11-drivers/nvidia-drivers-180.22 media-libs/freeglut -RESTRICT=binchecks -SLOT=0 -SRC_URI=http://developer.download.nvidia.com/compute/cuda/2_1/SDK/cuda-sdk-linux-2.10.1215.2015-3233425.run -_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e unpacker 50e1227854e96469a19a63f053496328 user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=35bc8f2d63b9d63fc3b7f737bdf1c187 diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-2.2 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-2.2 deleted file mode 100644 index aa60ffcd2033..000000000000 --- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-2.2 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile install setup unpack -DEPEND=>=dev-util/nvidia-cuda-toolkit-2.2 >=x11-drivers/nvidia-drivers-180.22 media-libs/freeglut =dev-util/nvidia-cuda-toolkit-2.2 >=x11-drivers/nvidia-drivers-180.22 media-libs/freeglut -RESTRICT=binchecks -SLOT=0 -SRC_URI=http://developer.download.nvidia.com/compute/cuda/2_2/sdk/cudasdk_2.2_linux.run -_eclasses_=multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e unpacker 50e1227854e96469a19a63f053496328 -_md5_=efe3e0e54ff355681a71e4c523abeaad diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-2.3 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-2.3 deleted file mode 100644 index 2745afbabe8d..000000000000 --- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-2.3 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile install prepare setup unpack -DEPEND=>=dev-util/nvidia-cuda-toolkit-2.3 examples? ( !emulation? ( >=x11-drivers/nvidia-drivers-190.18 ) ) media-libs/freeglut =dev-util/nvidia-cuda-toolkit-2.3 examples? ( !emulation? ( >=x11-drivers/nvidia-drivers-190.18 ) ) media-libs/freeglut -RESTRICT=binchecks -SLOT=0 -SRC_URI=http://developer.download.nvidia.com/compute/cuda/2_3/sdk/cudasdk_2.3_linux.run -_eclasses_=multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e unpacker 50e1227854e96469a19a63f053496328 -_md5_=321aede1cdfd01a44522d2fe0a11850f diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-3.0 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-3.0 deleted file mode 100644 index 08fd9a6d978e..000000000000 --- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-3.0 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile install setup unpack -DEPEND=>=dev-util/nvidia-cuda-toolkit-3.0_beta1 examples? ( !emulation? ( >=x11-drivers/nvidia-drivers-195.30 ) ) media-libs/freeglut =dev-util/nvidia-cuda-toolkit-3.0_beta1 examples? ( !emulation? ( >=x11-drivers/nvidia-drivers-195.30 ) ) media-libs/freeglut -RESTRICT=binchecks -SLOT=0 -SRC_URI=http://developer.download.nvidia.com/compute/cuda/3_0/sdk/gpucomputingsdk_3.0_linux.run -_eclasses_=multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e unpacker 50e1227854e96469a19a63f053496328 -_md5_=03b464bd94753574d4839e963e180b7b diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-3.0_beta1 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-3.0_beta1 deleted file mode 100644 index 772fa047f3a1..000000000000 --- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-3.0_beta1 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile install setup unpack -DEPEND=>=dev-util/nvidia-cuda-toolkit-3.0_beta1 examples? ( !emulation? ( >=x11-drivers/nvidia-drivers-195.30 ) ) media-libs/freeglut =dev-util/nvidia-cuda-toolkit-3.0_beta1 examples? ( !emulation? ( >=x11-drivers/nvidia-drivers-195.30 ) ) media-libs/freeglut -RESTRICT=binchecks -SLOT=0 -SRC_URI=http://developer.download.nvidia.com/compute/cuda/3_0-Beta1/sdk/gpucomputingsdk_3.0-beta1_linux.run -_eclasses_=multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e unpacker 50e1227854e96469a19a63f053496328 -_md5_=b2b340f096a74da7c11b7850b115d226 diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-3.1 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-3.1 deleted file mode 100644 index 3285edf6759c..000000000000 --- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-3.1 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile install unpack -DEPEND=>=dev-util/nvidia-cuda-toolkit-3.1 examples? ( >=x11-drivers/nvidia-drivers-256.35 ) media-libs/freeglut -DESCRIPTION=NVIDIA CUDA Software Development Kit -EAPI=2 -HOMEPAGE=http://developer.nvidia.com/cuda -IUSE=debug +doc +examples opencl +cuda -KEYWORDS=~amd64 ~x86 -LICENSE=CUDPP -RDEPEND=>=dev-util/nvidia-cuda-toolkit-3.1 examples? ( >=x11-drivers/nvidia-drivers-256.35 ) media-libs/freeglut -RESTRICT=binchecks -SLOT=0 -SRC_URI=http://developer.download.nvidia.com/compute/cuda/3_1/sdk/gpucomputingsdk_3.1_linux.run -_eclasses_=multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e unpacker 50e1227854e96469a19a63f053496328 -_md5_=65ea158df320b9a819936fa4967a6494 diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-3.2 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-3.2 deleted file mode 100644 index dfed8bf7407a..000000000000 --- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-3.2 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile install setup unpack -DEPEND=>=dev-util/nvidia-cuda-toolkit-3.2 examples? ( >=x11-drivers/nvidia-drivers-260.19.21 ) media-libs/freeglut -DESCRIPTION=NVIDIA CUDA Software Development Kit -EAPI=2 -HOMEPAGE=http://developer.nvidia.com/cuda -IUSE=debug +doc +examples opencl +cuda -KEYWORDS=~amd64 ~x86 -LICENSE=CUDPP -RDEPEND=>=dev-util/nvidia-cuda-toolkit-3.2 examples? ( >=x11-drivers/nvidia-drivers-260.19.21 ) media-libs/freeglut -RESTRICT=binchecks -SLOT=0 -SRC_URI=http://developer.download.nvidia.com/compute/cuda/3_2_prod/sdk/gpucomputingsdk_3.2.16_linux.run -_eclasses_=multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e unpacker 50e1227854e96469a19a63f053496328 -_md5_=c5022d6878ce1d4133131a4ea3a12ea3 diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-4.0 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-4.0 deleted file mode 100644 index 859070a66841..000000000000 --- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-4.0 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile install setup unpack -DEPEND=>=dev-util/nvidia-cuda-toolkit-4.0 examples? ( >=x11-drivers/nvidia-drivers-260.19.21 ) media-libs/freeglut -DESCRIPTION=NVIDIA CUDA Software Development Kit -EAPI=2 -HOMEPAGE=http://developer.nvidia.com/cuda -IUSE=debug +doc +examples opencl +cuda -KEYWORDS=~amd64 ~x86 -LICENSE=CUDPP -RDEPEND=>=dev-util/nvidia-cuda-toolkit-4.0 examples? ( >=x11-drivers/nvidia-drivers-260.19.21 ) media-libs/freeglut -RESTRICT=binchecks -SLOT=0 -SRC_URI=http://developer.download.nvidia.com/compute/cuda/4_0/sdk/gpucomputingsdk_4.0.17_linux.run -_eclasses_=multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e unpacker 50e1227854e96469a19a63f053496328 -_md5_=60f01a17b914c1b77150904f721f19d2 diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-4.1 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-4.1 deleted file mode 100644 index 7dc76cf7f60c..000000000000 --- a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-4.1 +++ /dev/null @@ -1,14 +0,0 @@ -DEFINED_PHASES=compile install setup unpack -DEPEND=>=dev-util/nvidia-cuda-toolkit-4.1 examples? ( >=x11-drivers/nvidia-drivers-260.19.21 ) media-libs/freeglut -DESCRIPTION=NVIDIA CUDA Software Development Kit -EAPI=2 -HOMEPAGE=http://developer.nvidia.com/cuda -IUSE=debug +doc +examples opencl +cuda -KEYWORDS=~amd64 ~x86 -LICENSE=CUDPP -RDEPEND=>=dev-util/nvidia-cuda-toolkit-4.1 examples? ( >=x11-drivers/nvidia-drivers-260.19.21 ) media-libs/freeglut -RESTRICT=binchecks -SLOT=0 -SRC_URI=http://developer.download.nvidia.com/compute/cuda/4_1/rel/sdk/gpucomputingsdk_4.1.28_linux.run -_eclasses_=multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e unpacker 50e1227854e96469a19a63f053496328 -_md5_=fd79707753deb2a6225380290bea0b54 diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-4.2.9-r1 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-4.2.9-r1 new file mode 100644 index 000000000000..86fe4e78b887 --- /dev/null +++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-4.2.9-r1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile install prepare setup unpack +DEPEND=>=dev-util/nvidia-cuda-toolkit-4.2.9 media-libs/freeglut examples? ( >=x11-drivers/nvidia-drivers-296 media-libs/glew ) +DESCRIPTION=NVIDIA CUDA Software Development Kit +EAPI=4 +HOMEPAGE=http://developer.nvidia.com/cuda +IUSE=debug +doc +examples opencl +cuda +KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux +LICENSE=CUDPP +RDEPEND=>=dev-util/nvidia-cuda-toolkit-4.2.9 media-libs/freeglut examples? ( >=x11-drivers/nvidia-drivers-296 media-libs/glew ) +SLOT=0 +SRC_URI=http://developer.download.nvidia.com/compute/cuda/4_2/rel/sdk/gpucomputingsdk_4.2.9_linux.run +_eclasses_=cuda c61985801c2bd258ba06cd958995c2ff eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e unpacker 50e1227854e96469a19a63f053496328 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_md5_=a6ea79e127b4eb05ba0128261e4305b3 diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-sdk-5.0.35 b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-5.0.35 new file mode 100644 index 000000000000..1ff48297541a --- /dev/null +++ b/metadata/md5-cache/dev-util/nvidia-cuda-sdk-5.0.35 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile install prepare setup unpack +DEPEND=>=dev-util/nvidia-cuda-toolkit-5.0.35 media-libs/freeglut examples? ( media-libs/freeimage media-libs/glew >=x11-drivers/nvidia-drivers-304.54 ) +DESCRIPTION=NVIDIA CUDA Software Development Kit +EAPI=4 +HOMEPAGE=http://developer.nvidia.com/cuda +IUSE=debug +doc +examples opencl +cuda +KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux +LICENSE=CUDPP +RDEPEND=>=dev-util/nvidia-cuda-toolkit-5.0.35 media-libs/freeglut examples? ( media-libs/freeimage media-libs/glew >=x11-drivers/nvidia-drivers-304.54 ) +SLOT=0 +SRC_URI=http://dev.gentoo.org/~jlec/distfiles/nvidia-cuda-sdk-5.0.35-asneeded.patch.xz amd64? ( http://developer.download.nvidia.com/compute/cuda/5_0/rel-update-1/installers//cuda_5.0.35_linux_64_fedora16-1.run ) x86? ( http://developer.download.nvidia.com/compute/cuda/5_0/rel-update-1/installers//cuda_5.0.35_linux_32_fedora16-1.run ) +_eclasses_=cuda c61985801c2bd258ba06cd958995c2ff eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e unpacker 50e1227854e96469a19a63f053496328 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_md5_=9b46026e5dbd6f669aa465618346426d diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-3.2 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-3.2 deleted file mode 100644 index 54d34c1e97f2..000000000000 --- a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-3.2 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=install postinst unpack -DESCRIPTION=NVIDIA CUDA Toolkit -EAPI=2 -HOMEPAGE=http://developer.nvidia.com/cuda -IUSE=debugger doc profiler -KEYWORDS=~amd64 ~x86 -LICENSE=NVIDIA -RDEPEND=>=sys-devel/binutils-2.20 >=sys-devel/gcc-4.0 profiler? ( x86? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/qt-assistant:4 x11-libs/qt-sql:4[sqlite] ) media-libs/libpng:1.2 ) debugger? ( >=sys-libs/libtermcap-compat-2.0.8-r2 ) !<=x11-drivers/nvidia-drivers-256.53 -RESTRICT=binchecks -SLOT=0 -SRC_URI=amd64? ( http://developer.download.nvidia.com/compute/cuda/3_2_prod/toolkit/cudatoolkit_3.2.16_linux_64_ubuntu10.04.run ) x86? ( http://developer.download.nvidia.com/compute/cuda/3_2_prod/toolkit/cudatoolkit_3.2.16_linux_32_ubuntu10.04.run ) -_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e unpacker 50e1227854e96469a19a63f053496328 user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=5a28cd303bcb1353db6a784ff38a331b diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-4.2.9-r1 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-4.2.9-r1 new file mode 100644 index 000000000000..d66775b68698 --- /dev/null +++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-4.2.9-r1 @@ -0,0 +1,12 @@ +DEFINED_PHASES=install postinst prepare setup unpack +DESCRIPTION=NVIDIA CUDA Toolkit (compiler and friends) +EAPI=5 +HOMEPAGE=http://developer.nvidia.com/cuda +IUSE=debugger doc eclipse profiler +KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux +LICENSE=NVIDIA +RDEPEND=|| ( sys-devel/gcc:4.4 sys-devel/gcc:4.5 sys-devel/gcc:4.6 ) !<=x11-drivers/nvidia-drivers-270.41 debugger? ( sys-libs/libtermcap-compat ) profiler? ( >=virtual/jre-1.6 ) +SLOT=0 +SRC_URI=amd64? ( http://developer.download.nvidia.com/compute/cuda/4_2/rel/toolkit/cudatoolkit_4.2.9_linux_64_ubuntu11.04.run ) x86? ( http://developer.download.nvidia.com/compute/cuda/4_2/rel/toolkit/cudatoolkit_4.2.9_linux_32_ubuntu11.04.run ) +_eclasses_=cuda c61985801c2bd258ba06cd958995c2ff eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e unpacker 50e1227854e96469a19a63f053496328 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_md5_=8cdbd7093543967e1897907f1bee9d11 diff --git a/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-5.0.35 b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-5.0.35 new file mode 100644 index 000000000000..aff69b4f66df --- /dev/null +++ b/metadata/md5-cache/dev-util/nvidia-cuda-toolkit-5.0.35 @@ -0,0 +1,12 @@ +DEFINED_PHASES=install postinst prepare setup unpack +DESCRIPTION=NVIDIA CUDA Toolkit (compiler and friends) +EAPI=5 +HOMEPAGE=http://developer.nvidia.com/cuda +IUSE=debugger doc eclipse profiler +KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux +LICENSE=NVIDIA +RDEPEND=|| ( sys-devel/gcc:4.4 sys-devel/gcc:4.5 sys-devel/gcc:4.6 ) !<=x11-drivers/nvidia-drivers-270.41 debugger? ( sys-libs/libtermcap-compat ) profiler? ( >=virtual/jre-1.6 ) +SLOT=0 +SRC_URI=amd64? ( http://developer.download.nvidia.com/compute/cuda/5_0/rel-update-1/installers//cuda_5.0.35_linux_64_fedora16-1.run ) x86? ( http://developer.download.nvidia.com/compute/cuda/5_0/rel-update-1/installers//cuda_5.0.35_linux_32_fedora16-1.run ) +_eclasses_=cuda c61985801c2bd258ba06cd958995c2ff eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e unpacker 50e1227854e96469a19a63f053496328 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_md5_=436a7a23aba19945e78b2b7033699eab diff --git a/metadata/md5-cache/media-libs/jpeg-9 b/metadata/md5-cache/media-libs/jpeg-9 new file mode 100644 index 000000000000..34e349c19388 --- /dev/null +++ b/metadata/md5-cache/media-libs/jpeg-9 @@ -0,0 +1,10 @@ +DEFINED_PHASES=compile configure install postinst prepare +DESCRIPTION=Library to load, handle and manipulate images in the JPEG format +EAPI=5 +HOMEPAGE=http://jpegclub.org/ http://www.ijg.org/ +IUSE=static-libs +LICENSE=IJG +SLOT=0 +SRC_URI=http://www.ijg.org/files/jpegsrc.v9.tar.gz mirror://debian/pool/main/libj/libjpeg8/libjpeg8_8d-1.debian.tar.gz +_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 +_md5_=4bad8e3d84c71eeed13eb2e4513e7cef diff --git a/metadata/md5-cache/net-im/licq-1.7.0 b/metadata/md5-cache/net-im/licq-1.7.0 new file mode 100644 index 000000000000..531aaf8007a9 --- /dev/null +++ b/metadata/md5-cache/net-im/licq-1.7.0 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare setup test unpack +DEPEND=>=app-crypt/gpgme-1 jabber? ( net-libs/gloox ) qt4? ( x11-libs/qt-gui:4 ) ssl? ( >=dev-libs/openssl-0.9.5a ) ncurses? ( sys-libs/ncurses dev-libs/cdk ) xosd? ( x11-libs/xosd ) aosd? ( x11-libs/libaosd ) doc? ( app-doc/doxygen ) nls? ( sys-devel/gettext ) dev-libs/boost >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) +DESCRIPTION=ICQ Client with v8 support +EAPI=5 +HOMEPAGE=http://www.licq.org/ +IUSE=debug doc linguas_he nls socks5 ssl xosd aosd jabber qt4 msn ncurses +KEYWORDS=~amd64 ~x86 +LICENSE=GPL-2 +RDEPEND=>=app-crypt/gpgme-1 jabber? ( net-libs/gloox ) qt4? ( x11-libs/qt-gui:4 ) ssl? ( >=dev-libs/openssl-0.9.5a ) ncurses? ( sys-libs/ncurses dev-libs/cdk ) xosd? ( x11-libs/xosd ) aosd? ( x11-libs/libaosd ) +SLOT=2 +SRC_URI=mirror://sourceforge/licq/licq-1.7.0.tar.bz2 +_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 341ea44ed97a940b6ff74283ed5b94d7 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 +_md5_=af0f6f13b87849d4130bc7b31b210276 diff --git a/metadata/md5-cache/net-irc/hexchat-2.9.3 b/metadata/md5-cache/net-irc/hexchat-2.9.3 index 646edf7f96ae..4d8fd617bf7c 100644 --- a/metadata/md5-cache/net-irc/hexchat-2.9.3 +++ b/metadata/md5-cache/net-irc/hexchat-2.9.3 @@ -8,6 +8,6 @@ KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux LICENSE=GPL-2 RDEPEND=dev-libs/glib:2 x11-libs/pango dbus? ( >=dev-libs/dbus-glib-0.98 ) gtk? ( x11-libs/gtk+:2 ) libnotify? ( x11-libs/libnotify ) ntlm? ( net-libs/libntlm ) perl? ( >=dev-lang/perl-5.8.0 ) python? ( =dev-lang/python-2* ) tcl? ( dev-lang/tcl ) spell? ( app-text/gtkspell:2 ) ssl? ( >=dev-libs/openssl-0.9.8u ) SLOT=0 -SRC_URI=https://github.com/downloads/hexchat/hexchat/hexchat-2.9.3.tar.xz +SRC_URI=mirror://github/hexchat/hexchat/hexchat-2.9.3.tar.xz _eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 ddf6065984ab0a6d09e8c2ec264d7921 gnome2-utils 794d2847b4af390a1e020924876c8297 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=e66c15de35cdb1b2a033eec4aa4726a9 +_md5_=e11e324bbef1190224209ca23fe20e28 diff --git a/metadata/md5-cache/net-irc/hexchat-2.9.4 b/metadata/md5-cache/net-irc/hexchat-2.9.4 index 3c13a4a7f660..eae41246793b 100644 --- a/metadata/md5-cache/net-irc/hexchat-2.9.4 +++ b/metadata/md5-cache/net-irc/hexchat-2.9.4 @@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux LICENSE=GPL-2 RDEPEND=dev-libs/glib:2 x11-libs/pango dbus? ( >=dev-libs/dbus-glib-0.98 ) gtk? ( x11-libs/gtk+:2 ) libnotify? ( x11-libs/libnotify ) ntlm? ( net-libs/libntlm ) perl? ( >=dev-lang/perl-5.8.0 ) python? ( =dev-lang/python-2* ) spell? ( dev-libs/libxml2 ) libproxy? ( net-libs/libproxy ) ssl? ( >=dev-libs/openssl-0.9.8u ) SLOT=0 -SRC_URI=https://github.com/downloads/hexchat/hexchat/hexchat-2.9.4.tar.xz +SRC_URI=mirror://github/hexchat/hexchat/hexchat-2.9.4.tar.xz _eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome.org 8fef8f967214f56e08fa92d61163d891 gnome2 ddf6065984ab0a6d09e8c2ec264d7921 gnome2-utils 794d2847b4af390a1e020924876c8297 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=f1a2a03d1c313190a851f40fe84bf90e +_md5_=ea842b32cdf4545b2c8d73ae8b2514de diff --git a/metadata/md5-cache/net-misc/batctl-2013.0.0 b/metadata/md5-cache/net-misc/batctl-2013.0.0 new file mode 100644 index 000000000000..4c6a40ff2ff6 --- /dev/null +++ b/metadata/md5-cache/net-misc/batctl-2013.0.0 @@ -0,0 +1,10 @@ +DEFINED_PHASES=compile install setup +DESCRIPTION=BATMAN advanced control and management tool +EAPI=4 +HOMEPAGE=http://www.open-mesh.org/ +KEYWORDS=~amd64 ~x86 +LICENSE=GPL-2 +SLOT=0 +SRC_URI=http://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2013.0.0.tar.gz +_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 linux-info f01ffb28843e2de3ea571f80f07e5078 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_md5_=05c78cc9207ce6ca986d4ce644255272 diff --git a/metadata/md5-cache/net-misc/clusterssh-3.28 b/metadata/md5-cache/net-misc/clusterssh-3.28 deleted file mode 100644 index 0dff61838646..000000000000 --- a/metadata/md5-cache/net-misc/clusterssh-3.28 +++ /dev/null @@ -1,11 +0,0 @@ -DEFINED_PHASES=install prepare -DEPEND=>=dev-lang/perl-5.6.1 dev-perl/perl-tk dev-perl/Config-Simple dev-perl/X11-Protocol x11-apps/xlsfonts -DESCRIPTION=Concurrent Multi-Server Terminal Access. -EAPI=2 -HOMEPAGE=http://clusterssh.sourceforge.net -KEYWORDS=amd64 ppc ~ppc64 x86 ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris -LICENSE=GPL-2 -RDEPEND=>=dev-lang/perl-5.6.1 dev-perl/perl-tk dev-perl/Config-Simple dev-perl/X11-Protocol x11-apps/xlsfonts -SLOT=0 -SRC_URI=mirror://sourceforge/clusterssh/clusterssh-3.28.tar.gz -_md5_=1b29f59b32cf8743b4468328a5de98a4 diff --git a/metadata/md5-cache/sci-biology/t-coffee-9.03.1318 b/metadata/md5-cache/sci-biology/t-coffee-9.03.1318-r1 similarity index 81% rename from metadata/md5-cache/sci-biology/t-coffee-9.03.1318 rename to metadata/md5-cache/sci-biology/t-coffee-9.03.1318-r1 index 2aa40a99ddf1..f7f5862253f3 100644 --- a/metadata/md5-cache/sci-biology/t-coffee-9.03.1318 +++ b/metadata/md5-cache/sci-biology/t-coffee-9.03.1318-r1 @@ -4,10 +4,10 @@ DESCRIPTION=A multiple sequence alignment package EAPI=5 HOMEPAGE=http://www.tcoffee.org/Projects_home_page/t_coffee_home_page.html IUSE=examples -KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux +KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux LICENSE=GPL-2 -RDEPEND=sci-biology/clustalw virtual/fortran +RDEPEND=sci-biology/clustalw sci-chemistry/tm-align virtual/fortran SLOT=0 SRC_URI=http://www.tcoffee.org/Packages/Stable/Version_9.03.r1318/T-COFFEE_distribution_Version_9.03.r1318.tar.gz _eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de fortran-2 19652e219ec9b62d7d89735821d7afb6 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=5ca26eceb8329f52e353c9f0552f307b +_md5_=e0e0180cfb52ffc3132963a2419dcf83 diff --git a/metadata/md5-cache/sci-libs/cln-1.3.1 b/metadata/md5-cache/sci-libs/cln-1.3.1 deleted file mode 100644 index f668f4a711a5..000000000000 --- a/metadata/md5-cache/sci-libs/cln-1.3.1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install prepare setup -DEPEND=dev-libs/gmp doc? ( virtual/latex-base ) -DESCRIPTION=Class library (C++) for numbers -EAPI=2 -HOMEPAGE=http://www.ginac.de/CLN/ -IUSE=doc examples -KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux -LICENSE=GPL-2 -RDEPEND=dev-libs/gmp doc? ( virtual/latex-base ) -SLOT=1 -SRC_URI=ftp://ftpthep.physik.uni-mainz.de/pub/gnu/cln-1.3.1.tar.bz2 -_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=2fa6694f6643b062208c7e3725a08713 diff --git a/metadata/md5-cache/sci-libs/cln-1.3.2 b/metadata/md5-cache/sci-libs/cln-1.3.2 deleted file mode 100644 index e428f8449e4a..000000000000 --- a/metadata/md5-cache/sci-libs/cln-1.3.2 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile configure install prepare setup -DEPEND=dev-libs/gmp doc? ( virtual/latex-base ) -DESCRIPTION=Class library (C++) for numbers -EAPI=4 -HOMEPAGE=http://www.ginac.de/CLN/ -IUSE=doc examples static-libs -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux -LICENSE=GPL-2 -RDEPEND=dev-libs/gmp doc? ( virtual/latex-base ) -SLOT=1 -SRC_URI=ftp://ftpthep.physik.uni-mainz.de/pub/gnu/cln-1.3.2.tar.bz2 -_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=dd6b5ca8a41a7816732316cd2dcba77d diff --git a/metadata/md5-cache/sci-libs/djbfft-0.76 b/metadata/md5-cache/sci-libs/djbfft-0.76 deleted file mode 100644 index 9f8da06fafc7..000000000000 --- a/metadata/md5-cache/sci-libs/djbfft-0.76 +++ /dev/null @@ -1,10 +0,0 @@ -DEFINED_PHASES=compile install unpack -DESCRIPTION=extremely fast library for floating-point convolution -HOMEPAGE=http://cr.yp.to/djbfft.html -KEYWORDS=alpha amd64 arm ~hppa ppc ppc64 sh sparc x86 ~x86-fbsd -LICENSE=public-domain -RESTRICT=test -SLOT=0 -SRC_URI=http://cr.yp.to/djbfft/djbfft-0.76.tar.gz -_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=1c6de81224ce2b68fc7a8807091e254f diff --git a/metadata/md5-cache/sci-libs/vtk-5.10.1 b/metadata/md5-cache/sci-libs/vtk-5.10.1 index e09538b3d7cc..d06c68abedf0 100644 --- a/metadata/md5-cache/sci-libs/vtk-5.10.1 +++ b/metadata/md5-cache/sci-libs/vtk-5.10.1 @@ -10,4 +10,4 @@ RDEPEND=dev-libs/expat dev-libs/libxml2:2 media-libs/freetype media-libs/libpng SLOT=0 SRC_URI=http://www.vtk.org/files/release/5.10/vtk-5.10.1.tar.gz doc? ( http://www.vtk.org/files/release/5.10/vtkDocHtml-5.10.1.tar.gz ) examples? ( http://www.vtk.org/files/release/5.10/vtkdata-5.10.1.tar.gz ) _eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 341ea44ed97a940b6ff74283ed5b94d7 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de java-pkg-opt-2 f9bbbe5092225a2059aa9e6a3a2b52f1 java-utils-2 2d9eb3508fa5d6759e39354b74545567 multilib 9aa8a023e062fca0ba79362d9d0cc488 python e5b3412fa9f03670a666c8a137bd1060 qt4-r2 19af9102ca9b827213997cc636e7e33c toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=b7b47f90bf43d28e7150ed0afe97e63f +_md5_=1bf39c6fb520793f033a8d7e38d47244 diff --git a/metadata/md5-cache/sys-cluster/ceph-0.56.1 b/metadata/md5-cache/sys-cluster/ceph-0.56.1 new file mode 100644 index 000000000000..efce320b6576 --- /dev/null +++ b/metadata/md5-cache/sys-cluster/ceph-0.56.1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=configure install prepare +DEPEND=dev-libs/boost dev-libs/fcgi dev-libs/libaio dev-libs/libedit dev-libs/crypto++ sys-apps/keyutils fuse? ( sys-fs/fuse ) libatomic? ( dev-libs/libatomic_ops ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) tcmalloc? ( dev-util/google-perftools ) virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool +DESCRIPTION=Ceph distributed filesystem +EAPI=5 +HOMEPAGE=http://ceph.com/ +IUSE=debug fuse gtk libatomic radosgw static-libs tcmalloc +KEYWORDS=~amd64 ~x86 +LICENSE=LGPL-2.1 +RDEPEND=dev-libs/boost dev-libs/fcgi dev-libs/libaio dev-libs/libedit dev-libs/crypto++ sys-apps/keyutils fuse? ( sys-fs/fuse ) libatomic? ( dev-libs/libatomic_ops ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) tcmalloc? ( dev-util/google-perftools ) sys-fs/btrfs-progs +SLOT=0 +SRC_URI=http://ceph.com/download/ceph-0.56.1.tar.bz2 +_eclasses_=autotools 5116b10b2150724f41b564f1cc863e47 eutils d40dc948067bd3db1c8ebf7d51897313 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 +_md5_=2301609ee5cfaa684d3f65b6817cc48d diff --git a/metadata/md5-cache/sys-cluster/ceph-9999 b/metadata/md5-cache/sys-cluster/ceph-9999 new file mode 100644 index 000000000000..ec057cfc51f7 --- /dev/null +++ b/metadata/md5-cache/sys-cluster/ceph-9999 @@ -0,0 +1,11 @@ +DEFINED_PHASES=configure install prepare unpack +DEPEND=dev-libs/boost dev-libs/fcgi dev-libs/libaio dev-libs/libedit dev-libs/crypto++ sys-apps/keyutils fuse? ( sys-fs/fuse ) libatomic? ( dev-libs/libatomic_ops ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) tcmalloc? ( dev-util/google-perftools ) virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git +DESCRIPTION=Ceph distributed filesystem +EAPI=5 +HOMEPAGE=http://ceph.com/ +IUSE=debug fuse gtk libatomic radosgw static-libs tcmalloc +LICENSE=LGPL-2.1 +RDEPEND=dev-libs/boost dev-libs/fcgi dev-libs/libaio dev-libs/libedit dev-libs/crypto++ sys-apps/keyutils fuse? ( sys-fs/fuse ) libatomic? ( dev-libs/libatomic_ops ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat net-misc/curl ) tcmalloc? ( dev-util/google-perftools ) sys-fs/btrfs-progs +SLOT=0 +_eclasses_=autotools 5116b10b2150724f41b564f1cc863e47 eutils d40dc948067bd3db1c8ebf7d51897313 git-2 e92e09651292b1bef5656592364550f7 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 +_md5_=54bfe094f9d4ddffdba1458d14894c4d diff --git a/metadata/md5-cache/sys-fs/aufs-util-3.6 b/metadata/md5-cache/sys-fs/aufs-util-3.6 index 086a417ec307..855e7dddfd15 100644 --- a/metadata/md5-cache/sys-fs/aufs-util-3.6 +++ b/metadata/md5-cache/sys-fs/aufs-util-3.6 @@ -9,4 +9,4 @@ RDEPEND=!sys-fs/aufs2 !sys-fs/aufs3 sys-kernel/aufs-sources SLOT=0 SRC_URI=http://dev.gentoo.org/~jlec/distfiles/aufs-util-3.6.tar.xz _eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de linux-info f01ffb28843e2de3ea571f80f07e5078 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=8199a1eac332362185c41d9d55ec905b +_md5_=337d034ecb93e9a37b1cdad93c4dd5de diff --git a/metadata/md5-cache/sys-fs/aufs-util-3.7 b/metadata/md5-cache/sys-fs/aufs-util-3.7 new file mode 100644 index 000000000000..1c40f89c1410 --- /dev/null +++ b/metadata/md5-cache/sys-fs/aufs-util-3.7 @@ -0,0 +1,12 @@ +DEFINED_PHASES=prepare setup +DEPEND=!sys-fs/aufs2 !sys-fs/aufs3 sys-kernel/aufs-sources +DESCRIPTION=Utilities are always necessary for aufs +EAPI=5 +HOMEPAGE=http://aufs.sourceforge.net/ +KEYWORDS=~amd64 ~x86 +LICENSE=GPL-2 +RDEPEND=!sys-fs/aufs2 !sys-fs/aufs3 sys-kernel/aufs-sources +SLOT=0 +SRC_URI=http://dev.gentoo.org/~jlec/distfiles/aufs-util-3.7.tar.xz +_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de linux-info f01ffb28843e2de3ea571f80f07e5078 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 +_md5_=b16f11821ef4745564a8b0e91cfa36ff diff --git a/metadata/md5-cache/sys-fs/aufs3-3_p20121015 b/metadata/md5-cache/sys-fs/aufs3-3_p20121015 deleted file mode 100644 index a0403dc8961c..000000000000 --- a/metadata/md5-cache/sys-fs/aufs3-3_p20121015 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile install postinst postrm preinst prepare setup -DEPEND=dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) -DESCRIPTION=An entirely re-designed and re-implemented Unionfs -EAPI=4 -HOMEPAGE=http://aufs.sourceforge.net/ -IUSE=debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs kernel_linux -KEYWORDS=~amd64 ~x86 -LICENSE=GPL-2 -RDEPEND=!sys-fs/aufs !sys-fs/aufs2 kernel_linux? ( virtual/modutils ) -SLOT=0 -SRC_URI=http://dev.gentoo.org/~jlec/distfiles/aufs3-3_p20121015.tar.xz -_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de linux-info f01ffb28843e2de3ea571f80f07e5078 linux-mod dbc722ed035721476f23ab7b0572985e multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=95b329128134ec8fed5b05dd83a69638 diff --git a/metadata/md5-cache/sys-fs/aufs3-3_p20121015-r1 b/metadata/md5-cache/sys-fs/aufs3-3_p20121015-r1 deleted file mode 100644 index 0009dcd24fb6..000000000000 --- a/metadata/md5-cache/sys-fs/aufs3-3_p20121015-r1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile install postinst postrm preinst prepare setup -DEPEND=dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) -DESCRIPTION=An entirely re-designed and re-implemented Unionfs -EAPI=4 -HOMEPAGE=http://aufs.sourceforge.net/ -IUSE=debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs kernel_linux -KEYWORDS=~amd64 ~x86 -LICENSE=GPL-2 -RDEPEND=!sys-fs/aufs !sys-fs/aufs2 kernel_linux? ( virtual/modutils ) -SLOT=0 -SRC_URI=http://dev.gentoo.org/~jlec/distfiles/aufs3-3_p20121015.tar.xz -_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de linux-info f01ffb28843e2de3ea571f80f07e5078 linux-mod dbc722ed035721476f23ab7b0572985e multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=4452bb1b38ca6413d597cdd123986314 diff --git a/metadata/md5-cache/sys-fs/aufs3-3_p20121112 b/metadata/md5-cache/sys-fs/aufs3-3_p20121112 deleted file mode 100644 index ef67dd7acae3..000000000000 --- a/metadata/md5-cache/sys-fs/aufs3-3_p20121112 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile install postinst postrm preinst prepare setup -DEPEND=dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) -DESCRIPTION=An entirely re-designed and re-implemented Unionfs -EAPI=4 -HOMEPAGE=http://aufs.sourceforge.net/ -IUSE=debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs kernel_linux -KEYWORDS=~amd64 ~x86 -LICENSE=GPL-2 -RDEPEND=!sys-fs/aufs !sys-fs/aufs2 kernel_linux? ( virtual/modutils ) -SLOT=0 -SRC_URI=http://dev.gentoo.org/~jlec/distfiles/aufs3-3_p20121112.tar.xz -_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de linux-info f01ffb28843e2de3ea571f80f07e5078 linux-mod dbc722ed035721476f23ab7b0572985e multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=659023a530146bcc96106e375af772f3 diff --git a/metadata/md5-cache/sys-fs/aufs3-3_p20121129 b/metadata/md5-cache/sys-fs/aufs3-3_p20130114 similarity index 75% rename from metadata/md5-cache/sys-fs/aufs3-3_p20121129 rename to metadata/md5-cache/sys-fs/aufs3-3_p20130114 index b88852e634f6..fd1d0ed6219a 100644 --- a/metadata/md5-cache/sys-fs/aufs3-3_p20121129 +++ b/metadata/md5-cache/sys-fs/aufs3-3_p20130114 @@ -1,13 +1,13 @@ DEFINED_PHASES=compile install postinst postrm preinst prepare setup -DEPEND=dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) +DEPEND=dev-util/patchutils dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) DESCRIPTION=An entirely re-designed and re-implemented Unionfs -EAPI=4 +EAPI=5 HOMEPAGE=http://aufs.sourceforge.net/ IUSE=debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs kernel_linux KEYWORDS=~amd64 ~x86 LICENSE=GPL-2 RDEPEND=!sys-fs/aufs !sys-fs/aufs2 kernel_linux? ( virtual/modutils ) SLOT=0 -SRC_URI=http://dev.gentoo.org/~jlec/distfiles/aufs3-3_p20121129.tar.xz +SRC_URI=http://dev.gentoo.org/~jlec/distfiles/aufs3-3_p20130114.tar.xz _eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic d900015de4e092f26d8c0a18b6bd60de linux-info f01ffb28843e2de3ea571f80f07e5078 linux-mod dbc722ed035721476f23ab7b0572985e multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=9a307fc81d7a988fa70d213d3e7c9200 +_md5_=589cd2183cc8bca59b601bb06d4aa9fc diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.6.10 b/metadata/md5-cache/sys-kernel/aufs-sources-3.6.10 index 34cd0941a29a..93b8ea858916 100644 --- a/metadata/md5-cache/sys-kernel/aufs-sources-3.6.10 +++ b/metadata/md5-cache/sys-kernel/aufs-sources-3.6.10 @@ -6,10 +6,10 @@ HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/ IUSE=deblob module symlink build deblob KEYWORDS=~amd64 ~x86 LICENSE=GPL-2 !deblob? ( freedist ) -PDEPEND=sys-fs/aufs-util !build? ( virtual/dev-manager ) +PDEPEND=!build? ( virtual/dev-manager ) RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl ) RESTRICT=binchecks strip SLOT=3.6.10 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.6.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.6.N/deblob-3.6 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.6.N/deblob-check -> deblob-check-3.6 ) mirror://gentoo/genpatches-3.6-10.base.tar.bz2 mirror://gentoo/genpatches-3.6-10.extras.tar.bz2 http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.6.10.tar.xz _eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 kernel-2 dd451098928ff900df7c254820871c00 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=ab03a5549ba8cc34fdc4e66c09cd6a87 +_md5_=f35d47f31dd24c0ce13fbd0e45c8b0f6 diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.6.11 b/metadata/md5-cache/sys-kernel/aufs-sources-3.6.11 index 8a11d23b5dc4..bf7a5bb53df5 100644 --- a/metadata/md5-cache/sys-kernel/aufs-sources-3.6.11 +++ b/metadata/md5-cache/sys-kernel/aufs-sources-3.6.11 @@ -6,10 +6,10 @@ HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/ IUSE=deblob module symlink build deblob KEYWORDS=~amd64 ~x86 LICENSE=GPL-2 !deblob? ( freedist ) -PDEPEND=sys-fs/aufs-util !build? ( virtual/dev-manager ) +PDEPEND=!build? ( virtual/dev-manager ) RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl ) RESTRICT=binchecks strip SLOT=3.6.11 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.6.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.6.N/deblob-3.6 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.6.N/deblob-check -> deblob-check-3.6 ) mirror://gentoo/genpatches-3.6-11.base.tar.bz2 mirror://gentoo/genpatches-3.6-11.extras.tar.bz2 http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.6.11.tar.xz _eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 kernel-2 dd451098928ff900df7c254820871c00 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=04e240458780343b3930b5c798bb7c1e +_md5_=2dacd7f55a5e3c91d3e9dab35737ee4e diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.6.6 b/metadata/md5-cache/sys-kernel/aufs-sources-3.6.6 deleted file mode 100644 index bdc581076680..000000000000 --- a/metadata/md5-cache/sys-kernel/aufs-sources-3.6.6 +++ /dev/null @@ -1,15 +0,0 @@ -DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack -DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) -DESCRIPTION=Full sources including the Gentoo patchset for the 3.6 kernel tree and aufs3 support -EAPI=5 -HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/ -IUSE=deblob symlink build deblob -KEYWORDS=~amd64 ~x86 -LICENSE=GPL-2 !deblob? ( freedist ) -PDEPEND=sys-fs/aufs-util !build? ( virtual/dev-manager ) -RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl ) -RESTRICT=binchecks strip -SLOT=3.6.6 -SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.6.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.6.N/deblob-3.6 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.6.N/deblob-check -> deblob-check-3.6 ) mirror://gentoo/genpatches-3.6-8.base.tar.bz2 mirror://gentoo/genpatches-3.6-8.extras.tar.bz2 http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.6.6.tar.xz -_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 kernel-2 dd451098928ff900df7c254820871c00 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=1f562b15993e2503e36b44f7934449fb diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.7.1 b/metadata/md5-cache/sys-kernel/aufs-sources-3.7.1 index 88fc52d067e0..0342a4029d33 100644 --- a/metadata/md5-cache/sys-kernel/aufs-sources-3.7.1 +++ b/metadata/md5-cache/sys-kernel/aufs-sources-3.7.1 @@ -12,4 +12,4 @@ RESTRICT=binchecks strip SLOT=3.7.1 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.7.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.7.N/deblob-3.7 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.7.N/deblob-check -> deblob-check-3.7 ) mirror://gentoo/genpatches-3.7-2.base.tar.bz2 http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.7.1.tar.xz _eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 kernel-2 dd451098928ff900df7c254820871c00 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=c678e07a8fbfa4c63a4fc68dce49ad04 +_md5_=f0b8c47416dba6fe0518f62551b07191 diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.6.8 b/metadata/md5-cache/sys-kernel/aufs-sources-3.7.2 similarity index 61% rename from metadata/md5-cache/sys-kernel/aufs-sources-3.6.8 rename to metadata/md5-cache/sys-kernel/aufs-sources-3.7.2 index ef03edc63ccb..7bf578210635 100644 --- a/metadata/md5-cache/sys-kernel/aufs-sources-3.6.8 +++ b/metadata/md5-cache/sys-kernel/aufs-sources-3.7.2 @@ -1,15 +1,15 @@ DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) -DESCRIPTION=Full sources including the Gentoo patchset for the 3.6 kernel tree and aufs3 support +DESCRIPTION=Full sources including the Gentoo patchset for the 3.7 kernel tree and aufs3 support EAPI=5 HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/ IUSE=deblob module symlink build deblob KEYWORDS=~amd64 ~x86 LICENSE=GPL-2 !deblob? ( freedist ) -PDEPEND=sys-fs/aufs-util !build? ( virtual/dev-manager ) +PDEPEND=>=sys-fs/aufs-util-3.7 !build? ( virtual/dev-manager ) RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl ) RESTRICT=binchecks strip -SLOT=3.6.8 -SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.6.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.6.N/deblob-3.6 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.6.N/deblob-check -> deblob-check-3.6 ) mirror://gentoo/genpatches-3.6-9.base.tar.bz2 mirror://gentoo/genpatches-3.6-9.extras.tar.bz2 http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.6.8.tar.xz +SLOT=3.7.2 +SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.7.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.7.N/deblob-3.7 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.7.N/deblob-check -> deblob-check-3.7 ) mirror://gentoo/genpatches-3.7-2.base.tar.bz2 http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.7.2.tar.xz _eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 kernel-2 dd451098928ff900df7c254820871c00 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 -_md5_=749ebda034e1b69cab9be6573549eefc +_md5_=67fc65420e14f0739f94b1c9f5e68188 diff --git a/metadata/md5-cache/virtual/python-unittest2-1 b/metadata/md5-cache/virtual/python-unittest2-1 index 371d743b1a50..2dc2db240c4a 100644 --- a/metadata/md5-cache/virtual/python-unittest2-1 +++ b/metadata/md5-cache/virtual/python-unittest2-1 @@ -1,9 +1,9 @@ DEFINED_PHASES=- -DESCRIPTION=A virtual for Python 2.7/3.2+-compatible unittest or unittest2 +DESCRIPTION=A virtual for packages needing unittest2 in Python 2.5, 2.6, 3.1 EAPI=5 IUSE=python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_pypy1_9 python_targets_pypy2_0 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos RDEPEND=dev-python/unittest2:0 SLOT=0 _eclasses_=multilib 9aa8a023e062fca0ba79362d9d0cc488 python-r1 b9091432451f035281bf6fc17720e820 python-utils-r1 069a968fde0ceb8a9cd5c6a89d77cbc2 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e -_md5_=c006e1ebc4ad81ae5fc26a69a6de6f16 +_md5_=487f3a66ce9a98db87198a014e36f444 diff --git a/metadata/md5-cache/www-apps/webdavcgi-0.8.3 b/metadata/md5-cache/www-apps/webdavcgi-0.8.3 index 463ac70f073b..73d2c4a6be9b 100644 --- a/metadata/md5-cache/www-apps/webdavcgi-0.8.3 +++ b/metadata/md5-cache/www-apps/webdavcgi-0.8.3 @@ -11,4 +11,4 @@ REQUIRED_USE=|| ( mysql postgres sqlite ) SLOT=0 SRC_URI=mirror://sourceforge/webdavcgi/webdavcgi-0.8.3.tar.bz2 _eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 webapp 25b9b1696f5e698711f47d45c3d45e3e -_md5_=cc58b0c2fd44cd96911020db54b93293 +_md5_=5171b0a7aad9264d567d1aadebbda852 diff --git a/metadata/md5-cache/x11-libs/libaosd-0.2.7 b/metadata/md5-cache/x11-libs/libaosd-0.2.7 index 7f87c1270f9f..ed9e40e53e5c 100644 --- a/metadata/md5-cache/x11-libs/libaosd-0.2.7 +++ b/metadata/md5-cache/x11-libs/libaosd-0.2.7 @@ -4,10 +4,10 @@ DESCRIPTION=An advanced on screen display (OSD) library EAPI=3 HOMEPAGE=http://www.atheme.org/project/libaosd IUSE=pango +tools xcomposite -KEYWORDS=~amd64 +KEYWORDS=~amd64 ~x86 LICENSE=MIT RDEPEND=x11-libs/cairo x11-libs/libX11 x11-libs/libXrender pango? ( x11-libs/pango ) tools? ( dev-libs/glib:2 ) xcomposite? ( x11-libs/libXcomposite ) SLOT=0 SRC_URI=http://distfiles.atheme.org/libaosd-0.2.7.tgz _eclasses_=autotools 5116b10b2150724f41b564f1cc863e47 autotools-utils f4dc5b0e643575b9bd31a2bd7deeee31 eutils d40dc948067bd3db1c8ebf7d51897313 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 69a2016af67775a812f4c03ba4b0e03e user d0a4d0735a6c0183d707ca919bd72f28 -_md5_=2148993c590f66a891a66335ded68e80 +_md5_=c9bd5cba99a53e53de9a2e0c790dff4f diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk index b25aef87bb6c..f47c9328c5ae 100644 --- a/metadata/news/timestamp.chk +++ b/metadata/news/timestamp.chk @@ -1 +1 @@ -Mon, 14 Jan 2013 05:06:53 +0000 +Mon, 14 Jan 2013 11:06:54 +0000 diff --git a/metadata/timestamp b/metadata/timestamp index 3cb8116b3439..433822b2ce1c 100644 --- a/metadata/timestamp +++ b/metadata/timestamp @@ -1 +1 @@ -Mon Jan 14 05:06:51 UTC 2013 +Mon Jan 14 11:06:52 UTC 2013 diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk index c09150121750..b990b0c0f7e8 100644 --- a/metadata/timestamp.chk +++ b/metadata/timestamp.chk @@ -1 +1 @@ -Mon, 14 Jan 2013 05:30:01 +0000 +Mon, 14 Jan 2013 11:30:01 +0000 diff --git a/metadata/timestamp.x b/metadata/timestamp.x index e5c93154027f..50bfb67595ce 100644 --- a/metadata/timestamp.x +++ b/metadata/timestamp.x @@ -1 +1 @@ -1358139901 Mon Jan 14 05:05:01 2013 UTC +1358161501 Mon Jan 14 11:05:01 2013 UTC diff --git a/net-im/licq/Manifest b/net-im/licq/Manifest index bda84af231c1..ad319bb534c1 100644 --- a/net-im/licq/Manifest +++ b/net-im/licq/Manifest @@ -1,2 +1,3 @@ DIST licq-1.3.8.tar.bz2 4500623 SHA256 fb65cd5447f2771def5cffda113d68b25ee6ed6fe0ebce84638da79e2869ebc6 DIST licq-1.3.9.tar.bz2 4507409 SHA256 67c300a3b7045a1d6f182f4824a9c6815f9b71db1816885fc83bf9937fffd056 +DIST licq-1.7.0.tar.bz2 2399061 SHA256 70c799920c9fb2c9079cbe4e5b5298fb1e0e348138ff12670b3ae1e3ec30b6ec SHA512 4a2787f3f1af0ed9bbc79b92443734de26cd158be6cb8d4041d33852b1eb3d8182d0783f0fb1ba693e1680ff05548021da31358458a679334c429467218f56b1 WHIRLPOOL b2b692924845384a4c657ceb5d8fea2e74c492c7e61cec935c57741e1f6591fcb26a80711ba336ac664dd75f50aa9cb6c152623679960ccc21607115e6a3e109 diff --git a/net-im/licq/licq-1.7.0.ebuild b/net-im/licq/licq-1.7.0.ebuild new file mode 100644 index 000000000000..6a92910f5fc1 --- /dev/null +++ b/net-im/licq/licq-1.7.0.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.7.0.ebuild,v 1.1 2013/01/14 08:29:30 polynomial-c Exp $ + +EAPI="5" + +inherit cmake-utils eutils flag-o-matic + +DESCRIPTION="ICQ Client with v8 support" +HOMEPAGE="http://www.licq.org/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="2" +KEYWORDS="~amd64 ~x86" +IUSE="debug doc linguas_he nls socks5 ssl xosd aosd jabber qt4 msn ncurses" + +RDEPEND=">=app-crypt/gpgme-1 + jabber? ( net-libs/gloox ) + qt4? ( x11-libs/qt-gui:4 ) + ssl? ( >=dev-libs/openssl-0.9.5a ) + ncurses? ( + sys-libs/ncurses + dev-libs/cdk + ) + xosd? ( x11-libs/xosd ) + aosd? ( x11-libs/libaosd )" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen ) + nls? ( sys-devel/gettext ) + dev-libs/boost" + +src_prepare() { + #epatch "${FILESDIR}"/${PN}-1.5.1-find-libcdk.patch + + local licq_plugins="auto-reply rms" + use ncurses && licq_plugins+=" console" + use msn && licq_plugins+=" msn" + use xosd && licq_plugins+=" osd" + use aosd && licq_plugins+=" aosd" + use jabber && licq_plugins+=" jabber" + use qt4 && licq_plugins+=" qt4-gui" + + local plugins="" x + for x in ${licq_plugins}; do + plugins+=" ${x}\/CMakeLists.txt" + done + + sed -i -e "s/file(GLOB cmake_plugins.*$/set(cmake_plugins ${plugins})/" plugins/CMakeLists.txt +} + +pkg_setup() { + # crutch + append-flags -pthread +} + +src_configure() { + local myopts="-DCMAKE_BUILD_TYPE=$(use debug && echo 'Debug' || echo 'Release')" + mycmakeargs="$myopts + $(cmake-utils_use linguas_he USE_HEBREW) + $(cmake-utils_use socks5 USE_SOCKS5) + $(cmake-utils_use ssl USE_OPENSSL) + $(cmake-utils_use nls ENABLE_NLS) + -DUSE_FIFO=ON + -DBUILD_PLUGINS=ON" + + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + dodoc README + + docinto doc + dodoc doc/* + + use ssl && dodoc README.OPENSSL + + exeinto /usr/share/${PN}/upgrade + doexe upgrade/*.pl || die +} diff --git a/net-im/licq/metadata.xml b/net-im/licq/metadata.xml index 2d3b94c99ae6..8c13b30c5f6c 100644 --- a/net-im/licq/metadata.xml +++ b/net-im/licq/metadata.xml @@ -3,4 +3,8 @@ net-im Licq is an ICQ clone with an extensive plugin system. + + + Build the advanced on screen display plugin. + diff --git a/net-irc/hexchat/hexchat-2.9.3.ebuild b/net-irc/hexchat/hexchat-2.9.3.ebuild index 7abf30ac81ab..d49845a8d7a7 100644 --- a/net-irc/hexchat/hexchat-2.9.3.ebuild +++ b/net-irc/hexchat/hexchat-2.9.3.ebuild @@ -1,13 +1,13 @@ -# 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/net-irc/hexchat/hexchat-2.9.3.ebuild,v 1.9 2012/12/01 19:10:48 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-2.9.3.ebuild,v 1.10 2013/01/14 07:14:11 polynomial-c Exp $ EAPI=4 inherit eutils gnome2 multilib versionator DESCRIPTION="Graphical IRC client based on XChat" -SRC_URI="https://github.com/downloads/hexchat/hexchat/${P}.tar.xz" +SRC_URI="mirror://github/${PN}/${PN}/${P}.tar.xz" HOMEPAGE="http://www.hexchat.org/" LICENSE="GPL-2" diff --git a/net-irc/hexchat/hexchat-2.9.4.ebuild b/net-irc/hexchat/hexchat-2.9.4.ebuild index 59730983a223..665275ec3c2f 100644 --- a/net-irc/hexchat/hexchat-2.9.4.ebuild +++ b/net-irc/hexchat/hexchat-2.9.4.ebuild @@ -1,13 +1,13 @@ -# 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/net-irc/hexchat/hexchat-2.9.4.ebuild,v 1.1 2012/11/25 12:45:46 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-2.9.4.ebuild,v 1.2 2013/01/14 07:14:11 polynomial-c Exp $ EAPI=5 inherit eutils gnome2 multilib DESCRIPTION="Graphical IRC client based on XChat" -SRC_URI="https://github.com/downloads/${PN}/${PN}/${P}.tar.xz" +SRC_URI="mirror://github/${PN}/${PN}/${P}.tar.xz" HOMEPAGE="http://www.hexchat.org/" LICENSE="GPL-2" @@ -49,6 +49,7 @@ src_prepare() { -i configure.ac || die 'sed failed' fi + mkdir "m4" || die "mkdir failed" ./autogen.sh || die "autogen.sh failed" } diff --git a/net-misc/batctl/Manifest b/net-misc/batctl/Manifest index a8dddf93f979..ee4c5a3b91c0 100644 --- a/net-misc/batctl/Manifest +++ b/net-misc/batctl/Manifest @@ -1,5 +1,6 @@ -DIST batctl-2011.4.0.tar.gz 45564 SHA256 99980ce88328db7e46e5af0cfd43df23f5027a052bd89aaee64895a21c8388ec +DIST batctl-2011.4.0.tar.gz 45564 SHA256 99980ce88328db7e46e5af0cfd43df23f5027a052bd89aaee64895a21c8388ec SHA512 2a73f11e9e15d8179c94a4eb1c44f1783125b1215dd31978990bbc0c4397635064db63bed2a688d48e77d2809305064a97e3f0d4398a7943f458aade4e09c2fe WHIRLPOOL c8543a64ac52a4bc4c8029fd8dc8b0214086887441ed5b7fb2a071b9522dab1376a1a10b7f855852ff59885c42c13a97a00bda5dfa131dea4deb24d06e811e95 DIST batctl-2012.1.0.tar.gz 45757 SHA256 eef06b9348fbc21b12a84bd8cb7dfa709ebef6f7c5e7e5c424c8063767c3bc8e SHA512 9085c38821ba7ac570929a27d9ecd05db5483128b4e39e9f494052720cf5c59521d1428d0529378a9cf958ea9b0b759a399a9c45d1bb190da6a9b111e94fc6c4 WHIRLPOOL 00d1a0f4c98a9ef33968ffe3c75eb8bdcd680e2e103a5fe42057a24edcb7bfddf730758f1491626d8c3f8866e8af8009318f3aa0188407c1393dabb542feefd8 DIST batctl-2012.2.0.tar.gz 46236 SHA256 bf9ab02f980d0bb668aa8bd96842d394034489d217272be2490944e78c2db2d3 SHA512 eb991f80ee501c7b97beafeee4102cdc279b630bb64cb7d4cd57466b9b5f65120a85660a6ad09ad517ad94b246ed8a3ed72096e43b666a4c871532f7e5783422 WHIRLPOOL b082b9e6df385e5c1d19cc985ee9ebeac286112a0ec5b46e635452a32d43b07bd28445797ea8558edde67c0985ebdc01f82af3a895fad9ba8c20d9c595b881e0 DIST batctl-2012.3.0.tar.gz 49039 SHA256 f718d79e6287a0572f9b5bb65cf132eee8e86a6aaafc2bf850805efff3df6353 SHA512 c584568fb9198644772e40c51fea7905bc5314ca3c403c71a78db56031b64a00395ae05402ccca137582fb1d4122dcaa1f6c4a5b6bcab34cbf2532fa983d6dcd WHIRLPOOL f36fcaabc8933348fa9b9af86958315ea6a0b97d4af26a6d749831989cbdc16d2f0bdb9e85669b4ee5ce7e950cf13377d4cfb7d7f3fcbc0acb52e1094ea4a746 DIST batctl-2012.4.0.tar.gz 48978 SHA256 0bd4061f3c0b0acc184179ad9497141edafdc45d7dea51b7140a1bf4a0e0d866 SHA512 d0027d296bcc81cafa71571b7bd47942ce04c2e6bc13c1ca50e68bf5397e3c84b93d7a2a1a6c6bfb669468f2a3947915bc1d5a3aa391e63e492115cc6c0db0a0 WHIRLPOOL 8136ea4b42c075c084052b35044e7341854c4bb21d8e2c5d1e2e4e02d9200088123b4e4cac0ebcd5b76a35d6f1106e240741292e5cf726b179d9828b8b430ba1 +DIST batctl-2013.0.0.tar.gz 52349 SHA256 c66e0b60e136829ea113c1fddf4029d1e7f5e8f0e75a3cea2a5ccf415cc96feb SHA512 9a347e05504ac45aa685720118bd0bd308dc57d86823ac0b818629d2a6d6daab00d566ae44b845eb98a87841490f13f418469bd54dad41fd01fbac0e7c670fb9 WHIRLPOOL 806ec24cb34e5000d8651d83be2566a82e971c6d2bfd65b3aa2dc776aa39b5d7a2da96cbc021cb6fddcf04e447ced6bd55772a562ac725dfde9400c898626bb1 diff --git a/net-misc/batctl/batctl-2013.0.0.ebuild b/net-misc/batctl/batctl-2013.0.0.ebuild new file mode 100644 index 000000000000..e4e157526215 --- /dev/null +++ b/net-misc/batctl/batctl-2013.0.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/batctl/batctl-2013.0.0.ebuild,v 1.1 2013/01/14 10:52:43 xmw Exp $ + +EAPI=4 + +inherit linux-info toolchain-funcs + +DESCRIPTION="BATMAN advanced control and management tool" +HOMEPAGE="http://www.open-mesh.org/" +SRC_URI="http://downloads.open-mesh.org/batman/stable/sources/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="" +RDEPEND="" + +pkg_setup() { + if ( linux_config_exists && linux_chkconfig_present BATMAN_ADV ) \ + || ! has_version net-misc/batman-adv ; then + ewarn "You need the batman-adv kernel module," + ewarn "either from the kernel tree or via net-misc/batman-adv" + fi +} + +src_compile() { + emake CC="$(tc-getCC)" V=1 REVISION=gentoo-"${PVR}" +} + +src_install() { + emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install + dodoc README +} diff --git a/net-misc/clusterssh/Manifest b/net-misc/clusterssh/Manifest index fd54cbff70cf..dfe0f2f7f0c2 100644 --- a/net-misc/clusterssh/Manifest +++ b/net-misc/clusterssh/Manifest @@ -1,2 +1 @@ DIST App-ClusterSSH-4.01_01.tar.gz 85995 SHA256 f164eda53846cb0a3a7e8bf7f9d677fe4c4ccf28507b12ccdaee981b40af05f6 SHA512 c148dfc10d14b600f3ed9c86753aa07314e8cd95bf1f05d6661535ca631a5faa2d99a6d419badd3abf0b6d8483cdc08223f5b1019d53750cd5bc13245ac982ea WHIRLPOOL e7739cc64e8045eb748027e71632f253c08ee06611ecbc3e2f8077baa842b3e3f368a34489e242c6796a5b32367829603e02c327cabde2191b1797db4f880ecc -DIST clusterssh-3.28.tar.gz 103780 SHA256 27e7c0feb652d980229c5fe07f9d6bfe4eb1e3becafaf0e82a5409a9f67d8faf diff --git a/net-misc/clusterssh/clusterssh-3.28.ebuild b/net-misc/clusterssh/clusterssh-3.28.ebuild deleted file mode 100644 index 633a17748f2a..000000000000 --- a/net-misc/clusterssh/clusterssh-3.28.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/clusterssh/clusterssh-3.28.ebuild,v 1.4 2012/02/16 19:05:33 phajdan.jr Exp $ - -EAPI=2 - -DESCRIPTION="Concurrent Multi-Server Terminal Access." -HOMEPAGE="http://clusterssh.sourceforge.net" -SRC_URI="mirror://sourceforge/clusterssh/clusterssh-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" -IUSE="" - -RDEPEND=">=dev-lang/perl-5.6.1 - dev-perl/perl-tk - dev-perl/Config-Simple - dev-perl/X11-Protocol - x11-apps/xlsfonts" -DEPEND="${RDEPEND}" - -src_prepare() { - # Gentoo perl ebuilds remove podchecker - if grep -v podchecker "${S}"/src/Makefile.in \ - > "${S}"/src/Makefile.in.new; then - mv "${S}"/src/Makefile.in.new "${S}"/src/Makefile.in - else - die "Makefile.in update failed" - fi -} - -src_install() { - dobin src/cssh || die "dobin failed" - doman src/cssh.1 - dodoc AUTHORS NEWS README THANKS -} diff --git a/profiles/use.local.desc b/profiles/use.local.desc index 0dfcf4b09fb4..c2a3de67b477 100644 --- a/profiles/use.local.desc +++ b/profiles/use.local.desc @@ -564,7 +564,9 @@ app-forensics/aide:prelink - Enable support for sys-devel/prelink app-forensics/chkrootkit:cron - Install cron script for weekly rootkit scans app-forensics/libewf:ewf - Enables the v1 API app-forensics/libewf:ewf2 - Enables the v2 API +app-forensics/libewf:fuse - Enable fuse support for ewfmount app-forensics/libewf:rawio - Enables raw IO handling +app-forensics/libewf:uuid - Enable UUID support in the ewftools app-forensics/openscap:nss - Prefer NSS over libgcrypt as the crypto engine app-forensics/openscap:rpm - Compiles the RPM probes app-forensics/openscap:sql - Build the sql independant probes @@ -1804,6 +1806,7 @@ dev-util/nvidia-cuda-sdk:cuda - Build CUDA binaries. dev-util/nvidia-cuda-sdk:emulation - Build binaries for device emulation mode. These binaries will not require a CUDA-capable GPU to run. dev-util/nvidia-cuda-sdk:opencl - Build OpenCL binaries. dev-util/nvidia-cuda-toolkit:debugger - Installs the CUDA debugger. +dev-util/nvidia-cuda-toolkit:eclipse - Install the dev-util/eclipse-sdk plugins dev-util/nvidia-cuda-toolkit:profiler - Installs the NVIDIA CUDA visual profiler. dev-util/perf:demangle - Enable C++ symbol name demangling, using libbfd from sys-devel/binutils. When this flag is enabled, the package will have to be rebuilt after every version bump of binutils. dev-util/perf:doc - Build documentation and man pages. With this USE flag disabled, the --help parameter for perf and its sub-tools will not be available. This is optional because it depends on a few documentation handling tools that are not always welcome on user systems. @@ -3929,6 +3932,7 @@ net-im/leechcraft-azoth:standardstyles - Build support for standard Azoth styles net-im/leechcraft-azoth:xoox - Build Xoox, gloox-based plugin for XMPP support (deprecated, use 'xmpp' for new versions) net-im/leechcraft-azoth:xtazy - Build Xtazy for publishing currently playing tune net-im/leechcraft-azoth:zheet - Build Zheet, libmsn-based plugin for Windows Live Messenger support (deprecated, use 'msn' for new versions) +net-im/licq:aosd - Build the advanced on screen display plugin. net-im/mcabber:aspell - Adds support for app-text/aspell spell checker. net-im/mcabber:otr - Enable encrypted conversations using Off-The-Records messaging net-im/minbif:video - Add video support diff --git a/sci-biology/t-coffee/metadata.xml b/sci-biology/t-coffee/metadata.xml index 3ea57edd4222..fbe2c20e6448 100644 --- a/sci-biology/t-coffee/metadata.xml +++ b/sci-biology/t-coffee/metadata.xml @@ -1,12 +1,12 @@ - - weaver@gentoo.org - Andrey Kislyuk - - sci-biology - + + weaver@gentoo.org + Andrey Kislyuk + + sci-biology + T-Coffee is a multiple sequence alignment package. Given a set of sequences (Proteins or DNA), T-Coffee generates a multiple sequence alignment. Version 2.00 and higher can mix sequences and structures. diff --git a/sci-biology/t-coffee/t-coffee-9.03.1318.ebuild b/sci-biology/t-coffee/t-coffee-9.03.1318-r1.ebuild similarity index 81% rename from sci-biology/t-coffee/t-coffee-9.03.1318.ebuild rename to sci-biology/t-coffee/t-coffee-9.03.1318-r1.ebuild index d4325f1ffae8..403b9411b895 100644 --- a/sci-biology/t-coffee/t-coffee-9.03.1318.ebuild +++ b/sci-biology/t-coffee/t-coffee-9.03.1318-r1.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/sci-biology/t-coffee/t-coffee-9.03.1318.ebuild,v 1.1 2012/12/11 14:39:22 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-biology/t-coffee/t-coffee-9.03.1318-r1.ebuild,v 1.1 2013/01/14 10:49:03 jlec Exp $ EAPI=5 @@ -15,10 +15,12 @@ SRC_URI="http://www.tcoffee.org/Packages/Stable/Version_${MY_PV}/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="examples" -RDEPEND="sci-biology/clustalw" +RDEPEND=" + sci-biology/clustalw + sci-chemistry/tm-align" DEPEND="" S="${WORKDIR}/${MY_P}" @@ -42,11 +44,11 @@ src_compile() { emake \ CC="$(tc-getCC)" \ CFLAGS="${CFLAGS}" \ - -C t_coffee_source all + -C t_coffee_source t_coffee } src_install() { - dobin t_coffee_source/{t_coffee,TMalign} + dobin t_coffee_source/t_coffee if use examples; then insinto /usr/share/${PN} diff --git a/sci-libs/cln/Manifest b/sci-libs/cln/Manifest index 0cfd3b470bb3..042b3ad7984e 100644 --- a/sci-libs/cln/Manifest +++ b/sci-libs/cln/Manifest @@ -1,2 +1 @@ -DIST cln-1.3.1.tar.bz2 1258397 SHA256 8a194ce7bb8a69b3f324e0472adda9543b675089e619fccf289c57bb8b97a8e9 SHA512 f3613233655d9ce3b39d1ddd6fc94610a68416fc3b042271cedeefb4c2c45a84def8739c3ba79cc5d2a58bb7ac1ec2e0c64d010b7eadbb002ad412e6629c9f46 WHIRLPOOL d97742e9b66b465f05f1d6a6c1e9e0646f9c26a1b4326bda08d2d969dff3065c84d421c1d7a1649934f6b5a3ddb1672cde68966fd6951d851de927d81fd7be15 DIST cln-1.3.2.tar.bz2 1275638 SHA256 5c70c46b953b3b71ed2a2e28362b9adfacfae24b2b678d81bcc053ab779e7173 SHA512 3a0340f7a9205bfbb033591246e36f419c687081191152e873f1172379de155180f7b969b7f559abccf64f470942bd0ac0674c43f6523499322fb492c2c33726 WHIRLPOOL 5aa4f59da5b3af949dfd985f767bc5744b4f218a8035faa031528c2c4589e24a1269b448ea523c57e4378922dd9ab433cad2f9e2b9954d8bdfbdca2fbb7c6b68 diff --git a/sci-libs/cln/cln-1.3.1.ebuild b/sci-libs/cln/cln-1.3.1.ebuild deleted file mode 100644 index 98081f677dd0..000000000000 --- a/sci-libs/cln/cln-1.3.1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/cln/cln-1.3.1.ebuild,v 1.12 2012/10/10 13:29:45 jlec Exp $ - -EAPI=2 - -inherit eutils flag-o-matic multilib - -DESCRIPTION="Class library (C++) for numbers" -HOMEPAGE="http://www.ginac.de/CLN/" -SRC_URI="ftp://ftpthep.physik.uni-mainz.de/pub/gnu/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="1" -KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="doc examples" - -DEPEND="dev-libs/gmp - doc? ( virtual/latex-base )" -RDEPEND="${DEPEND}" - -pkg_setup() { - use sparc && append-cppflags "-DNO_ASM" - use hppa && append-cppflags "-DNO_ASM" - use arm && append-cppflags "-DNO_ASM" -} - -src_prepare() { - # avoid building examples - # do it in Makefile.in to avoid time consuming eautoreconf - sed -i -e '/^SUBDIRS.*=/s/examples doc benchmarks/doc/' Makefile.in || die - # fix compilation under gcc 4.4 - epatch "${FILESDIR}"/${PN}-1.2.2-gcc-4.4.patch -} - -src_configure () { - use prefix || EPREFIX= - - econf \ - --libdir="${EPREFIX}"/usr/$(get_libdir) \ - --datadir="${EPREFIX}"/usr/share/doc/${PF} -} -src_compile() { - emake || die "emake failed" - if use doc; then - emake html pdf || die "emake doc failed" - fi -} - -src_install () { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc README ChangeLog TODO* NEWS - if use doc; then - insinto /usr/share/doc/${PF} - doins doc/cln.pdf || die - dohtml doc/* || die - fi - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins examples/*.cc || die - fi -} diff --git a/sci-libs/cln/cln-1.3.2.ebuild b/sci-libs/cln/cln-1.3.2.ebuild deleted file mode 100644 index 9357cf15b00c..000000000000 --- a/sci-libs/cln/cln-1.3.2.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/cln/cln-1.3.2.ebuild,v 1.1 2011/06/13 21:39:56 bicatali Exp $ - -EAPI=4 -inherit eutils flag-o-matic - -DESCRIPTION="Class library (C++) for numbers" -HOMEPAGE="http://www.ginac.de/CLN/" -SRC_URI="ftp://ftpthep.physik.uni-mainz.de/pub/gnu/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="1" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="doc examples static-libs" - -DEPEND="dev-libs/gmp - doc? ( virtual/latex-base )" -RDEPEND="${DEPEND}" - -pkg_setup() { - use sparc && append-cppflags "-DNO_ASM" - use hppa && append-cppflags "-DNO_ASM" - use arm && append-cppflags "-DNO_ASM" -} - -src_prepare() { - # avoid building examples - # do it in Makefile.in to avoid time consuming eautoreconf - sed -i -e '/^SUBDIRS.*=/s/examples doc benchmarks/doc/' Makefile.in || die -} - -src_configure () { - econf \ - --datadir="${EPREFIX}"/usr/share/doc/${PF} \ - $(use_enable static-libs static) -} -src_compile() { - emake - use doc && emake html pdf -} - -src_install () { - default - use doc && dodoc doc/cln.pdf && dohtml doc/* - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins examples/*.cc - fi -} diff --git a/sci-libs/cln/metadata.xml b/sci-libs/cln/metadata.xml index ffaaa7776575..91b9559a615a 100644 --- a/sci-libs/cln/metadata.xml +++ b/sci-libs/cln/metadata.xml @@ -1,8 +1,8 @@ - sci-mathematics - + sci-mathematics + A Class Library for Numbers is a library for computations with all kinds of numbers in arbitrary precision. It has a set of number classes, including integers (with unlimited precision), reals with diff --git a/sci-libs/djbfft/djbfft-0.76.ebuild b/sci-libs/djbfft/djbfft-0.76.ebuild deleted file mode 100644 index 1ad2fd4684fb..000000000000 --- a/sci-libs/djbfft/djbfft-0.76.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/djbfft/djbfft-0.76.ebuild,v 1.10 2008/04/06 17:45:23 hollow Exp $ - -inherit eutils flag-o-matic toolchain-funcs multilib - -DESCRIPTION="extremely fast library for floating-point convolution" -HOMEPAGE="http://cr.yp.to/djbfft.html" -SRC_URI="http://cr.yp.to/djbfft/${P}.tar.gz" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="alpha amd64 arm ~hppa ppc ppc64 sh sparc x86 ~x86-fbsd" -IUSE="" - -# the "check" target of the Makefile (version 0.76 at least) only checks if -# all files were installed with correct permissions. Can't check that at -# this point of the installation. -RESTRICT="test" - -src_unpack() { - MY_PV="${PV:0:1}.${PV:2:1}.${PV:3:1}" # a.bc -> a.b.c - MY_D="${D}usr" - - # mask out everything, which is not suggested by the author (RTFM)! - ALLOWED_FLAGS="-fstack-protector -march -mcpu -pipe -mpreferred-stack-boundary -ffast-math" - strip-flags - - MY_CFLAGS="${CFLAGS} -O1 -fomit-frame-pointer" - use x86 && MY_CFLAGS="${MY_CFLAGS} -malign-double" - - LIBPERMS="0755" - LIBDJBFFT="libdjbfft.so.${MY_PV}" - - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${P}-gcc3.patch" - epatch "${FILESDIR}/${P}-shared.patch" - - sed -i -e "s:\"lib\":\"$(get_libdir)\":" hier.c - echo "$(tc-getCC) $MY_CFLAGS -fPIC -DPIC" > "conf-cc" - echo "$(tc-getCC) ${LDFLAGS}" > "conf-ld" - echo "${MY_D}" > "conf-home" - einfo "conf-cc: $( -sci -video - + sci + video + D.J. Bernstein Fast Fourier Transform (djbfft) is an extremely fast library for floating-point convolution. The current version holds most of the speed records for double-precision FFTs on diff --git a/sci-libs/vtk/vtk-5.10.1.ebuild b/sci-libs/vtk/vtk-5.10.1.ebuild index 48303f8ebde7..d267c293748f 100644 --- a/sci-libs/vtk/vtk-5.10.1.ebuild +++ b/sci-libs/vtk/vtk-5.10.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/sci-libs/vtk/vtk-5.10.1.ebuild,v 1.2 2013/01/10 16:18:00 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/vtk/vtk-5.10.1.ebuild,v 1.3 2013/01/14 10:10:15 jlec Exp $ EAPI=3 @@ -225,7 +225,7 @@ src_install() { insinto /usr/share/${PN} mv -v Examples examples doins -r examples || die - mv -v "${WORKDIR}"/{VTKData,data} || die + mv -v "${WORKDIR}"/{VTKData${PV},data} || die doins -r "${WORKDIR}"/data || die fi diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest index 5caf11914ff6..748c6f6d37d7 100644 --- a/sys-cluster/ceph/Manifest +++ b/sys-cluster/ceph/Manifest @@ -1,3 +1,4 @@ DIST ceph-0.49.tar.gz 3451895 SHA256 2261476554a09d11c94a91c8e6bf153d85a0e7ab9da93f7d01d17b9513368578 SHA512 6279043bb3043788c529092683e5c9d98c90029dacae932772a902194fa7cb69ba39283f9931119f6e363084e455c87d3eed6a06ce209601cd6142fd00b9f13d WHIRLPOOL 083027dea96d26c48ae5a47bdb970fcdcd04c7bbdb0dcb206c3a73e142a3e5d49fb5a2b00b40dddb26f1186b6030ad9f23cb384fcdea9c6fb8e273de19cdf725 DIST ceph-0.51.tar.bz2 2760620 SHA256 c9a8c69ab5a8f4e84f81b861f38b3f766c208177ff9babb1c448525ee3a616bb SHA512 aadf554daf0cfcb96ea1941fefe15b42c4fe08bc77fc473940b84ac2248078efe8ad13b43e3b716c5738d3e75f6e1e09344486cfa8c20a5769735c5704bb61b8 WHIRLPOOL 89a0b6d955e5efe84035ec845bf8f7349fbb2d58b3d3f0be0a7e253a12d1b5694bf90e8e30179030e51ec5ee84ebdcb912733e3b673ead95a317dc3c3989dbda DIST ceph-0.55.1.tar.bz2 3206370 SHA256 bc900c4b8b7e2bea6f0837a04f61bb5144e976aa80aa1f3a638354ea2d7c7532 SHA512 63a2fdf1cf583bf31d4310adba95493838924a7be85e9ed29ecf0caeb2de5f6f9f70c6d58279037e98a27716287925fb1537dcb7d18b84d69552f3a66bfecf01 WHIRLPOOL fe63da225bb6c7be54b2f8af9240bb58f35c9061671103acbaa2344439fa46f2c95d03c81042285b30e1b04a0d023b3988e7711f4f3d9882e5cfa154fb16a3b3 +DIST ceph-0.56.1.tar.bz2 3206422 SHA256 67ac83f6266f4e399a50ca7f8b0b5290577cba7c091d34917ce6fda63afa11ae SHA512 b2d00221d7def0a39bcfec004e743ba8e859d50ac88950b8c81607b2c466be25e48a56df4923cc34ac6d4768f256cf235ab8fa3e301bfd02b7a5f43755babc92 WHIRLPOOL 0c7ca5dbf309dfd3ff255046c6e1535a5628a71e20d5c7e90b7aa5c5f3536664c898f0d31941fa0cb92cfc3e42996e127fdecd7f4a4b41c13ad797c623541a7f diff --git a/sys-cluster/ceph/ceph-0.56.1.ebuild b/sys-cluster/ceph/ceph-0.56.1.ebuild new file mode 100644 index 000000000000..13622fc1295c --- /dev/null +++ b/sys-cluster/ceph/ceph-0.56.1.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-0.56.1.ebuild,v 1.1 2013/01/14 09:02:08 alexxy Exp $ + +EAPI=5 + +if [[ $PV = *9999* ]]; then + scm_eclass=git-2 + EGIT_REPO_URI=" + git://github.com/ceph/ceph.git + https://github.com/ceph/ceph.git" + SRC_URI="" + KEYWORDS="" +else + SRC_URI="http://ceph.com/download/${P}.tar.bz2" + KEYWORDS="~amd64 ~x86" +fi + +inherit autotools eutils multilib ${scm_eclass} + +DESCRIPTION="Ceph distributed filesystem" +HOMEPAGE="http://ceph.com/" + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="debug fuse gtk libatomic radosgw static-libs tcmalloc" + +CDEPEND=" + dev-libs/boost + dev-libs/fcgi + dev-libs/libaio + dev-libs/libedit + dev-libs/crypto++ + sys-apps/keyutils + fuse? ( sys-fs/fuse ) + libatomic? ( dev-libs/libatomic_ops ) + gtk? ( + x11-libs/gtk+:2 + dev-cpp/gtkmm:2.4 + gnome-base/librsvg + ) + radosgw? ( + dev-libs/fcgi + dev-libs/expat + net-misc/curl + ) + tcmalloc? ( dev-util/google-perftools ) + " +DEPEND="${CDEPEND} + virtual/pkgconfig" +RDEPEND="${CDEPEND} + sys-fs/btrfs-progs" + +STRIP_MASK="/usr/lib*/rados-classes/*" + +src_prepare() { + sed -e 's:invoke-rc\.d.*:/etc/init.d/ceph reload >/dev/null:' \ + -i src/logrotate.conf || die + sed -i "/^docdir =/d" src/Makefile.am || die #fix doc path + # disable testsnaps + sed -e '/testsnaps/d' -i src/Makefile.am || die + sed -e "/bin=/ s:lib:$(get_libdir):" "${FILESDIR}"/${PN}.initd \ + > "${T}"/${PN}.initd || die + sed -i -e '/AM_INIT_AUTOMAKE/s:-Werror ::' src/leveldb/configure.ac || die #423755 + eautoreconf +} + +src_configure() { + econf \ + --without-hadoop \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --includedir=/usr/include \ + $(use_with debug) \ + $(use_with fuse) \ + $(use_with libatomic libatomic-ops) \ + $(use_with radosgw) \ + $(use_with gtk gtk2) \ + $(use_enable static-libs static) \ + $(use_with tcmalloc) +} + +src_install() { + default + + prune_libtool_files --all + + rmdir "${ED}/usr/sbin" + + exeinto /usr/$(get_libdir)/ceph + newexe src/init-ceph ceph_init.sh + + insinto /etc/logrotate.d/ + newins src/logrotate.conf ${PN} + + chmod 644 "${ED}"/usr/share/doc/${PF}/sample.* + + keepdir /var/lib/${PN} + keepdir /var/lib/${PN}/tmp + keepdir /var/log/${PN}/stat + + newinitd "${T}/${PN}.initd" ${PN} + newconfd "${FILESDIR}/${PN}.confd" ${PN} +} diff --git a/sys-cluster/ceph/ceph-9999.ebuild b/sys-cluster/ceph/ceph-9999.ebuild new file mode 100644 index 000000000000..abbc24f2dce6 --- /dev/null +++ b/sys-cluster/ceph/ceph-9999.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ceph/ceph-9999.ebuild,v 1.1 2013/01/14 09:02:08 alexxy Exp $ + +EAPI=5 + +if [[ $PV = *9999* ]]; then + scm_eclass=git-2 + EGIT_REPO_URI=" + git://github.com/ceph/ceph.git + https://github.com/ceph/ceph.git" + SRC_URI="" + KEYWORDS="" +else + SRC_URI="http://ceph.com/download/${P}.tar.bz2" + KEYWORDS="~amd64 ~x86" +fi + +inherit autotools eutils multilib ${scm_eclass} + +DESCRIPTION="Ceph distributed filesystem" +HOMEPAGE="http://ceph.com/" + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="debug fuse gtk libatomic radosgw static-libs tcmalloc" + +CDEPEND=" + dev-libs/boost + dev-libs/fcgi + dev-libs/libaio + dev-libs/libedit + dev-libs/crypto++ + sys-apps/keyutils + fuse? ( sys-fs/fuse ) + libatomic? ( dev-libs/libatomic_ops ) + gtk? ( + x11-libs/gtk+:2 + dev-cpp/gtkmm:2.4 + gnome-base/librsvg + ) + radosgw? ( + dev-libs/fcgi + dev-libs/expat + net-misc/curl + ) + tcmalloc? ( dev-util/google-perftools ) + " +DEPEND="${CDEPEND} + virtual/pkgconfig" +RDEPEND="${CDEPEND} + sys-fs/btrfs-progs" + +STRIP_MASK="/usr/lib*/rados-classes/*" + +src_prepare() { + sed -e 's:invoke-rc\.d.*:/etc/init.d/ceph reload >/dev/null:' \ + -i src/logrotate.conf || die + sed -i "/^docdir =/d" src/Makefile.am || die #fix doc path + # disable testsnaps + sed -e '/testsnaps/d' -i src/Makefile.am || die + sed -e "/bin=/ s:lib:$(get_libdir):" "${FILESDIR}"/${PN}.initd \ + > "${T}"/${PN}.initd || die + sed -i -e '/AM_INIT_AUTOMAKE/s:-Werror ::' src/leveldb/configure.ac || die #423755 + eautoreconf +} + +src_configure() { + econf \ + --without-hadoop \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + --includedir=/usr/include \ + $(use_with debug) \ + $(use_with fuse) \ + $(use_with libatomic libatomic-ops) \ + $(use_with radosgw) \ + $(use_with gtk gtk2) \ + $(use_enable static-libs static) \ + $(use_with tcmalloc) +} + +src_install() { + default + + prune_libtool_files --all + + rmdir "${ED}/usr/sbin" + + exeinto /usr/$(get_libdir)/ceph + newexe src/init-ceph ceph_init.sh + + insinto /etc/logrotate.d/ + newins src/logrotate.conf ${PN} + + chmod 644 "${ED}"/usr/share/doc/${PF}/sample.* + + keepdir /var/lib/${PN} + keepdir /var/lib/${PN}/tmp + keepdir /var/log/${PN}/stat + + newinitd "${T}/${PN}.initd" ${PN} + newconfd "${FILESDIR}/${PN}.confd" ${PN} +} diff --git a/sys-fs/aufs-util/Manifest b/sys-fs/aufs-util/Manifest index ec9c30ef1845..63e812f15655 100644 --- a/sys-fs/aufs-util/Manifest +++ b/sys-fs/aufs-util/Manifest @@ -1 +1,2 @@ DIST aufs-util-3.6.tar.xz 76104 SHA256 aa5e8275d33933cbbacc68a65d0b48812917d38e3839b2411f76c0efc3ddcb37 SHA512 e73513a549879c26e354bf642c0fe08d7d98299f877519dc654045d6d8d145df7f6cddbd7f0922fbcbd250d9118e505775328aaf7bbdfc0b507d5e93fab69f36 WHIRLPOOL ea0767baf7ef759e1f018f9b6467ce0e64f1684de7c494fca73fd9b79823f2b36924cceea958d9890b22699b09b632d47afcf95bd8cd1510bad0f4c488966851 +DIST aufs-util-3.7.tar.xz 76252 SHA256 1353f2d73443f921ca9968cf4a4ce281c0c22ee4c4b506179757275b74bc3cc2 SHA512 765a12d0d35a97efc81d16badca5ec45fc92ceb21666a21788e76de8a05d408ff501fcc5703ea80f77db78ff36e7772ef922804817ed695f0fdd10b9e44e4457 WHIRLPOOL 103e1ba3d58b24418d7e43d3097f51160d4443d5e89fae5c1c44937d2bc2b05160fdf2d7c835a25072a1873ef6e547b53d122a4800d6c519992027dae3d07f87 diff --git a/sys-fs/aufs-util/aufs-util-3.6.ebuild b/sys-fs/aufs-util/aufs-util-3.6.ebuild index 6d23a3dbf649..236c60888a7b 100644 --- a/sys-fs/aufs-util/aufs-util-3.6.ebuild +++ b/sys-fs/aufs-util/aufs-util-3.6.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/sys-fs/aufs-util/aufs-util-3.6.ebuild,v 1.4 2012/12/21 09:19:28 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs-util/aufs-util-3.6.ebuild,v 1.5 2013/01/14 09:17:22 jlec Exp $ EAPI=5 @@ -11,7 +11,7 @@ HOMEPAGE="http://aufs.sourceforge.net/" SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz" # git archive -v --prefix=aufs-util-3.6/ \ # --remote=git://aufs.git.sourceforge.net/gitroot/aufs/aufs-util.git aufs3.0 \ -# -o aufs-util-3.6.tar.xz +# -o aufs-util-3.6.tar && xz -ve9 aufs-util-3.6.tar SLOT="0" LICENSE="GPL-2" diff --git a/sys-fs/aufs-util/aufs-util-3.7.ebuild b/sys-fs/aufs-util/aufs-util-3.7.ebuild new file mode 100644 index 000000000000..f45e4a53b495 --- /dev/null +++ b/sys-fs/aufs-util/aufs-util-3.7.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs-util/aufs-util-3.7.ebuild,v 1.1 2013/01/14 09:17:22 jlec Exp $ + +EAPI=5 + +inherit flag-o-matic linux-info multilib toolchain-funcs + +DESCRIPTION="Utilities are always necessary for aufs" +HOMEPAGE="http://aufs.sourceforge.net/" +SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz" +# git archive -v --prefix=aufs-util-3.7/ \ +# --remote=git://aufs.git.sourceforge.net/gitroot/aufs/aufs-util.git aufs3.0 \ +# -o aufs-util-3.7.tar && xz -ve9 aufs-util-3.7.tar + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + !sys-fs/aufs2 + !sys-fs/aufs3 + sys-kernel/aufs-sources" +DEPEND="${RDEPEND}" + +CONFIG_CHECK="~AUFS_FS" +ERROR_AUFS_FS="In order to mount aufs you need to enable CONFIG_AUFS_FS in your kernel" + +src_prepare() { + [[ -e "${KERNEL_DIR}"/include/uapi/linux/aufs_type.h ]] || \ + die "Please select aufs-sources before building ${PN}" + append-cppflags -I"${KERNEL_DIR}/include" + sed \ + -e "/LDFLAGS += -static -s/d" \ + -e "/CFLAGS/s:-O::g" \ + -i Makefile || die + sed \ + -e "s:m 644 -s:m 644:g" \ + -e "s:/usr/lib:/usr/$(get_libdir):g" \ + -i libau/Makefile || die + + tc-export CC AR + export HOSTCC=$(tc-getCC) +} diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest index ef8b934c6fb1..141c189acbbf 100644 --- a/sys-fs/aufs3/Manifest +++ b/sys-fs/aufs3/Manifest @@ -1,6 +1,4 @@ DIST aufs3-3_p20120813.tar.xz 1594656 SHA256 549b496e42b96d05e428a8deb5f1fc6c3dcaa1630c9b9d36d683eebf3546ac4c SHA512 deb6cfa132a2c99a12d36db0d199b3cd2be598392273f543ad80387be8f9669c0bd82dd11fe2e1739a039eac6fce7e3098d50f15450bc6a5ce5b4afa3dd5d95a WHIRLPOOL 0d59b023ccb5baa7c51fc662bf6597aac4160873ff3396a5f1be61d47c5593a5b982321fce1a1afdd92c312425a7d8a0c56961da81c42b18f80c286232030e63 -DIST aufs3-3_p20121015.tar.xz 1630636 SHA256 0fb39ec5cc3f96dabc4d907ecb96f13be7377bbff011d7e4d2d909dad59a3d86 SHA512 4621408a3289c847232c1c5dc0ab72a0f282e387ce2e91a147f1f620aaa9a782be4d27ca7f84e3dd890379062c77d617e9db9af53d3a81f8774c90dc44e7d36e WHIRLPOOL 48105aacd40d9ef113813eb62e18f946df3e0fca7d60d394b260d670ff11576f75ba4fb8033dbc27dc73416f67dfc2c4d59f10261f7e654f1e07c2dd80c1aeda -DIST aufs3-3_p20121112.tar.xz 1721960 SHA256 f9189e971b49cf0dc038a1567338e502e0f822a9c004836f083c7be201f95ac2 SHA512 6ebaf776e201a35a8d1b7b976575364b562ffc7921775a137b5751ab97cb40f4477f8b253511bac54149d5aa2d751e973964530c80e6c3205219d86662f1aeed WHIRLPOOL ae9b01074542e57ab4b3761f25696995bb5c82632f7faf8ff84a0b03a55370648c23542f2e750eb28ce06ab353bdce5bf5819144b3473875348dacc52bae2010 -DIST aufs3-3_p20121129.tar.xz 1798460 SHA256 7c5a65e22d328ca9b1c99800af1df297b46310acb5614fa1a994ae2c44e1242a SHA512 e20106759ede87d4b7cd12c4b1785c13aa2fcb10aef65616e60da6356fad3af5c6520dbfbfeee59c013e64b695eba21258570564008cb4f3bcc5a0270e2d7537 WHIRLPOOL beff80992818b195440edf8abb1cced44c3857fe96a886db358d3d999c1e657deedaabfaa941850feb786e9df1e689865c050ee7ee1c9dba7b973cfced7a4d2b DIST aufs3-3_p20121210.tar.xz 1932988 SHA256 931488f2880d2ea26108328777d56ab0ad56764af15f3094fcc02263f9b75e4a SHA512 436719a0a92ca9732edbca19953d586ae3517c1884965ad4e2fccb2638065a51086184e4a0fd1abe1039b8345b2c19b7c5949468c978570e9517549459566c4d WHIRLPOOL d0bdf0c10217dce7dd255f8be7f53b87ce77d403ae099ad87a3ba2dcec107d39e408232501c997baaa3d37921922f2d34b6b62e9fe8af4ab4ce52712148b8072 DIST aufs3-3_p20130107.tar.xz 2311936 SHA256 6a40835128ca30233035dc08dca4eee0e37218e61e8cdfdd7fef6d3b660e4052 SHA512 a900543b8ca2ee7ebe39371963622d59c14a5ba1be95c045dd067cb9500912f3347064bbe1234c5774f958430b5b807b6c32633c650b155c399c16fc13fea73b WHIRLPOOL e429d0617123ce0a5ce943269474da0996d9fdb80cd4fe8a00190b8c37f993a22c73c8a33cda82b2507ed7f9207f04e9ee01d694f348cbffb7cc04733a6311d8 +DIST aufs3-3_p20130114.tar.xz 2390020 SHA256 6adf0504a6599685ad3757399a44875aae0a44cd70a04f7de7a780cf4d095e90 SHA512 0c8ea9be38ec64d0462f9a4b33934487654abf71f51d9bcd7df0a4a3e868f47b2489bd981805cc3b1615c41e57c7ec614dedcb6d921ace91360cd70207fcf4ba WHIRLPOOL 3954f3abc878051beef4d251dfd7dbf49f1a188b42aeb1509a3c1523a5aeb48dce0a5ec0bf757f55e4e886b760b7d65494ef9ba92f05fd1f66ee46d01c5d0f87 diff --git a/sys-fs/aufs3/aufs3-3_p20121015-r1.ebuild b/sys-fs/aufs3/aufs3-3_p20121015-r1.ebuild deleted file mode 100644 index d8afbcf622ee..000000000000 --- a/sys-fs/aufs3/aufs3-3_p20121015-r1.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20121015-r1.ebuild,v 1.3 2012/11/26 20:36:26 jlec Exp $ - -EAPI=4 - -inherit eutils flag-o-matic linux-mod multilib toolchain-funcs - -AUFS_VERSION="${PV%%_p*}" -# highest branch version -PATCH_MAX_VER=6 -# highest supported version -KERN_MAX_VER=7 -# highest util branch version -UTIL_MAX_VER=0 - -DESCRIPTION="An entirely re-designed and re-implemented Unionfs" -HOMEPAGE="http://aufs.sourceforge.net/" -SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs" - -DEPEND="dev-vcs/git" -RDEPEND=" - !sys-fs/aufs - !sys-fs/aufs2" - -S="${WORKDIR}"/${PN}-standalone - -MODULE_NAMES="aufs(misc:${S})" - -pkg_setup() { - CONFIG_CHECK="${CONFIG_CHECK} ~EXPERIMENTAL !AUFS_FS" - use inotify && CONFIG_CHECK="${CONFIG_CHECK} ~FSNOTIFY" - use nfs && CONFIG_CHECK="${CONFIG_CHECK} EXPORTFS" - use fuse && CONFIG_CHECK="${CONFIG_CHECK} ~FUSE_FS" - use hfs && CONFIG_CHECK="${CONFIG_CHECK} ~HFSPLUS_FS" - - # this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system - [ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return - - get_version - kernel_is lt 3 0 0 && die "kernel too old, Please use sys-fs/aufs2" - kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new" - - linux-mod_pkg_setup - - if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then - PATCH_BRANCH="x-rcN" - else - PATCH_BRANCH="${KV_MINOR}" - fi - - if [[ "${PATCH_BRANCH}" == "x-rcN" ]]; then - UTIL_BRANCH="x-rcN" - elif [[ "${KV_MINOR}" -gt "${UTIL_MAX_VER}" ]]; then - UTIL_BRANCH="${UTIL_MAX_VER}" - else - UTIL_BRANCH="${KV_MINOR}" - fi - - if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${PATCH_BRANCH}.patch >/dev/null && \ - patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_BRANCH}.patch >/dev/null ); then - if use kernel-patch; then - cd ${KV_DIR} - ewarn "Patching your kernel..." - patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${PATCH_BRANCH}.patch >/dev/null - patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_BRANCH}.patch >/dev/null - epatch "${FILESDIR}"/${PN}-{base,standalone}-${PATCH_BRANCH}.patch - ewarn "You need to compile your kernel with the applied patch" - ewarn "to be able to load and use the aufs kernel module" - else - eerror "You need to apply a patch to your kernel to compile and run the ${PN} module" - eerror "Either enable the kernel-patch useflag to do it with this ebuild" - eerror "or apply ${FILESDIR}/${PN}-base-${PATCH_BRANCH}.patch and" - eerror "${FILESDIR}/${PN}-standalone-${PATCH_BRANCH}.patch by hand" - die "missing kernel patch, please apply it first" - fi - fi - export PKG_SETUP_HAS_BEEN_RAN=1 -} - -set_config() { - for option in $*; do - grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option" - sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die - done -} - -src_prepare() { - local module_branch=origin/${PN}.${PATCH_BRANCH} - local util_branch=origin/${PN}.${UTIL_BRANCH} - - einfo "Using for module creation branch ${module_branch}" - git checkout -q -b local-gentoo ${module_branch} || die - - # All config options to off - sed "s:= y:=:g" -i config.mk || die - - set_config RDU BRANCH_MAX_127 SBILIST - - use debug && set_config DEBUG - use fuse && set_config BR_FUSE POLL - use hfs && set_config BR_HFSPLUS - use inotify && set_config HNOTIFY HFSNOTIFY - use nfs && set_config EXPORT - use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64 - use ramfs && set_config BR_RAMFS - - use pax_kernel && epatch "${FILESDIR}"/pax-2.patch - - sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die - sed -i "s:__user::g" include/linux/aufs_type.h || die - - cd "${WORKDIR}"/${PN/3}-util - - einfo "Using for utils building branch ${util_branch}" - git checkout -b local-gentoo ${util_branch} || die - sed -i "/LDFLAGS += -static -s/d" Makefile || die - sed -i -e "s:m 644 -s:m 644:g" -e "s:/usr/lib:/usr/$(get_libdir):g" libau/Makefile || die -} - -src_compile() { - local ARCH=x86 - - emake CC=$(tc-getCC) LD=$(tc-getLD) LDFLAGS="$(raw-ldflags)" ARCH=$(tc-arch-kernel) CONFIG_AUFS_FS=m KDIR=${KV_OUT_DIR} - - cd "${WORKDIR}"/${PN/3}-util - emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_OUT_DIR} C_INCLUDE_PATH="${S}"/include -} - -src_install() { - linux-mod_src_install - - insinto /usr/share/doc/${PF} - - use doc && doins -r Documentation - - dodoc Documentation/filesystems/aufs/README - - cd "${WORKDIR}"/${PN/3}-util - emake DESTDIR="${D}" KDIR=${KV_OUT_DIR} install - - newdoc README README-utils -} diff --git a/sys-fs/aufs3/aufs3-3_p20121015.ebuild b/sys-fs/aufs3/aufs3-3_p20121015.ebuild deleted file mode 100644 index e4ce611b3a18..000000000000 --- a/sys-fs/aufs3/aufs3-3_p20121015.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20121015.ebuild,v 1.4 2012/11/26 20:36:26 jlec Exp $ - -EAPI=4 - -inherit eutils flag-o-matic linux-mod multilib toolchain-funcs - -AUFS_VERSION="${PV%%_p*}" -# highest branch version -PATCH_MAX_VER=6 -# highest supported version -KERN_MAX_VER=7 -# highest util branch version -UTIL_MAX_VER=0 - -DESCRIPTION="An entirely re-designed and re-implemented Unionfs" -HOMEPAGE="http://aufs.sourceforge.net/" -SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs" - -DEPEND="dev-vcs/git" -RDEPEND=" - !sys-fs/aufs - !sys-fs/aufs2" - -S="${WORKDIR}"/${PN}-standalone - -MODULE_NAMES="aufs(misc:${S})" - -pkg_setup() { - CONFIG_CHECK="${CONFIG_CHECK} ~EXPERIMENTAL !AUFS_FS" - use inotify && CONFIG_CHECK="${CONFIG_CHECK} ~FSNOTIFY" - use nfs && CONFIG_CHECK="${CONFIG_CHECK} EXPORTFS" - use fuse && CONFIG_CHECK="${CONFIG_CHECK} ~FUSE_FS" - use hfs && CONFIG_CHECK="${CONFIG_CHECK} ~HFSPLUS_FS" - - # this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system - [ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return - - get_version - kernel_is lt 3 0 0 && die "kernel too old, Please use sys-fs/aufs2" - kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new" - - linux-mod_pkg_setup - - if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then - PATCH_BRANCH="x-rcN" - else - PATCH_BRANCH="${KV_MINOR}" - fi - - if [[ "${PATCH_BRANCH}" == "x-rcN" ]]; then - UTIL_BRANCH="x-rcN" - elif [[ "${KV_MINOR}" -gt "${UTIL_MAX_VER}" ]]; then - UTIL_BRANCH="${UTIL_MAX_VER}" - else - UTIL_BRANCH="${KV_MINOR}" - fi - - if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${PATCH_BRANCH}.patch >/dev/null && \ - patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_BRANCH}.patch >/dev/null ); then - if use kernel-patch; then - cd ${KV_DIR} - ewarn "Patching your kernel..." - patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${PATCH_BRANCH}.patch >/dev/null - patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_BRANCH}.patch >/dev/null - epatch "${FILESDIR}"/${PN}-{base,standalone}-${PATCH_BRANCH}.patch - ewarn "You need to compile your kernel with the applied patch" - ewarn "to be able to load and use the aufs kernel module" - else - eerror "You need to apply a patch to your kernel to compile and run the ${PN} module" - eerror "Either enable the kernel-patch useflag to do it with this ebuild" - eerror "or apply ${FILESDIR}/${PN}-base-${PATCH_BRANCH}.patch and" - eerror "${FILESDIR}/${PN}-standalone-${PATCH_BRANCH}.patch by hand" - die "missing kernel patch, please apply it first" - fi - fi - export PKG_SETUP_HAS_BEEN_RAN=1 -} - -set_config() { - for option in $*; do - grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option" - sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die - done -} - -src_prepare() { - local module_branch=origin/${PN}.${PATCH_BRANCH} - local util_branch=origin/${PN}.${UTIL_BRANCH} - - einfo "Using for module creation branch ${module_branch}" - git checkout -q -b local-gentoo ${module_branch} || die - - # All config options to off - sed "s:= y:=:g" -i config.mk || die - - set_config RDU BRANCH_MAX_127 SBILIST - - use debug && set_config DEBUG - use fuse && set_config BR_FUSE POLL - use hfs && set_config BR_HFSPLUS - use inotify && set_config HNOTIFY HFSNOTIFY - use nfs && set_config EXPORT - use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64 - use ramfs && set_config BR_RAMFS - - use pax_kernel && epatch "${FILESDIR}"/pax.patch - - sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die - sed -i "s:__user::g" include/linux/aufs_type.h || die - - cd "${WORKDIR}"/${PN/3}-util - - einfo "Using for utils building branch ${util_branch}" - git checkout -b local-gentoo ${util_branch} || die - sed -i "/LDFLAGS += -static -s/d" Makefile || die - sed -i -e "s:m 644 -s:m 644:g" -e "s:/usr/lib:/usr/$(get_libdir):g" libau/Makefile || die -} - -src_compile() { - local ARCH=x86 - - emake CC=$(tc-getCC) LD=$(tc-getLD) LDFLAGS="$(raw-ldflags)" ARCH=$(tc-arch-kernel) CONFIG_AUFS_FS=m KDIR=${KV_OUT_DIR} - - cd "${WORKDIR}"/${PN/3}-util - emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_OUT_DIR} C_INCLUDE_PATH="${S}"/include -} - -src_install() { - linux-mod_src_install - - insinto /usr/share/doc/${PF} - - use doc && doins -r Documentation - - dodoc Documentation/filesystems/aufs/README - - cd "${WORKDIR}"/${PN/3}-util - emake DESTDIR="${D}" KDIR=${KV_OUT_DIR} install - - newdoc README README-utils -} diff --git a/sys-fs/aufs3/aufs3-3_p20121112.ebuild b/sys-fs/aufs3/aufs3-3_p20121112.ebuild deleted file mode 100644 index ad6e21ac555d..000000000000 --- a/sys-fs/aufs3/aufs3-3_p20121112.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20121112.ebuild,v 1.3 2012/11/26 20:36:26 jlec Exp $ - -EAPI=4 - -inherit eutils flag-o-matic linux-mod multilib toolchain-funcs - -AUFS_VERSION="${PV%%_p*}" -# highest branch version -PATCH_MAX_VER=6 -# highest supported version -KERN_MAX_VER=7 -# highest util branch version -UTIL_MAX_VER=0 - -DESCRIPTION="An entirely re-designed and re-implemented Unionfs" -HOMEPAGE="http://aufs.sourceforge.net/" -SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs" - -DEPEND="dev-vcs/git" -RDEPEND=" - !sys-fs/aufs - !sys-fs/aufs2" - -S="${WORKDIR}"/${PN}-standalone - -MODULE_NAMES="aufs(misc:${S})" - -pkg_setup() { - CONFIG_CHECK="${CONFIG_CHECK} ~EXPERIMENTAL !AUFS_FS" - use inotify && CONFIG_CHECK="${CONFIG_CHECK} ~FSNOTIFY" - use nfs && CONFIG_CHECK="${CONFIG_CHECK} EXPORTFS" - use fuse && CONFIG_CHECK="${CONFIG_CHECK} ~FUSE_FS" - use hfs && CONFIG_CHECK="${CONFIG_CHECK} ~HFSPLUS_FS" - - # this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system - [ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return - - get_version - kernel_is lt 3 0 0 && die "kernel too old, Please use sys-fs/aufs2" - kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new" - - linux-mod_pkg_setup - - if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then - PATCH_BRANCH="x-rcN" - else - PATCH_BRANCH="${KV_MINOR}" - fi - - if [[ "${PATCH_BRANCH}" == "x-rcN" ]]; then - UTIL_BRANCH="x-rcN" - elif [[ "${KV_MINOR}" -gt "${UTIL_MAX_VER}" ]]; then - UTIL_BRANCH="${UTIL_MAX_VER}" - else - UTIL_BRANCH="${KV_MINOR}" - fi - - if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PV}/${PN}-standalone-${PATCH_BRANCH}.patch >/dev/null && \ - patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PV}/${PN}-base-${PATCH_BRANCH}.patch >/dev/null ); then - if use kernel-patch; then - cd ${KV_DIR} - ewarn "Patching your kernel..." - patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PV}/${PN}-standalone-${PATCH_BRANCH}.patch >/dev/null - patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PV}/${PN}-base-${PATCH_BRANCH}.patch >/dev/null - epatch "${FILESDIR}"/${PV}/${PN}-{base,standalone}-${PATCH_BRANCH}.patch - ewarn "You need to compile your kernel with the applied patch" - ewarn "to be able to load and use the aufs kernel module" - else - eerror "You need to apply a patch to your kernel to compile and run the ${PN} module" - eerror "Either enable the kernel-patch useflag to do it with this ebuild" - eerror "or apply ${FILESDIR}/${PN}-base-${PATCH_BRANCH}.patch and" - eerror "${FILESDIR}/${PN}-standalone-${PATCH_BRANCH}.patch by hand" - die "missing kernel patch, please apply it first" - fi - fi - export PKG_SETUP_HAS_BEEN_RAN=1 -} - -set_config() { - for option in $*; do - grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option" - sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die - done -} - -src_prepare() { - local module_branch=origin/${PN}.${PATCH_BRANCH} - local util_branch=origin/${PN}.${UTIL_BRANCH} - - einfo "Using for module creation branch ${module_branch}" - git checkout -q -b local-gentoo ${module_branch} || die - - # All config options to off - sed "s:= y:=:g" -i config.mk || die - - set_config RDU BRANCH_MAX_127 SBILIST - - use debug && set_config DEBUG - use fuse && set_config BR_FUSE POLL - use hfs && set_config BR_HFSPLUS - use inotify && set_config HNOTIFY HFSNOTIFY - use nfs && set_config EXPORT - use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64 - use ramfs && set_config BR_RAMFS - - use pax_kernel && epatch "${FILESDIR}"/pax-2.patch - - sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die - sed -i "s:__user::g" include/linux/aufs_type.h || die - - cd "${WORKDIR}"/${PN/3}-util - - einfo "Using for utils building branch ${util_branch}" - git checkout -b local-gentoo ${util_branch} || die - sed -i "/LDFLAGS += -static -s/d" Makefile || die - sed -i -e "s:m 644 -s:m 644:g" -e "s:/usr/lib:/usr/$(get_libdir):g" libau/Makefile || die -} - -src_compile() { - local ARCH=x86 - - emake CC=$(tc-getCC) LD=$(tc-getLD) LDFLAGS="$(raw-ldflags)" ARCH=$(tc-arch-kernel) CONFIG_AUFS_FS=m KDIR=${KV_OUT_DIR} - - cd "${WORKDIR}"/${PN/3}-util - emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_OUT_DIR} C_INCLUDE_PATH="${S}"/include -} - -src_install() { - linux-mod_src_install - - insinto /usr/share/doc/${PF} - - use doc && doins -r Documentation - - dodoc Documentation/filesystems/aufs/README - - cd "${WORKDIR}"/${PN/3}-util - emake DESTDIR="${D}" KDIR=${KV_OUT_DIR} install - - newdoc README README-utils -} diff --git a/sys-fs/aufs3/aufs3-3_p20121129.ebuild b/sys-fs/aufs3/aufs3-3_p20130114.ebuild similarity index 77% rename from sys-fs/aufs3/aufs3-3_p20121129.ebuild rename to sys-fs/aufs3/aufs3-3_p20130114.ebuild index b1989e1ab6e3..337f3c3b2428 100644 --- a/sys-fs/aufs3/aufs3-3_p20121129.ebuild +++ b/sys-fs/aufs3/aufs3-3_p20130114.ebuild @@ -1,16 +1,16 @@ -# 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/sys-fs/aufs3/aufs3-3_p20121129.ebuild,v 1.3 2012/12/05 13:37:42 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20130114.ebuild,v 1.1 2013/01/14 08:55:06 jlec Exp $ -EAPI=4 +EAPI=5 inherit eutils flag-o-matic linux-mod multilib toolchain-funcs AUFS_VERSION="${PV%%_p*}" # highest branch version -PATCH_MAX_VER=6 +PATCH_MAX_VER=7 # highest supported version -KERN_MAX_VER=7 +KERN_MAX_VER=8 # highest util branch version UTIL_MAX_VER=0 @@ -23,7 +23,9 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs" -DEPEND="dev-vcs/git" +DEPEND=" + dev-util/patchutils + dev-vcs/git" RDEPEND=" !sys-fs/aufs !sys-fs/aufs2" @@ -63,24 +65,28 @@ pkg_setup() { UTIL_BRANCH="${KV_MINOR}" fi - if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PV}/${PN}-standalone-${PATCH_BRANCH}.patch >/dev/null && \ - patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PV}/${PN}-base-${PATCH_BRANCH}.patch >/dev/null ); then + pushd "${T}" &> /dev/null + unpack ${A} + cd ${P}/${PN}-standalone + local module_branch=origin/${PN}.${PATCH_BRANCH} + git checkout -q -b local-gentoo ${module_branch} || die + combinediff ${PN}-base.patch ${PN}-standalone.patch > ${PN}-standalone-base-combined.patch + if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-combined.patch > /dev/null ); then if use kernel-patch; then cd ${KV_DIR} ewarn "Patching your kernel..." - patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PV}/${PN}-standalone-${PATCH_BRANCH}.patch >/dev/null - patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PV}/${PN}-base-${PATCH_BRANCH}.patch >/dev/null - epatch "${FILESDIR}"/${PV}/${PN}-{base,standalone}-${PATCH_BRANCH}.patch + patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${P}/${PN}-standalone/${PN}-standalone-base-combined.patch >/dev/null + epatch "${T}"/${P}/${PN}-standalone/${PN}-standalone-base-combined.patch ewarn "You need to compile your kernel with the applied patch" ewarn "to be able to load and use the aufs kernel module" else eerror "You need to apply a patch to your kernel to compile and run the ${PN} module" eerror "Either enable the kernel-patch useflag to do it with this ebuild" - eerror "or apply ${FILESDIR}/${PN}-base-${PATCH_BRANCH}.patch and" - eerror "${FILESDIR}/${PN}-standalone-${PATCH_BRANCH}.patch by hand" + eerror "or apply ${EPRFIX}/usr/share/doc/${PF}/${PN}-standalone-base-combined.patch by hand" die "missing kernel patch, please apply it first" fi fi + popd &> /dev/null export PKG_SETUP_HAS_BEEN_RAN=1 } @@ -114,7 +120,11 @@ src_prepare() { use pax_kernel && epatch "${FILESDIR}"/pax-2.patch sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die - sed -i "s:__user::g" include/linux/aufs_type.h || die + if [[ ${KV_MINOR} -lt 7 ]]; then + sed -i "s:__user::g" include/linux/aufs_type.h || die + else + sed -i "s:__user::g" include/uapi/linux/aufs_type.h || die + fi cd "${WORKDIR}"/${P}/${PN/3}-util @@ -140,6 +150,8 @@ src_install() { use doc && doins -r Documentation + use kernel-patch || doins "${T}"/${P}/${PN}-standalone/${PN}-standalone-base-combined.patch + dodoc Documentation/filesystems/aufs/README cd "${WORKDIR}"/${P}/${PN/3}-util diff --git a/sys-fs/aufs3/files/3_p20121112/aufs3-base-0.patch b/sys-fs/aufs3/files/3_p20121112/aufs3-base-0.patch deleted file mode 100644 index 7fa7db4ee6c7..000000000000 --- a/sys-fs/aufs3/files/3_p20121112/aufs3-base-0.patch +++ /dev/null @@ -1,70 +0,0 @@ -aufs3.0 base patch - -diff --git a/fs/namei.c b/fs/namei.c -index 14ab8d3..eb4aef1 100644 ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -1697,7 +1697,7 @@ static struct dentry *__lookup_hash(struct qstr *name, - * needs parent already locked. Doesn't follow mounts. - * SMP-safe. - */ --static struct dentry *lookup_hash(struct nameidata *nd) -+struct dentry *lookup_hash(struct nameidata *nd) - { - return __lookup_hash(&nd->last, nd->path.dentry, nd); - } -diff --git a/fs/splice.c b/fs/splice.c -index aa866d3..19afec6 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1085,8 +1085,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); - /* - * Attempt to initiate a splice from pipe to file. - */ --static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -- loff_t *ppos, size_t len, unsigned int flags) -+long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags) - { - ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, - loff_t *, size_t, unsigned int); -@@ -1113,9 +1113,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - /* - * Attempt to initiate a splice from a file to a pipe. - */ --static long do_splice_to(struct file *in, loff_t *ppos, -- struct pipe_inode_info *pipe, size_t len, -- unsigned int flags) -+long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags) - { - ssize_t (*splice_read)(struct file *, loff_t *, - struct pipe_inode_info *, size_t, unsigned int); -diff --git a/include/linux/namei.h b/include/linux/namei.h -index eba45ea..21ed6c9 100644 ---- a/include/linux/namei.h -+++ b/include/linux/namei.h -@@ -82,6 +82,7 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *, - extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry, - int (*open)(struct inode *, struct file *)); - -+extern struct dentry *lookup_hash(struct nameidata *nd); - extern struct dentry *lookup_one_len(const char *, struct dentry *, int); - - extern int follow_down_one(struct path *); -diff --git a/include/linux/splice.h b/include/linux/splice.h -index 997c3b4..be9a153 100644 ---- a/include/linux/splice.h -+++ b/include/linux/splice.h -@@ -89,4 +89,10 @@ extern int splice_grow_spd(struct pipe_inode_info *, struct splice_pipe_desc *); - extern void splice_shrink_spd(struct pipe_inode_info *, - struct splice_pipe_desc *); - -+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags); -+extern long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags); -+ - #endif diff --git a/sys-fs/aufs3/files/3_p20121112/aufs3-base-1.patch b/sys-fs/aufs3/files/3_p20121112/aufs3-base-1.patch deleted file mode 100644 index 928c3cec768c..000000000000 --- a/sys-fs/aufs3/files/3_p20121112/aufs3-base-1.patch +++ /dev/null @@ -1,70 +0,0 @@ -aufs3.1 base patch - -diff --git a/fs/namei.c b/fs/namei.c -index 0b3138d..8edad02 100644 ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -1748,7 +1748,7 @@ static struct dentry *__lookup_hash(struct qstr *name, - * needs parent already locked. Doesn't follow mounts. - * SMP-safe. - */ --static struct dentry *lookup_hash(struct nameidata *nd) -+struct dentry *lookup_hash(struct nameidata *nd) - { - return __lookup_hash(&nd->last, nd->path.dentry, nd); - } -diff --git a/fs/splice.c b/fs/splice.c -index fa2defa..e3569b0 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1085,8 +1085,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); - /* - * Attempt to initiate a splice from pipe to file. - */ --static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -- loff_t *ppos, size_t len, unsigned int flags) -+long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags) - { - ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, - loff_t *, size_t, unsigned int); -@@ -1113,9 +1113,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - /* - * Attempt to initiate a splice from a file to a pipe. - */ --static long do_splice_to(struct file *in, loff_t *ppos, -- struct pipe_inode_info *pipe, size_t len, -- unsigned int flags) -+long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags) - { - ssize_t (*splice_read)(struct file *, loff_t *, - struct pipe_inode_info *, size_t, unsigned int); -diff --git a/include/linux/namei.h b/include/linux/namei.h -index 409328d..40afdc0 100644 ---- a/include/linux/namei.h -+++ b/include/linux/namei.h -@@ -84,6 +84,7 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *, - extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry, - int (*open)(struct inode *, struct file *)); - -+extern struct dentry *lookup_hash(struct nameidata *nd); - extern struct dentry *lookup_one_len(const char *, struct dentry *, int); - - extern int follow_down_one(struct path *); -diff --git a/include/linux/splice.h b/include/linux/splice.h -index 26e5b61..3ffef2f 100644 ---- a/include/linux/splice.h -+++ b/include/linux/splice.h -@@ -91,4 +91,10 @@ extern void splice_shrink_spd(struct pipe_inode_info *, - extern void spd_release_page(struct splice_pipe_desc *, unsigned int); - - extern const struct pipe_buf_operations page_cache_pipe_buf_ops; -+ -+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags); -+extern long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags); - #endif diff --git a/sys-fs/aufs3/files/3_p20121112/aufs3-base-2.patch b/sys-fs/aufs3/files/3_p20121112/aufs3-base-2.patch deleted file mode 100644 index ac30c8db9033..000000000000 --- a/sys-fs/aufs3/files/3_p20121112/aufs3-base-2.patch +++ /dev/null @@ -1,70 +0,0 @@ -aufs3.2 base patch - -diff --git a/fs/namei.c b/fs/namei.c -index 5008f01..4cc94cf 100644 ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -1753,7 +1753,7 @@ static struct dentry *__lookup_hash(struct qstr *name, - * needs parent already locked. Doesn't follow mounts. - * SMP-safe. - */ --static struct dentry *lookup_hash(struct nameidata *nd) -+struct dentry *lookup_hash(struct nameidata *nd) - { - return __lookup_hash(&nd->last, nd->path.dentry, nd); - } -diff --git a/fs/splice.c b/fs/splice.c -index fa2defa..e3569b0 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1085,8 +1085,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); - /* - * Attempt to initiate a splice from pipe to file. - */ --static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -- loff_t *ppos, size_t len, unsigned int flags) -+long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags) - { - ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, - loff_t *, size_t, unsigned int); -@@ -1113,9 +1113,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - /* - * Attempt to initiate a splice from a file to a pipe. - */ --static long do_splice_to(struct file *in, loff_t *ppos, -- struct pipe_inode_info *pipe, size_t len, -- unsigned int flags) -+long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags) - { - ssize_t (*splice_read)(struct file *, loff_t *, - struct pipe_inode_info *, size_t, unsigned int); -diff --git a/include/linux/namei.h b/include/linux/namei.h -index ffc0213..ef35a31 100644 ---- a/include/linux/namei.h -+++ b/include/linux/namei.h -@@ -85,6 +85,7 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *, - extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry, - int (*open)(struct inode *, struct file *)); - -+extern struct dentry *lookup_hash(struct nameidata *nd); - extern struct dentry *lookup_one_len(const char *, struct dentry *, int); - - extern int follow_down_one(struct path *); -diff --git a/include/linux/splice.h b/include/linux/splice.h -index 26e5b61..3ffef2f 100644 ---- a/include/linux/splice.h -+++ b/include/linux/splice.h -@@ -91,4 +91,10 @@ extern void splice_shrink_spd(struct pipe_inode_info *, - extern void spd_release_page(struct splice_pipe_desc *, unsigned int); - - extern const struct pipe_buf_operations page_cache_pipe_buf_ops; -+ -+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags); -+extern long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags); - #endif diff --git a/sys-fs/aufs3/files/3_p20121112/aufs3-base-3.patch b/sys-fs/aufs3/files/3_p20121112/aufs3-base-3.patch deleted file mode 100644 index 99a63d024c3c..000000000000 --- a/sys-fs/aufs3/files/3_p20121112/aufs3-base-3.patch +++ /dev/null @@ -1,70 +0,0 @@ -aufs3.3 base patch - -diff --git a/fs/namei.c b/fs/namei.c -index 46ea9cc..f2dcf8d 100644 ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -1781,7 +1781,7 @@ static struct dentry *__lookup_hash(struct qstr *name, - * needs parent already locked. Doesn't follow mounts. - * SMP-safe. - */ --static struct dentry *lookup_hash(struct nameidata *nd) -+struct dentry *lookup_hash(struct nameidata *nd) - { - return __lookup_hash(&nd->last, nd->path.dentry, nd); - } -diff --git a/fs/splice.c b/fs/splice.c -index 1ec0493..c599f73 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1084,8 +1084,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); - /* - * Attempt to initiate a splice from pipe to file. - */ --static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -- loff_t *ppos, size_t len, unsigned int flags) -+long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags) - { - ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, - loff_t *, size_t, unsigned int); -@@ -1112,9 +1112,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - /* - * Attempt to initiate a splice from a file to a pipe. - */ --static long do_splice_to(struct file *in, loff_t *ppos, -- struct pipe_inode_info *pipe, size_t len, -- unsigned int flags) -+long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags) - { - ssize_t (*splice_read)(struct file *, loff_t *, - struct pipe_inode_info *, size_t, unsigned int); -diff --git a/include/linux/namei.h b/include/linux/namei.h -index ffc0213..ef35a31 100644 ---- a/include/linux/namei.h -+++ b/include/linux/namei.h -@@ -85,6 +85,7 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *, - extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry, - int (*open)(struct inode *, struct file *)); - -+extern struct dentry *lookup_hash(struct nameidata *nd); - extern struct dentry *lookup_one_len(const char *, struct dentry *, int); - - extern int follow_down_one(struct path *); -diff --git a/include/linux/splice.h b/include/linux/splice.h -index 26e5b61..3ffef2f 100644 ---- a/include/linux/splice.h -+++ b/include/linux/splice.h -@@ -91,4 +91,10 @@ extern void splice_shrink_spd(struct pipe_inode_info *, - extern void spd_release_page(struct splice_pipe_desc *, unsigned int); - - extern const struct pipe_buf_operations page_cache_pipe_buf_ops; -+ -+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags); -+extern long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags); - #endif diff --git a/sys-fs/aufs3/files/3_p20121112/aufs3-base-4.patch b/sys-fs/aufs3/files/3_p20121112/aufs3-base-4.patch deleted file mode 100644 index d639d79bd228..000000000000 --- a/sys-fs/aufs3/files/3_p20121112/aufs3-base-4.patch +++ /dev/null @@ -1,70 +0,0 @@ -aufs3.4 base patch - -diff --git a/fs/namei.c b/fs/namei.c -index c427919..7ff959b 100644 ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -1831,7 +1831,7 @@ int vfs_path_lookup(struct dentry *dentry, struct vfsmount *mnt, - * needs parent already locked. Doesn't follow mounts. - * SMP-safe. - */ --static struct dentry *lookup_hash(struct nameidata *nd) -+struct dentry *lookup_hash(struct nameidata *nd) - { - return __lookup_hash(&nd->last, nd->path.dentry, nd); - } -diff --git a/fs/splice.c b/fs/splice.c -index f847684..f871233 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1084,8 +1084,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); - /* - * Attempt to initiate a splice from pipe to file. - */ --static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -- loff_t *ppos, size_t len, unsigned int flags) -+long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags) - { - ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, - loff_t *, size_t, unsigned int); -@@ -1112,9 +1112,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - /* - * Attempt to initiate a splice from a file to a pipe. - */ --static long do_splice_to(struct file *in, loff_t *ppos, -- struct pipe_inode_info *pipe, size_t len, -- unsigned int flags) -+long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags) - { - ssize_t (*splice_read)(struct file *, loff_t *, - struct pipe_inode_info *, size_t, unsigned int); -diff --git a/include/linux/namei.h b/include/linux/namei.h -index ffc0213..ef35a31 100644 ---- a/include/linux/namei.h -+++ b/include/linux/namei.h -@@ -85,6 +85,7 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *, - extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry, - int (*open)(struct inode *, struct file *)); - -+extern struct dentry *lookup_hash(struct nameidata *nd); - extern struct dentry *lookup_one_len(const char *, struct dentry *, int); - - extern int follow_down_one(struct path *); -diff --git a/include/linux/splice.h b/include/linux/splice.h -index 26e5b61..3ffef2f 100644 ---- a/include/linux/splice.h -+++ b/include/linux/splice.h -@@ -91,4 +91,10 @@ extern void splice_shrink_spd(struct pipe_inode_info *, - extern void spd_release_page(struct splice_pipe_desc *, unsigned int); - - extern const struct pipe_buf_operations page_cache_pipe_buf_ops; -+ -+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags); -+extern long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags); - #endif diff --git a/sys-fs/aufs3/files/3_p20121112/aufs3-base-5.patch b/sys-fs/aufs3/files/3_p20121112/aufs3-base-5.patch deleted file mode 100644 index 94a6d9aea862..000000000000 --- a/sys-fs/aufs3/files/3_p20121112/aufs3-base-5.patch +++ /dev/null @@ -1,95 +0,0 @@ -aufs3.5 base patch - -diff --git a/fs/inode.c b/fs/inode.c -index c99163b..7f772fd 100644 ---- a/fs/inode.c -+++ b/fs/inode.c -@@ -1491,7 +1491,7 @@ static int relatime_need_update(struct vfsmount *mnt, struct inode *inode, - * This does the actual work of updating an inodes time or version. Must have - * had called mnt_want_write() before calling this. - */ --static int update_time(struct inode *inode, struct timespec *time, int flags) -+int update_time(struct inode *inode, struct timespec *time, int flags) - { - if (inode->i_op->update_time) - return inode->i_op->update_time(inode, time, flags); -diff --git a/fs/namei.c b/fs/namei.c -index 7d69419..18c9782 100644 ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -1864,7 +1864,7 @@ int vfs_path_lookup(struct dentry *dentry, struct vfsmount *mnt, - * needs parent already locked. Doesn't follow mounts. - * SMP-safe. - */ --static struct dentry *lookup_hash(struct nameidata *nd) -+struct dentry *lookup_hash(struct nameidata *nd) - { - return __lookup_hash(&nd->last, nd->path.dentry, nd); - } -diff --git a/fs/splice.c b/fs/splice.c -index 7bf08fa..e3c40b5 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1090,8 +1090,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); - /* - * Attempt to initiate a splice from pipe to file. - */ --static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -- loff_t *ppos, size_t len, unsigned int flags) -+long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags) - { - ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, - loff_t *, size_t, unsigned int); -@@ -1118,9 +1118,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - /* - * Attempt to initiate a splice from a file to a pipe. - */ --static long do_splice_to(struct file *in, loff_t *ppos, -- struct pipe_inode_info *pipe, size_t len, -- unsigned int flags) -+long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags) - { - ssize_t (*splice_read)(struct file *, loff_t *, - struct pipe_inode_info *, size_t, unsigned int); -diff --git a/include/linux/fs.h b/include/linux/fs.h -index 17fd887..9c75a47 100644 ---- a/include/linux/fs.h -+++ b/include/linux/fs.h -@@ -2591,6 +2591,7 @@ extern int inode_change_ok(const struct inode *, struct iattr *); - extern int inode_newsize_ok(const struct inode *, loff_t offset); - extern void setattr_copy(struct inode *inode, const struct iattr *attr); - -+extern int update_time(struct inode *, struct timespec *, int); - extern int file_update_time(struct file *file); - - extern int generic_show_options(struct seq_file *m, struct dentry *root); -diff --git a/include/linux/namei.h b/include/linux/namei.h -index ffc0213..ef35a31 100644 ---- a/include/linux/namei.h -+++ b/include/linux/namei.h -@@ -85,6 +85,7 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *, - extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry, - int (*open)(struct inode *, struct file *)); - -+extern struct dentry *lookup_hash(struct nameidata *nd); - extern struct dentry *lookup_one_len(const char *, struct dentry *, int); - - extern int follow_down_one(struct path *); -diff --git a/include/linux/splice.h b/include/linux/splice.h -index 09a545a..1ac5727 100644 ---- a/include/linux/splice.h -+++ b/include/linux/splice.h -@@ -91,4 +91,10 @@ extern void splice_shrink_spd(struct splice_pipe_desc *); - extern void spd_release_page(struct splice_pipe_desc *, unsigned int); - - extern const struct pipe_buf_operations page_cache_pipe_buf_ops; -+ -+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags); -+extern long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags); - #endif diff --git a/sys-fs/aufs3/files/3_p20121112/aufs3-base-6.patch b/sys-fs/aufs3/files/3_p20121112/aufs3-base-6.patch deleted file mode 100644 index adb9ab7ccfdb..000000000000 --- a/sys-fs/aufs3/files/3_p20121112/aufs3-base-6.patch +++ /dev/null @@ -1,70 +0,0 @@ -aufs3.6 base patch - -diff --git a/fs/inode.c b/fs/inode.c -index ac8d904..7b2c8fa 100644 ---- a/fs/inode.c -+++ b/fs/inode.c -@@ -1491,7 +1491,7 @@ static int relatime_need_update(struct vfsmount *mnt, struct inode *inode, - * This does the actual work of updating an inodes time or version. Must have - * had called mnt_want_write() before calling this. - */ --static int update_time(struct inode *inode, struct timespec *time, int flags) -+int update_time(struct inode *inode, struct timespec *time, int flags) - { - if (inode->i_op->update_time) - return inode->i_op->update_time(inode, time, flags); -diff --git a/fs/splice.c b/fs/splice.c -index 41514dd..663b402 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1093,8 +1093,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); - /* - * Attempt to initiate a splice from pipe to file. - */ --static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -- loff_t *ppos, size_t len, unsigned int flags) -+long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags) - { - ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, - loff_t *, size_t, unsigned int); -@@ -1121,9 +1121,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - /* - * Attempt to initiate a splice from a file to a pipe. - */ --static long do_splice_to(struct file *in, loff_t *ppos, -- struct pipe_inode_info *pipe, size_t len, -- unsigned int flags) -+long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags) - { - ssize_t (*splice_read)(struct file *, loff_t *, - struct pipe_inode_info *, size_t, unsigned int); -diff --git a/include/linux/fs.h b/include/linux/fs.h -index aa11047..9116d2e 100644 ---- a/include/linux/fs.h -+++ b/include/linux/fs.h -@@ -2741,6 +2741,7 @@ extern int inode_change_ok(const struct inode *, struct iattr *); - extern int inode_newsize_ok(const struct inode *, loff_t offset); - extern void setattr_copy(struct inode *inode, const struct iattr *attr); - -+extern int update_time(struct inode *, struct timespec *, int); - extern int file_update_time(struct file *file); - - extern int generic_show_options(struct seq_file *m, struct dentry *root); -diff --git a/include/linux/splice.h b/include/linux/splice.h -index 09a545a..1ac5727 100644 ---- a/include/linux/splice.h -+++ b/include/linux/splice.h -@@ -91,4 +91,10 @@ extern void splice_shrink_spd(struct splice_pipe_desc *); - extern void spd_release_page(struct splice_pipe_desc *, unsigned int); - - extern const struct pipe_buf_operations page_cache_pipe_buf_ops; -+ -+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags); -+extern long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags); - #endif diff --git a/sys-fs/aufs3/files/3_p20121112/aufs3-base-x-rcN.patch b/sys-fs/aufs3/files/3_p20121112/aufs3-base-x-rcN.patch deleted file mode 100644 index 4514a59ec444..000000000000 --- a/sys-fs/aufs3/files/3_p20121112/aufs3-base-x-rcN.patch +++ /dev/null @@ -1,83 +0,0 @@ -aufs3.x-rcN base patch - -diff --git a/fs/file_table.c b/fs/file_table.c -index a72bf9d..dac6792 100644 ---- a/fs/file_table.c -+++ b/fs/file_table.c -@@ -36,7 +36,7 @@ struct files_stat_struct files_stat = { - .max_files = NR_FILE - }; - --DEFINE_STATIC_LGLOCK(files_lglock); -+DEFINE_LGLOCK(files_lglock); - - /* SLAB cache for file structures */ - static struct kmem_cache *filp_cachep __read_mostly; -diff --git a/fs/inode.c b/fs/inode.c -index b03c719..ee497f9 100644 ---- a/fs/inode.c -+++ b/fs/inode.c -@@ -1491,7 +1491,7 @@ static int relatime_need_update(struct vfsmount *mnt, struct inode *inode, - * This does the actual work of updating an inodes time or version. Must have - * had called mnt_want_write() before calling this. - */ --static int update_time(struct inode *inode, struct timespec *time, int flags) -+int update_time(struct inode *inode, struct timespec *time, int flags) - { - if (inode->i_op->update_time) - return inode->i_op->update_time(inode, time, flags); -diff --git a/fs/splice.c b/fs/splice.c -index 13e5b47..f185c6c 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1093,8 +1093,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); - /* - * Attempt to initiate a splice from pipe to file. - */ --static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -- loff_t *ppos, size_t len, unsigned int flags) -+long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags) - { - ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, - loff_t *, size_t, unsigned int); -@@ -1121,9 +1121,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - /* - * Attempt to initiate a splice from a file to a pipe. - */ --static long do_splice_to(struct file *in, loff_t *ppos, -- struct pipe_inode_info *pipe, size_t len, -- unsigned int flags) -+long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags) - { - ssize_t (*splice_read)(struct file *, loff_t *, - struct pipe_inode_info *, size_t, unsigned int); -diff --git a/include/linux/fs.h b/include/linux/fs.h -index b33cfc9..963a61b 100644 ---- a/include/linux/fs.h -+++ b/include/linux/fs.h -@@ -2558,6 +2558,7 @@ extern int inode_change_ok(const struct inode *, struct iattr *); - extern int inode_newsize_ok(const struct inode *, loff_t offset); - extern void setattr_copy(struct inode *inode, const struct iattr *attr); - -+extern int update_time(struct inode *, struct timespec *, int); - extern int file_update_time(struct file *file); - - extern int generic_show_options(struct seq_file *m, struct dentry *root); -diff --git a/include/linux/splice.h b/include/linux/splice.h -index 09a545a..1ac5727 100644 ---- a/include/linux/splice.h -+++ b/include/linux/splice.h -@@ -91,4 +91,10 @@ extern void splice_shrink_spd(struct splice_pipe_desc *); - extern void spd_release_page(struct splice_pipe_desc *, unsigned int); - - extern const struct pipe_buf_operations page_cache_pipe_buf_ops; -+ -+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags); -+extern long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags); - #endif diff --git a/sys-fs/aufs3/files/3_p20121112/aufs3-standalone-0.patch b/sys-fs/aufs3/files/3_p20121112/aufs3-standalone-0.patch deleted file mode 100644 index ada3df9d4b06..000000000000 --- a/sys-fs/aufs3/files/3_p20121112/aufs3-standalone-0.patch +++ /dev/null @@ -1,257 +0,0 @@ -aufs3.0 standalone patch - -diff --git a/fs/file_table.c b/fs/file_table.c -index 01e4c1e..0e800e2 100644 ---- a/fs/file_table.c -+++ b/fs/file_table.c -@@ -443,6 +443,8 @@ void file_sb_list_del(struct file *file) - } - } - -+EXPORT_SYMBOL(file_sb_list_del); -+ - #ifdef CONFIG_SMP - - /* -diff --git a/fs/inode.c b/fs/inode.c -index 43566d1..4291eae 100644 ---- a/fs/inode.c -+++ b/fs/inode.c -@@ -69,6 +69,7 @@ static DEFINE_SPINLOCK(inode_lru_lock); - - __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock); - __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_wb_list_lock); -+EXPORT_SYMBOL(inode_sb_list_lock); - - /* - * iprune_sem provides exclusion between the icache shrinking and the -diff --git a/fs/namei.c b/fs/namei.c -index eb4aef1..66d04c6 100644 ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -365,6 +365,7 @@ int deny_write_access(struct file * file) - - return 0; - } -+EXPORT_SYMBOL(deny_write_access); - - /** - * path_get - get a reference to a path -@@ -1701,6 +1702,7 @@ struct dentry *lookup_hash(struct nameidata *nd) - { - return __lookup_hash(&nd->last, nd->path.dentry, nd); - } -+EXPORT_SYMBOL(lookup_hash); - - /** - * lookup_one_len - filesystem helper to lookup single pathname component -diff --git a/fs/namespace.c b/fs/namespace.c -index fe59bd1..7d3843f 100644 ---- a/fs/namespace.c -+++ b/fs/namespace.c -@@ -1508,6 +1508,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, - } - return 0; - } -+EXPORT_SYMBOL(iterate_mounts); - - static void cleanup_group_ids(struct vfsmount *mnt, struct vfsmount *end) - { -diff --git a/fs/notify/group.c b/fs/notify/group.c -index d309f38..f0e9568 100644 ---- a/fs/notify/group.c -+++ b/fs/notify/group.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #include - #include "fsnotify.h" -@@ -70,6 +71,7 @@ void fsnotify_put_group(struct fsnotify_group *group) - if (atomic_dec_and_test(&group->refcnt)) - fsnotify_destroy_group(group); - } -+EXPORT_SYMBOL(fsnotify_put_group); - - /* - * Create a new fsnotify_group and hold a reference for the group returned. -@@ -102,3 +104,4 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops) - - return group; - } -+EXPORT_SYMBOL(fsnotify_alloc_group); -diff --git a/fs/notify/mark.c b/fs/notify/mark.c -index 252ab1f..2199b9b 100644 ---- a/fs/notify/mark.c -+++ b/fs/notify/mark.c -@@ -112,6 +112,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark) - if (atomic_dec_and_test(&mark->refcnt)) - mark->free_mark(mark); - } -+EXPORT_SYMBOL(fsnotify_put_mark); - - /* - * Any time a mark is getting freed we end up here. -@@ -189,6 +190,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark) - if (unlikely(atomic_dec_and_test(&group->num_marks))) - fsnotify_final_destroy_group(group); - } -+EXPORT_SYMBOL(fsnotify_destroy_mark); - - void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask) - { -@@ -276,6 +278,7 @@ err: - - return ret; - } -+EXPORT_SYMBOL(fsnotify_add_mark); - - /* - * clear any marks in a group in which mark->flags & flags is true -@@ -331,6 +334,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark, - atomic_set(&mark->refcnt, 1); - mark->free_mark = free_mark; - } -+EXPORT_SYMBOL(fsnotify_init_mark); - - static int fsnotify_mark_destroy(void *ignored) - { -diff --git a/fs/open.c b/fs/open.c -index b52cf01..c1b341c 100644 ---- a/fs/open.c -+++ b/fs/open.c -@@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, - mutex_unlock(&dentry->d_inode->i_mutex); - return ret; - } -+EXPORT_SYMBOL(do_truncate); - - static long do_sys_truncate(const char __user *pathname, loff_t length) - { -diff --git a/fs/splice.c b/fs/splice.c -index 19afec6..11f07f86 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1109,6 +1109,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - - return splice_write(pipe, out, ppos, len, flags); - } -+EXPORT_SYMBOL(do_splice_from); - - /* - * Attempt to initiate a splice from a file to a pipe. -@@ -1135,6 +1136,7 @@ long do_splice_to(struct file *in, loff_t *ppos, - - return splice_read(in, ppos, pipe, len, flags); - } -+EXPORT_SYMBOL(do_splice_to); - - /** - * splice_direct_to_actor - splices data directly between two non-pipes -diff --git a/security/commoncap.c b/security/commoncap.c -index a93b3b7..024282c 100644 ---- a/security/commoncap.c -+++ b/security/commoncap.c -@@ -971,3 +971,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot, - } - return ret; - } -+EXPORT_SYMBOL(cap_file_mmap); -diff --git a/security/device_cgroup.c b/security/device_cgroup.c -index 1be6826..215278c 100644 ---- a/security/device_cgroup.c -+++ b/security/device_cgroup.c -@@ -508,6 +508,7 @@ found: - - return -EPERM; - } -+EXPORT_SYMBOL(__devcgroup_inode_permission); - - int devcgroup_inode_mknod(int mode, dev_t dev) - { -diff --git a/security/security.c b/security/security.c -index 4ba6d4c..9f64bb8 100644 ---- a/security/security.c -+++ b/security/security.c -@@ -373,6 +373,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry) - return 0; - return security_ops->path_rmdir(dir, dentry); - } -+EXPORT_SYMBOL(security_path_rmdir); - - int security_path_unlink(struct path *dir, struct dentry *dentry) - { -@@ -389,6 +390,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry, - return 0; - return security_ops->path_symlink(dir, dentry, old_name); - } -+EXPORT_SYMBOL(security_path_symlink); - - int security_path_link(struct dentry *old_dentry, struct path *new_dir, - struct dentry *new_dentry) -@@ -397,6 +399,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir, - return 0; - return security_ops->path_link(old_dentry, new_dir, new_dentry); - } -+EXPORT_SYMBOL(security_path_link); - - int security_path_rename(struct path *old_dir, struct dentry *old_dentry, - struct path *new_dir, struct dentry *new_dentry) -@@ -415,6 +418,7 @@ int security_path_truncate(struct path *path) - return 0; - return security_ops->path_truncate(path); - } -+EXPORT_SYMBOL(security_path_truncate); - - int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, - mode_t mode) -@@ -423,6 +427,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, - return 0; - return security_ops->path_chmod(dentry, mnt, mode); - } -+EXPORT_SYMBOL(security_path_chmod); - - int security_path_chown(struct path *path, uid_t uid, gid_t gid) - { -@@ -430,6 +435,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid) - return 0; - return security_ops->path_chown(path, uid, gid); - } -+EXPORT_SYMBOL(security_path_chown); - - int security_path_chroot(struct path *path) - { -@@ -506,6 +512,7 @@ int security_inode_readlink(struct dentry *dentry) - return 0; - return security_ops->inode_readlink(dentry); - } -+EXPORT_SYMBOL(security_inode_readlink); - - int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd) - { -@@ -520,6 +527,7 @@ int security_inode_permission(struct inode *inode, int mask) - return 0; - return security_ops->inode_permission(inode, mask, 0); - } -+EXPORT_SYMBOL(security_inode_permission); - - int security_inode_exec_permission(struct inode *inode, unsigned int flags) - { -@@ -626,6 +634,7 @@ int security_file_permission(struct file *file, int mask) - - return fsnotify_perm(file, mask); - } -+EXPORT_SYMBOL(security_file_permission); - - int security_file_alloc(struct file *file) - { -@@ -653,6 +662,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot, - return ret; - return ima_file_mmap(file, prot); - } -+EXPORT_SYMBOL(security_file_mmap); - - int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot, - unsigned long prot) diff --git a/sys-fs/aufs3/files/3_p20121112/aufs3-standalone-1.patch b/sys-fs/aufs3/files/3_p20121112/aufs3-standalone-1.patch deleted file mode 100644 index 72f3ae9e432b..000000000000 --- a/sys-fs/aufs3/files/3_p20121112/aufs3-standalone-1.patch +++ /dev/null @@ -1,249 +0,0 @@ -aufs3.1 standalone patch - -diff --git a/fs/file_table.c b/fs/file_table.c -index c322794..2aad244 100644 ---- a/fs/file_table.c -+++ b/fs/file_table.c -@@ -443,6 +443,8 @@ void file_sb_list_del(struct file *file) - } - } - -+EXPORT_SYMBOL(file_sb_list_del); -+ - #ifdef CONFIG_SMP - - /* -diff --git a/fs/inode.c b/fs/inode.c -index ec79246..46ac6f9 100644 ---- a/fs/inode.c -+++ b/fs/inode.c -@@ -65,6 +65,7 @@ static struct hlist_head *inode_hashtable __read_mostly; - static __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_hash_lock); - - __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock); -+EXPORT_SYMBOL(inode_sb_list_lock); - - /* - * Empty aops. Can be used for the cases where the user does not -diff --git a/fs/namei.c b/fs/namei.c -index 8edad02..50e8718 100644 ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -1752,6 +1752,7 @@ struct dentry *lookup_hash(struct nameidata *nd) - { - return __lookup_hash(&nd->last, nd->path.dentry, nd); - } -+EXPORT_SYMBOL(lookup_hash); - - /** - * lookup_one_len - filesystem helper to lookup single pathname component -diff --git a/fs/namespace.c b/fs/namespace.c -index b4febb2..598a308 100644 ---- a/fs/namespace.c -+++ b/fs/namespace.c -@@ -1508,6 +1508,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, - } - return 0; - } -+EXPORT_SYMBOL(iterate_mounts); - - static void cleanup_group_ids(struct vfsmount *mnt, struct vfsmount *end) - { -diff --git a/fs/notify/group.c b/fs/notify/group.c -index 63fc294..6f4adca 100644 ---- a/fs/notify/group.c -+++ b/fs/notify/group.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #include - #include "fsnotify.h" -@@ -70,6 +71,7 @@ void fsnotify_put_group(struct fsnotify_group *group) - if (atomic_dec_and_test(&group->refcnt)) - fsnotify_destroy_group(group); - } -+EXPORT_SYMBOL(fsnotify_put_group); - - /* - * Create a new fsnotify_group and hold a reference for the group returned. -@@ -102,3 +104,4 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops) - - return group; - } -+EXPORT_SYMBOL(fsnotify_alloc_group); -diff --git a/fs/notify/mark.c b/fs/notify/mark.c -index e14587d..be6533b 100644 ---- a/fs/notify/mark.c -+++ b/fs/notify/mark.c -@@ -112,6 +112,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark) - if (atomic_dec_and_test(&mark->refcnt)) - mark->free_mark(mark); - } -+EXPORT_SYMBOL(fsnotify_put_mark); - - /* - * Any time a mark is getting freed we end up here. -@@ -189,6 +190,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark) - if (unlikely(atomic_dec_and_test(&group->num_marks))) - fsnotify_final_destroy_group(group); - } -+EXPORT_SYMBOL(fsnotify_destroy_mark); - - void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask) - { -@@ -276,6 +278,7 @@ err: - - return ret; - } -+EXPORT_SYMBOL(fsnotify_add_mark); - - /* - * clear any marks in a group in which mark->flags & flags is true -@@ -331,6 +334,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark, - atomic_set(&mark->refcnt, 1); - mark->free_mark = free_mark; - } -+EXPORT_SYMBOL(fsnotify_init_mark); - - static int fsnotify_mark_destroy(void *ignored) - { -diff --git a/fs/open.c b/fs/open.c -index f711921..d742fc0 100644 ---- a/fs/open.c -+++ b/fs/open.c -@@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, - mutex_unlock(&dentry->d_inode->i_mutex); - return ret; - } -+EXPORT_SYMBOL(do_truncate); - - static long do_sys_truncate(const char __user *pathname, loff_t length) - { -diff --git a/fs/splice.c b/fs/splice.c -index e3569b0..9dc07b7 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1109,6 +1109,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - - return splice_write(pipe, out, ppos, len, flags); - } -+EXPORT_SYMBOL(do_splice_from); - - /* - * Attempt to initiate a splice from a file to a pipe. -@@ -1135,6 +1136,7 @@ long do_splice_to(struct file *in, loff_t *ppos, - - return splice_read(in, ppos, pipe, len, flags); - } -+EXPORT_SYMBOL(do_splice_to); - - /** - * splice_direct_to_actor - splices data directly between two non-pipes -diff --git a/security/commoncap.c b/security/commoncap.c -index a93b3b7..024282c 100644 ---- a/security/commoncap.c -+++ b/security/commoncap.c -@@ -971,3 +971,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot, - } - return ret; - } -+EXPORT_SYMBOL(cap_file_mmap); -diff --git a/security/device_cgroup.c b/security/device_cgroup.c -index 4450fbe..2c437e5 100644 ---- a/security/device_cgroup.c -+++ b/security/device_cgroup.c -@@ -500,6 +500,7 @@ found: - - return -EPERM; - } -+EXPORT_SYMBOL(__devcgroup_inode_permission); - - int devcgroup_inode_mknod(int mode, dev_t dev) - { -diff --git a/security/security.c b/security/security.c -index d9e1533..466ee5c 100644 ---- a/security/security.c -+++ b/security/security.c -@@ -373,6 +373,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry) - return 0; - return security_ops->path_rmdir(dir, dentry); - } -+EXPORT_SYMBOL(security_path_rmdir); - - int security_path_unlink(struct path *dir, struct dentry *dentry) - { -@@ -389,6 +390,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry, - return 0; - return security_ops->path_symlink(dir, dentry, old_name); - } -+EXPORT_SYMBOL(security_path_symlink); - - int security_path_link(struct dentry *old_dentry, struct path *new_dir, - struct dentry *new_dentry) -@@ -397,6 +399,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir, - return 0; - return security_ops->path_link(old_dentry, new_dir, new_dentry); - } -+EXPORT_SYMBOL(security_path_link); - - int security_path_rename(struct path *old_dir, struct dentry *old_dentry, - struct path *new_dir, struct dentry *new_dentry) -@@ -415,6 +418,7 @@ int security_path_truncate(struct path *path) - return 0; - return security_ops->path_truncate(path); - } -+EXPORT_SYMBOL(security_path_truncate); - - int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, - mode_t mode) -@@ -423,6 +427,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, - return 0; - return security_ops->path_chmod(dentry, mnt, mode); - } -+EXPORT_SYMBOL(security_path_chmod); - - int security_path_chown(struct path *path, uid_t uid, gid_t gid) - { -@@ -430,6 +435,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid) - return 0; - return security_ops->path_chown(path, uid, gid); - } -+EXPORT_SYMBOL(security_path_chown); - - int security_path_chroot(struct path *path) - { -@@ -506,6 +512,7 @@ int security_inode_readlink(struct dentry *dentry) - return 0; - return security_ops->inode_readlink(dentry); - } -+EXPORT_SYMBOL(security_inode_readlink); - - int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd) - { -@@ -520,6 +527,7 @@ int security_inode_permission(struct inode *inode, int mask) - return 0; - return security_ops->inode_permission(inode, mask); - } -+EXPORT_SYMBOL(security_inode_permission); - - int security_inode_setattr(struct dentry *dentry, struct iattr *attr) - { -@@ -619,6 +627,7 @@ int security_file_permission(struct file *file, int mask) - - return fsnotify_perm(file, mask); - } -+EXPORT_SYMBOL(security_file_permission); - - int security_file_alloc(struct file *file) - { -@@ -646,6 +655,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot, - return ret; - return ima_file_mmap(file, prot); - } -+EXPORT_SYMBOL(security_file_mmap); - - int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot, - unsigned long prot) diff --git a/sys-fs/aufs3/files/3_p20121112/aufs3-standalone-2.patch b/sys-fs/aufs3/files/3_p20121112/aufs3-standalone-2.patch deleted file mode 100644 index ae897f388cb7..000000000000 --- a/sys-fs/aufs3/files/3_p20121112/aufs3-standalone-2.patch +++ /dev/null @@ -1,257 +0,0 @@ -aufs3.2 standalone patch - -diff --git a/fs/file_table.c b/fs/file_table.c -index c322794..2aad244 100644 ---- a/fs/file_table.c -+++ b/fs/file_table.c -@@ -443,6 +443,8 @@ void file_sb_list_del(struct file *file) - } - } - -+EXPORT_SYMBOL(file_sb_list_del); -+ - #ifdef CONFIG_SMP - - /* -diff --git a/fs/inode.c b/fs/inode.c -index ee4e66b..728042b 100644 ---- a/fs/inode.c -+++ b/fs/inode.c -@@ -65,6 +65,7 @@ static struct hlist_head *inode_hashtable __read_mostly; - static __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_hash_lock); - - __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock); -+EXPORT_SYMBOL(inode_sb_list_lock); - - /* - * Empty aops. Can be used for the cases where the user does not -diff --git a/fs/namei.c b/fs/namei.c -index 4cc94cf..af19e30 100644 ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -1757,6 +1757,7 @@ struct dentry *lookup_hash(struct nameidata *nd) - { - return __lookup_hash(&nd->last, nd->path.dentry, nd); - } -+EXPORT_SYMBOL(lookup_hash); - - /** - * lookup_one_len - filesystem helper to lookup single pathname component -diff --git a/fs/namespace.c b/fs/namespace.c -index cfc6d44..173d15a 100644 ---- a/fs/namespace.c -+++ b/fs/namespace.c -@@ -1506,6 +1506,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, - } - return 0; - } -+EXPORT_SYMBOL(iterate_mounts); - - static void cleanup_group_ids(struct vfsmount *mnt, struct vfsmount *end) - { -diff --git a/fs/notify/group.c b/fs/notify/group.c -index 63fc294..6f4adca 100644 ---- a/fs/notify/group.c -+++ b/fs/notify/group.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #include - #include "fsnotify.h" -@@ -70,6 +71,7 @@ void fsnotify_put_group(struct fsnotify_group *group) - if (atomic_dec_and_test(&group->refcnt)) - fsnotify_destroy_group(group); - } -+EXPORT_SYMBOL(fsnotify_put_group); - - /* - * Create a new fsnotify_group and hold a reference for the group returned. -@@ -102,3 +104,4 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops) - - return group; - } -+EXPORT_SYMBOL(fsnotify_alloc_group); -diff --git a/fs/notify/mark.c b/fs/notify/mark.c -index e14587d..be6533b 100644 ---- a/fs/notify/mark.c -+++ b/fs/notify/mark.c -@@ -112,6 +112,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark) - if (atomic_dec_and_test(&mark->refcnt)) - mark->free_mark(mark); - } -+EXPORT_SYMBOL(fsnotify_put_mark); - - /* - * Any time a mark is getting freed we end up here. -@@ -189,6 +190,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark) - if (unlikely(atomic_dec_and_test(&group->num_marks))) - fsnotify_final_destroy_group(group); - } -+EXPORT_SYMBOL(fsnotify_destroy_mark); - - void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask) - { -@@ -276,6 +278,7 @@ err: - - return ret; - } -+EXPORT_SYMBOL(fsnotify_add_mark); - - /* - * clear any marks in a group in which mark->flags & flags is true -@@ -331,6 +334,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark, - atomic_set(&mark->refcnt, 1); - mark->free_mark = free_mark; - } -+EXPORT_SYMBOL(fsnotify_init_mark); - - static int fsnotify_mark_destroy(void *ignored) - { -diff --git a/fs/open.c b/fs/open.c -index 22c41b5..33b4033 100644 ---- a/fs/open.c -+++ b/fs/open.c -@@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, - mutex_unlock(&dentry->d_inode->i_mutex); - return ret; - } -+EXPORT_SYMBOL(do_truncate); - - static long do_sys_truncate(const char __user *pathname, loff_t length) - { -diff --git a/fs/splice.c b/fs/splice.c -index e3569b0..9dc07b7 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1109,6 +1109,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - - return splice_write(pipe, out, ppos, len, flags); - } -+EXPORT_SYMBOL(do_splice_from); - - /* - * Attempt to initiate a splice from a file to a pipe. -@@ -1135,6 +1136,7 @@ long do_splice_to(struct file *in, loff_t *ppos, - - return splice_read(in, ppos, pipe, len, flags); - } -+EXPORT_SYMBOL(do_splice_to); - - /** - * splice_direct_to_actor - splices data directly between two non-pipes -diff --git a/security/commoncap.c b/security/commoncap.c -index ee4f848..611fd70 100644 ---- a/security/commoncap.c -+++ b/security/commoncap.c -@@ -975,3 +975,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot, - } - return ret; - } -+EXPORT_SYMBOL(cap_file_mmap); -diff --git a/security/device_cgroup.c b/security/device_cgroup.c -index 4450fbe..bc94175 100644 ---- a/security/device_cgroup.c -+++ b/security/device_cgroup.c -@@ -7,6 +7,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -500,6 +501,7 @@ found: - - return -EPERM; - } -+EXPORT_SYMBOL(__devcgroup_inode_permission); - - int devcgroup_inode_mknod(int mode, dev_t dev) - { -diff --git a/security/security.c b/security/security.c -index e2f684a..892000c 100644 ---- a/security/security.c -+++ b/security/security.c -@@ -411,6 +411,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry) - return 0; - return security_ops->path_rmdir(dir, dentry); - } -+EXPORT_SYMBOL(security_path_rmdir); - - int security_path_unlink(struct path *dir, struct dentry *dentry) - { -@@ -427,6 +428,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry, - return 0; - return security_ops->path_symlink(dir, dentry, old_name); - } -+EXPORT_SYMBOL(security_path_symlink); - - int security_path_link(struct dentry *old_dentry, struct path *new_dir, - struct dentry *new_dentry) -@@ -435,6 +437,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir, - return 0; - return security_ops->path_link(old_dentry, new_dir, new_dentry); - } -+EXPORT_SYMBOL(security_path_link); - - int security_path_rename(struct path *old_dir, struct dentry *old_dentry, - struct path *new_dir, struct dentry *new_dentry) -@@ -453,6 +456,7 @@ int security_path_truncate(struct path *path) - return 0; - return security_ops->path_truncate(path); - } -+EXPORT_SYMBOL(security_path_truncate); - - int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, - mode_t mode) -@@ -461,6 +465,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, - return 0; - return security_ops->path_chmod(dentry, mnt, mode); - } -+EXPORT_SYMBOL(security_path_chmod); - - int security_path_chown(struct path *path, uid_t uid, gid_t gid) - { -@@ -468,6 +473,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid) - return 0; - return security_ops->path_chown(path, uid, gid); - } -+EXPORT_SYMBOL(security_path_chown); - - int security_path_chroot(struct path *path) - { -@@ -544,6 +550,7 @@ int security_inode_readlink(struct dentry *dentry) - return 0; - return security_ops->inode_readlink(dentry); - } -+EXPORT_SYMBOL(security_inode_readlink); - - int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd) - { -@@ -558,6 +565,7 @@ int security_inode_permission(struct inode *inode, int mask) - return 0; - return security_ops->inode_permission(inode, mask); - } -+EXPORT_SYMBOL(security_inode_permission); - - int security_inode_setattr(struct dentry *dentry, struct iattr *attr) - { -@@ -673,6 +681,7 @@ int security_file_permission(struct file *file, int mask) - - return fsnotify_perm(file, mask); - } -+EXPORT_SYMBOL(security_file_permission); - - int security_file_alloc(struct file *file) - { -@@ -700,6 +709,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot, - return ret; - return ima_file_mmap(file, prot); - } -+EXPORT_SYMBOL(security_file_mmap); - - int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot, - unsigned long prot) diff --git a/sys-fs/aufs3/files/3_p20121112/aufs3-standalone-3.patch b/sys-fs/aufs3/files/3_p20121112/aufs3-standalone-3.patch deleted file mode 100644 index 584d592ef068..000000000000 --- a/sys-fs/aufs3/files/3_p20121112/aufs3-standalone-3.patch +++ /dev/null @@ -1,257 +0,0 @@ -aufs3.3 standalone patch - -diff --git a/fs/file_table.c b/fs/file_table.c -index 20002e3..6d792ad 100644 ---- a/fs/file_table.c -+++ b/fs/file_table.c -@@ -443,6 +443,8 @@ void file_sb_list_del(struct file *file) - } - } - -+EXPORT_SYMBOL(file_sb_list_del); -+ - #ifdef CONFIG_SMP - - /* -diff --git a/fs/inode.c b/fs/inode.c -index 83ab215..45242cd 100644 ---- a/fs/inode.c -+++ b/fs/inode.c -@@ -66,6 +66,7 @@ static struct hlist_head *inode_hashtable __read_mostly; - static __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_hash_lock); - - __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock); -+EXPORT_SYMBOL(inode_sb_list_lock); - - /* - * Empty aops. Can be used for the cases where the user does not -diff --git a/fs/namei.c b/fs/namei.c -index f2dcf8d..bcccefd 100644 ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -1785,6 +1785,7 @@ struct dentry *lookup_hash(struct nameidata *nd) - { - return __lookup_hash(&nd->last, nd->path.dentry, nd); - } -+EXPORT_SYMBOL(lookup_hash); - - /** - * lookup_one_len - filesystem helper to lookup single pathname component -diff --git a/fs/namespace.c b/fs/namespace.c -index e608199..38fcc2e 100644 ---- a/fs/namespace.c -+++ b/fs/namespace.c -@@ -1339,6 +1339,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, - } - return 0; - } -+EXPORT_SYMBOL(iterate_mounts); - - static void cleanup_group_ids(struct mount *mnt, struct mount *end) - { -diff --git a/fs/notify/group.c b/fs/notify/group.c -index 63fc294..6f4adca 100644 ---- a/fs/notify/group.c -+++ b/fs/notify/group.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #include - #include "fsnotify.h" -@@ -70,6 +71,7 @@ void fsnotify_put_group(struct fsnotify_group *group) - if (atomic_dec_and_test(&group->refcnt)) - fsnotify_destroy_group(group); - } -+EXPORT_SYMBOL(fsnotify_put_group); - - /* - * Create a new fsnotify_group and hold a reference for the group returned. -@@ -102,3 +104,4 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops) - - return group; - } -+EXPORT_SYMBOL(fsnotify_alloc_group); -diff --git a/fs/notify/mark.c b/fs/notify/mark.c -index f104d56..54f36db 100644 ---- a/fs/notify/mark.c -+++ b/fs/notify/mark.c -@@ -112,6 +112,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark) - if (atomic_dec_and_test(&mark->refcnt)) - mark->free_mark(mark); - } -+EXPORT_SYMBOL(fsnotify_put_mark); - - /* - * Any time a mark is getting freed we end up here. -@@ -191,6 +192,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark) - if (unlikely(atomic_dec_and_test(&group->num_marks))) - fsnotify_final_destroy_group(group); - } -+EXPORT_SYMBOL(fsnotify_destroy_mark); - - void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask) - { -@@ -278,6 +280,7 @@ err: - - return ret; - } -+EXPORT_SYMBOL(fsnotify_add_mark); - - /* - * clear any marks in a group in which mark->flags & flags is true -@@ -333,6 +336,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark, - atomic_set(&mark->refcnt, 1); - mark->free_mark = free_mark; - } -+EXPORT_SYMBOL(fsnotify_init_mark); - - static int fsnotify_mark_destroy(void *ignored) - { -diff --git a/fs/open.c b/fs/open.c -index 77becc0..f634f02 100644 ---- a/fs/open.c -+++ b/fs/open.c -@@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, - mutex_unlock(&dentry->d_inode->i_mutex); - return ret; - } -+EXPORT_SYMBOL(do_truncate); - - static long do_sys_truncate(const char __user *pathname, loff_t length) - { -diff --git a/fs/splice.c b/fs/splice.c -index c599f73..00303ba 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1108,6 +1108,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - - return splice_write(pipe, out, ppos, len, flags); - } -+EXPORT_SYMBOL(do_splice_from); - - /* - * Attempt to initiate a splice from a file to a pipe. -@@ -1134,6 +1135,7 @@ long do_splice_to(struct file *in, loff_t *ppos, - - return splice_read(in, ppos, pipe, len, flags); - } -+EXPORT_SYMBOL(do_splice_to); - - /** - * splice_direct_to_actor - splices data directly between two non-pipes -diff --git a/security/commoncap.c b/security/commoncap.c -index 7ce191e..19a95be 100644 ---- a/security/commoncap.c -+++ b/security/commoncap.c -@@ -965,3 +965,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot, - } - return ret; - } -+EXPORT_SYMBOL(cap_file_mmap); -diff --git a/security/device_cgroup.c b/security/device_cgroup.c -index 8b5b5d8..911850c 100644 ---- a/security/device_cgroup.c -+++ b/security/device_cgroup.c -@@ -7,6 +7,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -501,6 +502,7 @@ found: - - return -EPERM; - } -+EXPORT_SYMBOL(__devcgroup_inode_permission); - - int devcgroup_inode_mknod(int mode, dev_t dev) - { -diff --git a/security/security.c b/security/security.c -index d754249..1aa6154 100644 ---- a/security/security.c -+++ b/security/security.c -@@ -392,6 +392,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry) - return 0; - return security_ops->path_rmdir(dir, dentry); - } -+EXPORT_SYMBOL(security_path_rmdir); - - int security_path_unlink(struct path *dir, struct dentry *dentry) - { -@@ -408,6 +409,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry, - return 0; - return security_ops->path_symlink(dir, dentry, old_name); - } -+EXPORT_SYMBOL(security_path_symlink); - - int security_path_link(struct dentry *old_dentry, struct path *new_dir, - struct dentry *new_dentry) -@@ -416,6 +418,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir, - return 0; - return security_ops->path_link(old_dentry, new_dir, new_dentry); - } -+EXPORT_SYMBOL(security_path_link); - - int security_path_rename(struct path *old_dir, struct dentry *old_dentry, - struct path *new_dir, struct dentry *new_dentry) -@@ -434,6 +437,7 @@ int security_path_truncate(struct path *path) - return 0; - return security_ops->path_truncate(path); - } -+EXPORT_SYMBOL(security_path_truncate); - - int security_path_chmod(struct path *path, umode_t mode) - { -@@ -441,6 +445,7 @@ int security_path_chmod(struct path *path, umode_t mode) - return 0; - return security_ops->path_chmod(path, mode); - } -+EXPORT_SYMBOL(security_path_chmod); - - int security_path_chown(struct path *path, uid_t uid, gid_t gid) - { -@@ -448,6 +453,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid) - return 0; - return security_ops->path_chown(path, uid, gid); - } -+EXPORT_SYMBOL(security_path_chown); - - int security_path_chroot(struct path *path) - { -@@ -524,6 +530,7 @@ int security_inode_readlink(struct dentry *dentry) - return 0; - return security_ops->inode_readlink(dentry); - } -+EXPORT_SYMBOL(security_inode_readlink); - - int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd) - { -@@ -538,6 +545,7 @@ int security_inode_permission(struct inode *inode, int mask) - return 0; - return security_ops->inode_permission(inode, mask); - } -+EXPORT_SYMBOL(security_inode_permission); - - int security_inode_setattr(struct dentry *dentry, struct iattr *attr) - { -@@ -653,6 +661,7 @@ int security_file_permission(struct file *file, int mask) - - return fsnotify_perm(file, mask); - } -+EXPORT_SYMBOL(security_file_permission); - - int security_file_alloc(struct file *file) - { -@@ -680,6 +689,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot, - return ret; - return ima_file_mmap(file, prot); - } -+EXPORT_SYMBOL(security_file_mmap); - - int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot, - unsigned long prot) diff --git a/sys-fs/aufs3/files/3_p20121112/aufs3-standalone-4.patch b/sys-fs/aufs3/files/3_p20121112/aufs3-standalone-4.patch deleted file mode 100644 index 67cd853bd87b..000000000000 --- a/sys-fs/aufs3/files/3_p20121112/aufs3-standalone-4.patch +++ /dev/null @@ -1,257 +0,0 @@ -aufs3.4 standalone patch - -diff --git a/fs/file_table.c b/fs/file_table.c -index 70f2a0f..146a3d7 100644 ---- a/fs/file_table.c -+++ b/fs/file_table.c -@@ -442,6 +442,8 @@ void file_sb_list_del(struct file *file) - } - } - -+EXPORT_SYMBOL(file_sb_list_del); -+ - #ifdef CONFIG_SMP - - /* -diff --git a/fs/inode.c b/fs/inode.c -index 9f4f5fe..bb0f3ba 100644 ---- a/fs/inode.c -+++ b/fs/inode.c -@@ -56,6 +56,7 @@ static struct hlist_head *inode_hashtable __read_mostly; - static __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_hash_lock); - - __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock); -+EXPORT_SYMBOL(inode_sb_list_lock); - - /* - * Empty aops. Can be used for the cases where the user does not -diff --git a/fs/namei.c b/fs/namei.c -index 7ff959b..b170167 100644 ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -1835,6 +1835,7 @@ struct dentry *lookup_hash(struct nameidata *nd) - { - return __lookup_hash(&nd->last, nd->path.dentry, nd); - } -+EXPORT_SYMBOL(lookup_hash); - - /** - * lookup_one_len - filesystem helper to lookup single pathname component -diff --git a/fs/namespace.c b/fs/namespace.c -index e608199..38fcc2e 100644 ---- a/fs/namespace.c -+++ b/fs/namespace.c -@@ -1339,6 +1339,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, - } - return 0; - } -+EXPORT_SYMBOL(iterate_mounts); - - static void cleanup_group_ids(struct mount *mnt, struct mount *end) - { -diff --git a/fs/notify/group.c b/fs/notify/group.c -index 63fc294..6f4adca 100644 ---- a/fs/notify/group.c -+++ b/fs/notify/group.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #include - #include "fsnotify.h" -@@ -70,6 +71,7 @@ void fsnotify_put_group(struct fsnotify_group *group) - if (atomic_dec_and_test(&group->refcnt)) - fsnotify_destroy_group(group); - } -+EXPORT_SYMBOL(fsnotify_put_group); - - /* - * Create a new fsnotify_group and hold a reference for the group returned. -@@ -102,3 +104,4 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops) - - return group; - } -+EXPORT_SYMBOL(fsnotify_alloc_group); -diff --git a/fs/notify/mark.c b/fs/notify/mark.c -index f104d56..54f36db 100644 ---- a/fs/notify/mark.c -+++ b/fs/notify/mark.c -@@ -112,6 +112,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark) - if (atomic_dec_and_test(&mark->refcnt)) - mark->free_mark(mark); - } -+EXPORT_SYMBOL(fsnotify_put_mark); - - /* - * Any time a mark is getting freed we end up here. -@@ -191,6 +192,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark) - if (unlikely(atomic_dec_and_test(&group->num_marks))) - fsnotify_final_destroy_group(group); - } -+EXPORT_SYMBOL(fsnotify_destroy_mark); - - void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask) - { -@@ -278,6 +280,7 @@ err: - - return ret; - } -+EXPORT_SYMBOL(fsnotify_add_mark); - - /* - * clear any marks in a group in which mark->flags & flags is true -@@ -333,6 +336,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark, - atomic_set(&mark->refcnt, 1); - mark->free_mark = free_mark; - } -+EXPORT_SYMBOL(fsnotify_init_mark); - - static int fsnotify_mark_destroy(void *ignored) - { -diff --git a/fs/open.c b/fs/open.c -index 5720854..ec59242 100644 ---- a/fs/open.c -+++ b/fs/open.c -@@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, - mutex_unlock(&dentry->d_inode->i_mutex); - return ret; - } -+EXPORT_SYMBOL(do_truncate); - - static long do_sys_truncate(const char __user *pathname, loff_t length) - { -diff --git a/fs/splice.c b/fs/splice.c -index f871233..70f5481 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1108,6 +1108,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - - return splice_write(pipe, out, ppos, len, flags); - } -+EXPORT_SYMBOL(do_splice_from); - - /* - * Attempt to initiate a splice from a file to a pipe. -@@ -1134,6 +1135,7 @@ long do_splice_to(struct file *in, loff_t *ppos, - - return splice_read(in, ppos, pipe, len, flags); - } -+EXPORT_SYMBOL(do_splice_to); - - /** - * splice_direct_to_actor - splices data directly between two non-pipes -diff --git a/security/commoncap.c b/security/commoncap.c -index 71a166a..5d63aac 100644 ---- a/security/commoncap.c -+++ b/security/commoncap.c -@@ -972,3 +972,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot, - } - return ret; - } -+EXPORT_SYMBOL(cap_file_mmap); -diff --git a/security/device_cgroup.c b/security/device_cgroup.c -index c43a332..0c37289 100644 ---- a/security/device_cgroup.c -+++ b/security/device_cgroup.c -@@ -7,6 +7,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -499,6 +500,7 @@ found: - - return -EPERM; - } -+EXPORT_SYMBOL(__devcgroup_inode_permission); - - int devcgroup_inode_mknod(int mode, dev_t dev) - { -diff --git a/security/security.c b/security/security.c -index bf619ff..60b996a 100644 ---- a/security/security.c -+++ b/security/security.c -@@ -380,6 +380,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry) - return 0; - return security_ops->path_rmdir(dir, dentry); - } -+EXPORT_SYMBOL(security_path_rmdir); - - int security_path_unlink(struct path *dir, struct dentry *dentry) - { -@@ -396,6 +397,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry, - return 0; - return security_ops->path_symlink(dir, dentry, old_name); - } -+EXPORT_SYMBOL(security_path_symlink); - - int security_path_link(struct dentry *old_dentry, struct path *new_dir, - struct dentry *new_dentry) -@@ -404,6 +406,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir, - return 0; - return security_ops->path_link(old_dentry, new_dir, new_dentry); - } -+EXPORT_SYMBOL(security_path_link); - - int security_path_rename(struct path *old_dir, struct dentry *old_dentry, - struct path *new_dir, struct dentry *new_dentry) -@@ -422,6 +425,7 @@ int security_path_truncate(struct path *path) - return 0; - return security_ops->path_truncate(path); - } -+EXPORT_SYMBOL(security_path_truncate); - - int security_path_chmod(struct path *path, umode_t mode) - { -@@ -429,6 +433,7 @@ int security_path_chmod(struct path *path, umode_t mode) - return 0; - return security_ops->path_chmod(path, mode); - } -+EXPORT_SYMBOL(security_path_chmod); - - int security_path_chown(struct path *path, uid_t uid, gid_t gid) - { -@@ -436,6 +441,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid) - return 0; - return security_ops->path_chown(path, uid, gid); - } -+EXPORT_SYMBOL(security_path_chown); - - int security_path_chroot(struct path *path) - { -@@ -512,6 +518,7 @@ int security_inode_readlink(struct dentry *dentry) - return 0; - return security_ops->inode_readlink(dentry); - } -+EXPORT_SYMBOL(security_inode_readlink); - - int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd) - { -@@ -526,6 +533,7 @@ int security_inode_permission(struct inode *inode, int mask) - return 0; - return security_ops->inode_permission(inode, mask); - } -+EXPORT_SYMBOL(security_inode_permission); - - int security_inode_setattr(struct dentry *dentry, struct iattr *attr) - { -@@ -641,6 +649,7 @@ int security_file_permission(struct file *file, int mask) - - return fsnotify_perm(file, mask); - } -+EXPORT_SYMBOL(security_file_permission); - - int security_file_alloc(struct file *file) - { -@@ -668,6 +677,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot, - return ret; - return ima_file_mmap(file, prot); - } -+EXPORT_SYMBOL(security_file_mmap); - - int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot, - unsigned long prot) diff --git a/sys-fs/aufs3/files/3_p20121112/aufs3-standalone-5.patch b/sys-fs/aufs3/files/3_p20121112/aufs3-standalone-5.patch deleted file mode 100644 index bd753fd34ef5..000000000000 --- a/sys-fs/aufs3/files/3_p20121112/aufs3-standalone-5.patch +++ /dev/null @@ -1,288 +0,0 @@ -aufs3.5 standalone patch - -diff --git a/fs/file_table.c b/fs/file_table.c -index a305d9e..6a768be 100644 ---- a/fs/file_table.c -+++ b/fs/file_table.c -@@ -35,6 +35,7 @@ struct files_stat_struct files_stat = { - }; - - DEFINE_LGLOCK(files_lglock); -+EXPORT_SYMBOL(files_lglock); - - /* SLAB cache for file structures */ - static struct kmem_cache *filp_cachep __read_mostly; -@@ -441,6 +442,8 @@ void file_sb_list_del(struct file *file) - } - } - -+EXPORT_SYMBOL(file_sb_list_del); -+ - #ifdef CONFIG_SMP - - /* -diff --git a/fs/inode.c b/fs/inode.c -index 7f772fd..e789d2f 100644 ---- a/fs/inode.c -+++ b/fs/inode.c -@@ -56,6 +56,7 @@ static struct hlist_head *inode_hashtable __read_mostly; - static __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_hash_lock); - - __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock); -+EXPORT_SYMBOL(inode_sb_list_lock); - - /* - * Empty aops. Can be used for the cases where the user does not -@@ -1507,6 +1508,7 @@ int update_time(struct inode *inode, struct timespec *time, int flags) - mark_inode_dirty_sync(inode); - return 0; - } -+EXPORT_SYMBOL(update_time); - - /** - * touch_atime - update the access time -diff --git a/fs/namei.c b/fs/namei.c -index 18c9782..f09edf3 100644 ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -1868,6 +1868,7 @@ struct dentry *lookup_hash(struct nameidata *nd) - { - return __lookup_hash(&nd->last, nd->path.dentry, nd); - } -+EXPORT_SYMBOL(lookup_hash); - - /** - * lookup_one_len - filesystem helper to lookup single pathname component -diff --git a/fs/namespace.c b/fs/namespace.c -index 1e4a5fe..06aa768 100644 ---- a/fs/namespace.c -+++ b/fs/namespace.c -@@ -50,6 +50,7 @@ EXPORT_SYMBOL_GPL(fs_kobj); - * tree or hash is modified or when a vfsmount structure is modified. - */ - DEFINE_BRLOCK(vfsmount_lock); -+EXPORT_SYMBOL(vfsmount_lock); - - static inline unsigned long hash(struct vfsmount *mnt, struct dentry *dentry) - { -@@ -1341,6 +1342,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, - } - return 0; - } -+EXPORT_SYMBOL(iterate_mounts); - - static void cleanup_group_ids(struct mount *mnt, struct mount *end) - { -diff --git a/fs/notify/group.c b/fs/notify/group.c -index 63fc294..6f4adca 100644 ---- a/fs/notify/group.c -+++ b/fs/notify/group.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #include - #include "fsnotify.h" -@@ -70,6 +71,7 @@ void fsnotify_put_group(struct fsnotify_group *group) - if (atomic_dec_and_test(&group->refcnt)) - fsnotify_destroy_group(group); - } -+EXPORT_SYMBOL(fsnotify_put_group); - - /* - * Create a new fsnotify_group and hold a reference for the group returned. -@@ -102,3 +104,4 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops) - - return group; - } -+EXPORT_SYMBOL(fsnotify_alloc_group); -diff --git a/fs/notify/mark.c b/fs/notify/mark.c -index f104d56..54f36db 100644 ---- a/fs/notify/mark.c -+++ b/fs/notify/mark.c -@@ -112,6 +112,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark) - if (atomic_dec_and_test(&mark->refcnt)) - mark->free_mark(mark); - } -+EXPORT_SYMBOL(fsnotify_put_mark); - - /* - * Any time a mark is getting freed we end up here. -@@ -191,6 +192,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark) - if (unlikely(atomic_dec_and_test(&group->num_marks))) - fsnotify_final_destroy_group(group); - } -+EXPORT_SYMBOL(fsnotify_destroy_mark); - - void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask) - { -@@ -278,6 +280,7 @@ err: - - return ret; - } -+EXPORT_SYMBOL(fsnotify_add_mark); - - /* - * clear any marks in a group in which mark->flags & flags is true -@@ -333,6 +336,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark, - atomic_set(&mark->refcnt, 1); - mark->free_mark = free_mark; - } -+EXPORT_SYMBOL(fsnotify_init_mark); - - static int fsnotify_mark_destroy(void *ignored) - { -diff --git a/fs/open.c b/fs/open.c -index 1540632..2463289 100644 ---- a/fs/open.c -+++ b/fs/open.c -@@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, - mutex_unlock(&dentry->d_inode->i_mutex); - return ret; - } -+EXPORT_SYMBOL(do_truncate); - - static long do_sys_truncate(const char __user *pathname, loff_t length) - { -diff --git a/fs/splice.c b/fs/splice.c -index e3c40b5..3afc547 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1114,6 +1114,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - - return splice_write(pipe, out, ppos, len, flags); - } -+EXPORT_SYMBOL(do_splice_from); - - /* - * Attempt to initiate a splice from a file to a pipe. -@@ -1140,6 +1141,7 @@ long do_splice_to(struct file *in, loff_t *ppos, - - return splice_read(in, ppos, pipe, len, flags); - } -+EXPORT_SYMBOL(do_splice_to); - - /** - * splice_direct_to_actor - splices data directly between two non-pipes -diff --git a/security/commoncap.c b/security/commoncap.c -index 6dbae46..9f4f29a 100644 ---- a/security/commoncap.c -+++ b/security/commoncap.c -@@ -979,9 +979,11 @@ int cap_mmap_addr(unsigned long addr) - } - return ret; - } -+EXPORT_SYMBOL(cap_mmap_addr); - - int cap_mmap_file(struct file *file, unsigned long reqprot, - unsigned long prot, unsigned long flags) - { - return 0; - } -+EXPORT_SYMBOL(cap_mmap_file); -diff --git a/security/device_cgroup.c b/security/device_cgroup.c -index 442204c..e644a1c 100644 ---- a/security/device_cgroup.c -+++ b/security/device_cgroup.c -@@ -7,6 +7,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -493,6 +494,7 @@ found: - - return -EPERM; - } -+EXPORT_SYMBOL(__devcgroup_inode_permission); - - int devcgroup_inode_mknod(int mode, dev_t dev) - { -diff --git a/security/security.c b/security/security.c -index 860aeb3..ffb57bf 100644 ---- a/security/security.c -+++ b/security/security.c -@@ -384,6 +384,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry) - return 0; - return security_ops->path_rmdir(dir, dentry); - } -+EXPORT_SYMBOL(security_path_rmdir); - - int security_path_unlink(struct path *dir, struct dentry *dentry) - { -@@ -400,6 +401,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry, - return 0; - return security_ops->path_symlink(dir, dentry, old_name); - } -+EXPORT_SYMBOL(security_path_symlink); - - int security_path_link(struct dentry *old_dentry, struct path *new_dir, - struct dentry *new_dentry) -@@ -408,6 +410,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir, - return 0; - return security_ops->path_link(old_dentry, new_dir, new_dentry); - } -+EXPORT_SYMBOL(security_path_link); - - int security_path_rename(struct path *old_dir, struct dentry *old_dentry, - struct path *new_dir, struct dentry *new_dentry) -@@ -426,6 +429,7 @@ int security_path_truncate(struct path *path) - return 0; - return security_ops->path_truncate(path); - } -+EXPORT_SYMBOL(security_path_truncate); - - int security_path_chmod(struct path *path, umode_t mode) - { -@@ -433,6 +437,7 @@ int security_path_chmod(struct path *path, umode_t mode) - return 0; - return security_ops->path_chmod(path, mode); - } -+EXPORT_SYMBOL(security_path_chmod); - - int security_path_chown(struct path *path, uid_t uid, gid_t gid) - { -@@ -440,6 +445,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid) - return 0; - return security_ops->path_chown(path, uid, gid); - } -+EXPORT_SYMBOL(security_path_chown); - - int security_path_chroot(struct path *path) - { -@@ -516,6 +522,7 @@ int security_inode_readlink(struct dentry *dentry) - return 0; - return security_ops->inode_readlink(dentry); - } -+EXPORT_SYMBOL(security_inode_readlink); - - int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd) - { -@@ -530,6 +537,7 @@ int security_inode_permission(struct inode *inode, int mask) - return 0; - return security_ops->inode_permission(inode, mask); - } -+EXPORT_SYMBOL(security_inode_permission); - - int security_inode_setattr(struct dentry *dentry, struct iattr *attr) - { -@@ -645,6 +653,7 @@ int security_file_permission(struct file *file, int mask) - - return fsnotify_perm(file, mask); - } -+EXPORT_SYMBOL(security_file_permission); - - int security_file_alloc(struct file *file) - { -@@ -705,6 +714,7 @@ int security_mmap_file(struct file *file, unsigned long prot, - return ret; - return ima_file_mmap(file, prot); - } -+EXPORT_SYMBOL(security_mmap_file); - - int security_mmap_addr(unsigned long addr) - { diff --git a/sys-fs/aufs3/files/3_p20121112/aufs3-standalone-6.patch b/sys-fs/aufs3/files/3_p20121112/aufs3-standalone-6.patch deleted file mode 100644 index b5dcadcc3c3d..000000000000 --- a/sys-fs/aufs3/files/3_p20121112/aufs3-standalone-6.patch +++ /dev/null @@ -1,276 +0,0 @@ -aufs3.6 standalone patch - -diff --git a/fs/file_table.c b/fs/file_table.c -index 701985e..a9fe741 100644 ---- a/fs/file_table.c -+++ b/fs/file_table.c -@@ -37,6 +37,7 @@ struct files_stat_struct files_stat = { - }; - - DEFINE_LGLOCK(files_lglock); -+EXPORT_SYMBOL(files_lglock); - - /* SLAB cache for file structures */ - static struct kmem_cache *filp_cachep __read_mostly; -@@ -509,6 +510,8 @@ void file_sb_list_del(struct file *file) - } - } - -+EXPORT_SYMBOL(file_sb_list_del); -+ - #ifdef CONFIG_SMP - - /* -diff --git a/fs/inode.c b/fs/inode.c -index 7b2c8fa..0c4318d 100644 ---- a/fs/inode.c -+++ b/fs/inode.c -@@ -56,6 +56,7 @@ static struct hlist_head *inode_hashtable __read_mostly; - static __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_hash_lock); - - __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock); -+EXPORT_SYMBOL(inode_sb_list_lock); - - /* - * Empty aops. Can be used for the cases where the user does not -@@ -1507,6 +1508,7 @@ int update_time(struct inode *inode, struct timespec *time, int flags) - mark_inode_dirty_sync(inode); - return 0; - } -+EXPORT_SYMBOL(update_time); - - /** - * touch_atime - update the access time -diff --git a/fs/namespace.c b/fs/namespace.c -index 7bdf790..5b85c4c 100644 ---- a/fs/namespace.c -+++ b/fs/namespace.c -@@ -50,6 +50,7 @@ EXPORT_SYMBOL_GPL(fs_kobj); - * tree or hash is modified or when a vfsmount structure is modified. - */ - DEFINE_BRLOCK(vfsmount_lock); -+EXPORT_SYMBOL(vfsmount_lock); - - static inline unsigned long hash(struct vfsmount *mnt, struct dentry *dentry) - { -@@ -1401,6 +1402,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, - } - return 0; - } -+EXPORT_SYMBOL(iterate_mounts); - - static void cleanup_group_ids(struct mount *mnt, struct mount *end) - { -diff --git a/fs/notify/group.c b/fs/notify/group.c -index 63fc294..6f4adca 100644 ---- a/fs/notify/group.c -+++ b/fs/notify/group.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #include - #include "fsnotify.h" -@@ -70,6 +71,7 @@ void fsnotify_put_group(struct fsnotify_group *group) - if (atomic_dec_and_test(&group->refcnt)) - fsnotify_destroy_group(group); - } -+EXPORT_SYMBOL(fsnotify_put_group); - - /* - * Create a new fsnotify_group and hold a reference for the group returned. -@@ -102,3 +104,4 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops) - - return group; - } -+EXPORT_SYMBOL(fsnotify_alloc_group); -diff --git a/fs/notify/mark.c b/fs/notify/mark.c -index f104d56..54f36db 100644 ---- a/fs/notify/mark.c -+++ b/fs/notify/mark.c -@@ -112,6 +112,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark) - if (atomic_dec_and_test(&mark->refcnt)) - mark->free_mark(mark); - } -+EXPORT_SYMBOL(fsnotify_put_mark); - - /* - * Any time a mark is getting freed we end up here. -@@ -191,6 +192,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark) - if (unlikely(atomic_dec_and_test(&group->num_marks))) - fsnotify_final_destroy_group(group); - } -+EXPORT_SYMBOL(fsnotify_destroy_mark); - - void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask) - { -@@ -278,6 +280,7 @@ err: - - return ret; - } -+EXPORT_SYMBOL(fsnotify_add_mark); - - /* - * clear any marks in a group in which mark->flags & flags is true -@@ -333,6 +336,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark, - atomic_set(&mark->refcnt, 1); - mark->free_mark = free_mark; - } -+EXPORT_SYMBOL(fsnotify_init_mark); - - static int fsnotify_mark_destroy(void *ignored) - { -diff --git a/fs/open.c b/fs/open.c -index e1f2cdb..2804cd6 100644 ---- a/fs/open.c -+++ b/fs/open.c -@@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, - mutex_unlock(&dentry->d_inode->i_mutex); - return ret; - } -+EXPORT_SYMBOL(do_truncate); - - static long do_sys_truncate(const char __user *pathname, loff_t length) - { -diff --git a/fs/splice.c b/fs/splice.c -index 663b402..51e1deb 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1117,6 +1117,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - - return splice_write(pipe, out, ppos, len, flags); - } -+EXPORT_SYMBOL(do_splice_from); - - /* - * Attempt to initiate a splice from a file to a pipe. -@@ -1143,6 +1144,7 @@ long do_splice_to(struct file *in, loff_t *ppos, - - return splice_read(in, ppos, pipe, len, flags); - } -+EXPORT_SYMBOL(do_splice_to); - - /** - * splice_direct_to_actor - splices data directly between two non-pipes -diff --git a/security/commoncap.c b/security/commoncap.c -index 6dbae46..9f4f29a 100644 ---- a/security/commoncap.c -+++ b/security/commoncap.c -@@ -979,9 +979,11 @@ int cap_mmap_addr(unsigned long addr) - } - return ret; - } -+EXPORT_SYMBOL(cap_mmap_addr); - - int cap_mmap_file(struct file *file, unsigned long reqprot, - unsigned long prot, unsigned long flags) - { - return 0; - } -+EXPORT_SYMBOL(cap_mmap_file); -diff --git a/security/device_cgroup.c b/security/device_cgroup.c -index 442204c..e644a1c 100644 ---- a/security/device_cgroup.c -+++ b/security/device_cgroup.c -@@ -7,6 +7,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -493,6 +494,7 @@ found: - - return -EPERM; - } -+EXPORT_SYMBOL(__devcgroup_inode_permission); - - int devcgroup_inode_mknod(int mode, dev_t dev) - { -diff --git a/security/security.c b/security/security.c -index 860aeb3..ffb57bf 100644 ---- a/security/security.c -+++ b/security/security.c -@@ -384,6 +384,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry) - return 0; - return security_ops->path_rmdir(dir, dentry); - } -+EXPORT_SYMBOL(security_path_rmdir); - - int security_path_unlink(struct path *dir, struct dentry *dentry) - { -@@ -400,6 +401,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry, - return 0; - return security_ops->path_symlink(dir, dentry, old_name); - } -+EXPORT_SYMBOL(security_path_symlink); - - int security_path_link(struct dentry *old_dentry, struct path *new_dir, - struct dentry *new_dentry) -@@ -408,6 +410,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir, - return 0; - return security_ops->path_link(old_dentry, new_dir, new_dentry); - } -+EXPORT_SYMBOL(security_path_link); - - int security_path_rename(struct path *old_dir, struct dentry *old_dentry, - struct path *new_dir, struct dentry *new_dentry) -@@ -426,6 +429,7 @@ int security_path_truncate(struct path *path) - return 0; - return security_ops->path_truncate(path); - } -+EXPORT_SYMBOL(security_path_truncate); - - int security_path_chmod(struct path *path, umode_t mode) - { -@@ -433,6 +437,7 @@ int security_path_chmod(struct path *path, umode_t mode) - return 0; - return security_ops->path_chmod(path, mode); - } -+EXPORT_SYMBOL(security_path_chmod); - - int security_path_chown(struct path *path, uid_t uid, gid_t gid) - { -@@ -440,6 +445,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid) - return 0; - return security_ops->path_chown(path, uid, gid); - } -+EXPORT_SYMBOL(security_path_chown); - - int security_path_chroot(struct path *path) - { -@@ -516,6 +522,7 @@ int security_inode_readlink(struct dentry *dentry) - return 0; - return security_ops->inode_readlink(dentry); - } -+EXPORT_SYMBOL(security_inode_readlink); - - int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd) - { -@@ -530,6 +537,7 @@ int security_inode_permission(struct inode *inode, int mask) - return 0; - return security_ops->inode_permission(inode, mask); - } -+EXPORT_SYMBOL(security_inode_permission); - - int security_inode_setattr(struct dentry *dentry, struct iattr *attr) - { -@@ -645,6 +653,7 @@ int security_file_permission(struct file *file, int mask) - - return fsnotify_perm(file, mask); - } -+EXPORT_SYMBOL(security_file_permission); - - int security_file_alloc(struct file *file) - { -@@ -705,6 +714,7 @@ int security_mmap_file(struct file *file, unsigned long prot, - return ret; - return ima_file_mmap(file, prot); - } -+EXPORT_SYMBOL(security_mmap_file); - - int security_mmap_addr(unsigned long addr) - { diff --git a/sys-fs/aufs3/files/3_p20121112/aufs3-standalone-x-rcN.patch b/sys-fs/aufs3/files/3_p20121112/aufs3-standalone-x-rcN.patch deleted file mode 100644 index dc4e73cad9d1..000000000000 --- a/sys-fs/aufs3/files/3_p20121112/aufs3-standalone-x-rcN.patch +++ /dev/null @@ -1,276 +0,0 @@ -aufs3.x-rcN standalone patch - -diff --git a/fs/file_table.c b/fs/file_table.c -index dac6792..e3f2c15 100644 ---- a/fs/file_table.c -+++ b/fs/file_table.c -@@ -37,6 +37,7 @@ struct files_stat_struct files_stat = { - }; - - DEFINE_LGLOCK(files_lglock); -+EXPORT_SYMBOL(files_lglock); - - /* SLAB cache for file structures */ - static struct kmem_cache *filp_cachep __read_mostly; -@@ -403,6 +404,8 @@ void file_sb_list_del(struct file *file) - } - } - -+EXPORT_SYMBOL(file_sb_list_del); -+ - #ifdef CONFIG_SMP - - /* -diff --git a/fs/inode.c b/fs/inode.c -index ee497f9..5e7eee7 100644 ---- a/fs/inode.c -+++ b/fs/inode.c -@@ -56,6 +56,7 @@ static struct hlist_head *inode_hashtable __read_mostly; - static __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_hash_lock); - - __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock); -+EXPORT_SYMBOL(inode_sb_list_lock); - - /* - * Empty aops. Can be used for the cases where the user does not -@@ -1507,6 +1508,7 @@ int update_time(struct inode *inode, struct timespec *time, int flags) - mark_inode_dirty_sync(inode); - return 0; - } -+EXPORT_SYMBOL(update_time); - - /** - * touch_atime - update the access time -diff --git a/fs/namespace.c b/fs/namespace.c -index 2496062..3e66a90 100644 ---- a/fs/namespace.c -+++ b/fs/namespace.c -@@ -50,6 +50,7 @@ EXPORT_SYMBOL_GPL(fs_kobj); - * tree or hash is modified or when a vfsmount structure is modified. - */ - DEFINE_BRLOCK(vfsmount_lock); -+EXPORT_SYMBOL(vfsmount_lock); - - static inline unsigned long hash(struct vfsmount *mnt, struct dentry *dentry) - { -@@ -1401,6 +1402,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, - } - return 0; - } -+EXPORT_SYMBOL(iterate_mounts); - - static void cleanup_group_ids(struct mount *mnt, struct mount *end) - { -diff --git a/fs/notify/group.c b/fs/notify/group.c -index 63fc294..6f4adca 100644 ---- a/fs/notify/group.c -+++ b/fs/notify/group.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #include - #include "fsnotify.h" -@@ -70,6 +71,7 @@ void fsnotify_put_group(struct fsnotify_group *group) - if (atomic_dec_and_test(&group->refcnt)) - fsnotify_destroy_group(group); - } -+EXPORT_SYMBOL(fsnotify_put_group); - - /* - * Create a new fsnotify_group and hold a reference for the group returned. -@@ -102,3 +104,4 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops) - - return group; - } -+EXPORT_SYMBOL(fsnotify_alloc_group); -diff --git a/fs/notify/mark.c b/fs/notify/mark.c -index f104d56..54f36db 100644 ---- a/fs/notify/mark.c -+++ b/fs/notify/mark.c -@@ -112,6 +112,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark) - if (atomic_dec_and_test(&mark->refcnt)) - mark->free_mark(mark); - } -+EXPORT_SYMBOL(fsnotify_put_mark); - - /* - * Any time a mark is getting freed we end up here. -@@ -191,6 +192,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark) - if (unlikely(atomic_dec_and_test(&group->num_marks))) - fsnotify_final_destroy_group(group); - } -+EXPORT_SYMBOL(fsnotify_destroy_mark); - - void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask) - { -@@ -278,6 +280,7 @@ err: - - return ret; - } -+EXPORT_SYMBOL(fsnotify_add_mark); - - /* - * clear any marks in a group in which mark->flags & flags is true -@@ -333,6 +336,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark, - atomic_set(&mark->refcnt, 1); - mark->free_mark = free_mark; - } -+EXPORT_SYMBOL(fsnotify_init_mark); - - static int fsnotify_mark_destroy(void *ignored) - { -diff --git a/fs/open.c b/fs/open.c -index 59071f5..7e4c856 100644 ---- a/fs/open.c -+++ b/fs/open.c -@@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, - mutex_unlock(&dentry->d_inode->i_mutex); - return ret; - } -+EXPORT_SYMBOL(do_truncate); - - static long do_sys_truncate(const char __user *pathname, loff_t length) - { -diff --git a/fs/splice.c b/fs/splice.c -index f185c6c..f3d89da 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1117,6 +1117,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - - return splice_write(pipe, out, ppos, len, flags); - } -+EXPORT_SYMBOL(do_splice_from); - - /* - * Attempt to initiate a splice from a file to a pipe. -@@ -1143,6 +1144,7 @@ long do_splice_to(struct file *in, loff_t *ppos, - - return splice_read(in, ppos, pipe, len, flags); - } -+EXPORT_SYMBOL(do_splice_to); - - /** - * splice_direct_to_actor - splices data directly between two non-pipes -diff --git a/security/commoncap.c b/security/commoncap.c -index 6dbae46..9f4f29a 100644 ---- a/security/commoncap.c -+++ b/security/commoncap.c -@@ -979,9 +979,11 @@ int cap_mmap_addr(unsigned long addr) - } - return ret; - } -+EXPORT_SYMBOL(cap_mmap_addr); - - int cap_mmap_file(struct file *file, unsigned long reqprot, - unsigned long prot, unsigned long flags) - { - return 0; - } -+EXPORT_SYMBOL(cap_mmap_file); -diff --git a/security/device_cgroup.c b/security/device_cgroup.c -index 842c254..e7dd469 100644 ---- a/security/device_cgroup.c -+++ b/security/device_cgroup.c -@@ -7,6 +7,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -609,6 +610,7 @@ int __devcgroup_inode_permission(struct inode *inode, int mask) - return __devcgroup_check_permission(type, imajor(inode), iminor(inode), - access); - } -+EXPORT_SYMBOL(__devcgroup_inode_permission); - - int devcgroup_inode_mknod(int mode, dev_t dev) - { -diff --git a/security/security.c b/security/security.c -index 8dcd4ae..6efe561 100644 ---- a/security/security.c -+++ b/security/security.c -@@ -396,6 +396,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry) - return 0; - return security_ops->path_rmdir(dir, dentry); - } -+EXPORT_SYMBOL(security_path_rmdir); - - int security_path_unlink(struct path *dir, struct dentry *dentry) - { -@@ -412,6 +413,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry, - return 0; - return security_ops->path_symlink(dir, dentry, old_name); - } -+EXPORT_SYMBOL(security_path_symlink); - - int security_path_link(struct dentry *old_dentry, struct path *new_dir, - struct dentry *new_dentry) -@@ -420,6 +422,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir, - return 0; - return security_ops->path_link(old_dentry, new_dir, new_dentry); - } -+EXPORT_SYMBOL(security_path_link); - - int security_path_rename(struct path *old_dir, struct dentry *old_dentry, - struct path *new_dir, struct dentry *new_dentry) -@@ -438,6 +441,7 @@ int security_path_truncate(struct path *path) - return 0; - return security_ops->path_truncate(path); - } -+EXPORT_SYMBOL(security_path_truncate); - - int security_path_chmod(struct path *path, umode_t mode) - { -@@ -445,6 +449,7 @@ int security_path_chmod(struct path *path, umode_t mode) - return 0; - return security_ops->path_chmod(path, mode); - } -+EXPORT_SYMBOL(security_path_chmod); - - int security_path_chown(struct path *path, kuid_t uid, kgid_t gid) - { -@@ -452,6 +457,7 @@ int security_path_chown(struct path *path, kuid_t uid, kgid_t gid) - return 0; - return security_ops->path_chown(path, uid, gid); - } -+EXPORT_SYMBOL(security_path_chown); - - int security_path_chroot(struct path *path) - { -@@ -528,6 +534,7 @@ int security_inode_readlink(struct dentry *dentry) - return 0; - return security_ops->inode_readlink(dentry); - } -+EXPORT_SYMBOL(security_inode_readlink); - - int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd) - { -@@ -542,6 +549,7 @@ int security_inode_permission(struct inode *inode, int mask) - return 0; - return security_ops->inode_permission(inode, mask); - } -+EXPORT_SYMBOL(security_inode_permission); - - int security_inode_setattr(struct dentry *dentry, struct iattr *attr) - { -@@ -663,6 +671,7 @@ int security_file_permission(struct file *file, int mask) - - return fsnotify_perm(file, mask); - } -+EXPORT_SYMBOL(security_file_permission); - - int security_file_alloc(struct file *file) - { -@@ -723,6 +732,7 @@ int security_mmap_file(struct file *file, unsigned long prot, - return ret; - return ima_file_mmap(file, prot); - } -+EXPORT_SYMBOL(security_mmap_file); - - int security_mmap_addr(unsigned long addr) - { diff --git a/sys-fs/aufs3/files/3_p20121129/aufs3-base-0.patch b/sys-fs/aufs3/files/3_p20121129/aufs3-base-0.patch deleted file mode 100644 index 7fa7db4ee6c7..000000000000 --- a/sys-fs/aufs3/files/3_p20121129/aufs3-base-0.patch +++ /dev/null @@ -1,70 +0,0 @@ -aufs3.0 base patch - -diff --git a/fs/namei.c b/fs/namei.c -index 14ab8d3..eb4aef1 100644 ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -1697,7 +1697,7 @@ static struct dentry *__lookup_hash(struct qstr *name, - * needs parent already locked. Doesn't follow mounts. - * SMP-safe. - */ --static struct dentry *lookup_hash(struct nameidata *nd) -+struct dentry *lookup_hash(struct nameidata *nd) - { - return __lookup_hash(&nd->last, nd->path.dentry, nd); - } -diff --git a/fs/splice.c b/fs/splice.c -index aa866d3..19afec6 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1085,8 +1085,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); - /* - * Attempt to initiate a splice from pipe to file. - */ --static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -- loff_t *ppos, size_t len, unsigned int flags) -+long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags) - { - ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, - loff_t *, size_t, unsigned int); -@@ -1113,9 +1113,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - /* - * Attempt to initiate a splice from a file to a pipe. - */ --static long do_splice_to(struct file *in, loff_t *ppos, -- struct pipe_inode_info *pipe, size_t len, -- unsigned int flags) -+long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags) - { - ssize_t (*splice_read)(struct file *, loff_t *, - struct pipe_inode_info *, size_t, unsigned int); -diff --git a/include/linux/namei.h b/include/linux/namei.h -index eba45ea..21ed6c9 100644 ---- a/include/linux/namei.h -+++ b/include/linux/namei.h -@@ -82,6 +82,7 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *, - extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry, - int (*open)(struct inode *, struct file *)); - -+extern struct dentry *lookup_hash(struct nameidata *nd); - extern struct dentry *lookup_one_len(const char *, struct dentry *, int); - - extern int follow_down_one(struct path *); -diff --git a/include/linux/splice.h b/include/linux/splice.h -index 997c3b4..be9a153 100644 ---- a/include/linux/splice.h -+++ b/include/linux/splice.h -@@ -89,4 +89,10 @@ extern int splice_grow_spd(struct pipe_inode_info *, struct splice_pipe_desc *); - extern void splice_shrink_spd(struct pipe_inode_info *, - struct splice_pipe_desc *); - -+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags); -+extern long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags); -+ - #endif diff --git a/sys-fs/aufs3/files/3_p20121129/aufs3-base-1.patch b/sys-fs/aufs3/files/3_p20121129/aufs3-base-1.patch deleted file mode 100644 index 928c3cec768c..000000000000 --- a/sys-fs/aufs3/files/3_p20121129/aufs3-base-1.patch +++ /dev/null @@ -1,70 +0,0 @@ -aufs3.1 base patch - -diff --git a/fs/namei.c b/fs/namei.c -index 0b3138d..8edad02 100644 ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -1748,7 +1748,7 @@ static struct dentry *__lookup_hash(struct qstr *name, - * needs parent already locked. Doesn't follow mounts. - * SMP-safe. - */ --static struct dentry *lookup_hash(struct nameidata *nd) -+struct dentry *lookup_hash(struct nameidata *nd) - { - return __lookup_hash(&nd->last, nd->path.dentry, nd); - } -diff --git a/fs/splice.c b/fs/splice.c -index fa2defa..e3569b0 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1085,8 +1085,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); - /* - * Attempt to initiate a splice from pipe to file. - */ --static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -- loff_t *ppos, size_t len, unsigned int flags) -+long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags) - { - ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, - loff_t *, size_t, unsigned int); -@@ -1113,9 +1113,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - /* - * Attempt to initiate a splice from a file to a pipe. - */ --static long do_splice_to(struct file *in, loff_t *ppos, -- struct pipe_inode_info *pipe, size_t len, -- unsigned int flags) -+long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags) - { - ssize_t (*splice_read)(struct file *, loff_t *, - struct pipe_inode_info *, size_t, unsigned int); -diff --git a/include/linux/namei.h b/include/linux/namei.h -index 409328d..40afdc0 100644 ---- a/include/linux/namei.h -+++ b/include/linux/namei.h -@@ -84,6 +84,7 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *, - extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry, - int (*open)(struct inode *, struct file *)); - -+extern struct dentry *lookup_hash(struct nameidata *nd); - extern struct dentry *lookup_one_len(const char *, struct dentry *, int); - - extern int follow_down_one(struct path *); -diff --git a/include/linux/splice.h b/include/linux/splice.h -index 26e5b61..3ffef2f 100644 ---- a/include/linux/splice.h -+++ b/include/linux/splice.h -@@ -91,4 +91,10 @@ extern void splice_shrink_spd(struct pipe_inode_info *, - extern void spd_release_page(struct splice_pipe_desc *, unsigned int); - - extern const struct pipe_buf_operations page_cache_pipe_buf_ops; -+ -+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags); -+extern long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags); - #endif diff --git a/sys-fs/aufs3/files/3_p20121129/aufs3-base-2.patch b/sys-fs/aufs3/files/3_p20121129/aufs3-base-2.patch deleted file mode 100644 index ac30c8db9033..000000000000 --- a/sys-fs/aufs3/files/3_p20121129/aufs3-base-2.patch +++ /dev/null @@ -1,70 +0,0 @@ -aufs3.2 base patch - -diff --git a/fs/namei.c b/fs/namei.c -index 5008f01..4cc94cf 100644 ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -1753,7 +1753,7 @@ static struct dentry *__lookup_hash(struct qstr *name, - * needs parent already locked. Doesn't follow mounts. - * SMP-safe. - */ --static struct dentry *lookup_hash(struct nameidata *nd) -+struct dentry *lookup_hash(struct nameidata *nd) - { - return __lookup_hash(&nd->last, nd->path.dentry, nd); - } -diff --git a/fs/splice.c b/fs/splice.c -index fa2defa..e3569b0 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1085,8 +1085,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); - /* - * Attempt to initiate a splice from pipe to file. - */ --static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -- loff_t *ppos, size_t len, unsigned int flags) -+long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags) - { - ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, - loff_t *, size_t, unsigned int); -@@ -1113,9 +1113,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - /* - * Attempt to initiate a splice from a file to a pipe. - */ --static long do_splice_to(struct file *in, loff_t *ppos, -- struct pipe_inode_info *pipe, size_t len, -- unsigned int flags) -+long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags) - { - ssize_t (*splice_read)(struct file *, loff_t *, - struct pipe_inode_info *, size_t, unsigned int); -diff --git a/include/linux/namei.h b/include/linux/namei.h -index ffc0213..ef35a31 100644 ---- a/include/linux/namei.h -+++ b/include/linux/namei.h -@@ -85,6 +85,7 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *, - extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry, - int (*open)(struct inode *, struct file *)); - -+extern struct dentry *lookup_hash(struct nameidata *nd); - extern struct dentry *lookup_one_len(const char *, struct dentry *, int); - - extern int follow_down_one(struct path *); -diff --git a/include/linux/splice.h b/include/linux/splice.h -index 26e5b61..3ffef2f 100644 ---- a/include/linux/splice.h -+++ b/include/linux/splice.h -@@ -91,4 +91,10 @@ extern void splice_shrink_spd(struct pipe_inode_info *, - extern void spd_release_page(struct splice_pipe_desc *, unsigned int); - - extern const struct pipe_buf_operations page_cache_pipe_buf_ops; -+ -+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags); -+extern long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags); - #endif diff --git a/sys-fs/aufs3/files/3_p20121129/aufs3-base-3.patch b/sys-fs/aufs3/files/3_p20121129/aufs3-base-3.patch deleted file mode 100644 index 99a63d024c3c..000000000000 --- a/sys-fs/aufs3/files/3_p20121129/aufs3-base-3.patch +++ /dev/null @@ -1,70 +0,0 @@ -aufs3.3 base patch - -diff --git a/fs/namei.c b/fs/namei.c -index 46ea9cc..f2dcf8d 100644 ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -1781,7 +1781,7 @@ static struct dentry *__lookup_hash(struct qstr *name, - * needs parent already locked. Doesn't follow mounts. - * SMP-safe. - */ --static struct dentry *lookup_hash(struct nameidata *nd) -+struct dentry *lookup_hash(struct nameidata *nd) - { - return __lookup_hash(&nd->last, nd->path.dentry, nd); - } -diff --git a/fs/splice.c b/fs/splice.c -index 1ec0493..c599f73 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1084,8 +1084,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); - /* - * Attempt to initiate a splice from pipe to file. - */ --static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -- loff_t *ppos, size_t len, unsigned int flags) -+long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags) - { - ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, - loff_t *, size_t, unsigned int); -@@ -1112,9 +1112,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - /* - * Attempt to initiate a splice from a file to a pipe. - */ --static long do_splice_to(struct file *in, loff_t *ppos, -- struct pipe_inode_info *pipe, size_t len, -- unsigned int flags) -+long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags) - { - ssize_t (*splice_read)(struct file *, loff_t *, - struct pipe_inode_info *, size_t, unsigned int); -diff --git a/include/linux/namei.h b/include/linux/namei.h -index ffc0213..ef35a31 100644 ---- a/include/linux/namei.h -+++ b/include/linux/namei.h -@@ -85,6 +85,7 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *, - extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry, - int (*open)(struct inode *, struct file *)); - -+extern struct dentry *lookup_hash(struct nameidata *nd); - extern struct dentry *lookup_one_len(const char *, struct dentry *, int); - - extern int follow_down_one(struct path *); -diff --git a/include/linux/splice.h b/include/linux/splice.h -index 26e5b61..3ffef2f 100644 ---- a/include/linux/splice.h -+++ b/include/linux/splice.h -@@ -91,4 +91,10 @@ extern void splice_shrink_spd(struct pipe_inode_info *, - extern void spd_release_page(struct splice_pipe_desc *, unsigned int); - - extern const struct pipe_buf_operations page_cache_pipe_buf_ops; -+ -+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags); -+extern long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags); - #endif diff --git a/sys-fs/aufs3/files/3_p20121129/aufs3-base-4.patch b/sys-fs/aufs3/files/3_p20121129/aufs3-base-4.patch deleted file mode 100644 index d639d79bd228..000000000000 --- a/sys-fs/aufs3/files/3_p20121129/aufs3-base-4.patch +++ /dev/null @@ -1,70 +0,0 @@ -aufs3.4 base patch - -diff --git a/fs/namei.c b/fs/namei.c -index c427919..7ff959b 100644 ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -1831,7 +1831,7 @@ int vfs_path_lookup(struct dentry *dentry, struct vfsmount *mnt, - * needs parent already locked. Doesn't follow mounts. - * SMP-safe. - */ --static struct dentry *lookup_hash(struct nameidata *nd) -+struct dentry *lookup_hash(struct nameidata *nd) - { - return __lookup_hash(&nd->last, nd->path.dentry, nd); - } -diff --git a/fs/splice.c b/fs/splice.c -index f847684..f871233 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1084,8 +1084,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); - /* - * Attempt to initiate a splice from pipe to file. - */ --static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -- loff_t *ppos, size_t len, unsigned int flags) -+long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags) - { - ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, - loff_t *, size_t, unsigned int); -@@ -1112,9 +1112,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - /* - * Attempt to initiate a splice from a file to a pipe. - */ --static long do_splice_to(struct file *in, loff_t *ppos, -- struct pipe_inode_info *pipe, size_t len, -- unsigned int flags) -+long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags) - { - ssize_t (*splice_read)(struct file *, loff_t *, - struct pipe_inode_info *, size_t, unsigned int); -diff --git a/include/linux/namei.h b/include/linux/namei.h -index ffc0213..ef35a31 100644 ---- a/include/linux/namei.h -+++ b/include/linux/namei.h -@@ -85,6 +85,7 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *, - extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry, - int (*open)(struct inode *, struct file *)); - -+extern struct dentry *lookup_hash(struct nameidata *nd); - extern struct dentry *lookup_one_len(const char *, struct dentry *, int); - - extern int follow_down_one(struct path *); -diff --git a/include/linux/splice.h b/include/linux/splice.h -index 26e5b61..3ffef2f 100644 ---- a/include/linux/splice.h -+++ b/include/linux/splice.h -@@ -91,4 +91,10 @@ extern void splice_shrink_spd(struct pipe_inode_info *, - extern void spd_release_page(struct splice_pipe_desc *, unsigned int); - - extern const struct pipe_buf_operations page_cache_pipe_buf_ops; -+ -+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags); -+extern long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags); - #endif diff --git a/sys-fs/aufs3/files/3_p20121129/aufs3-base-5.patch b/sys-fs/aufs3/files/3_p20121129/aufs3-base-5.patch deleted file mode 100644 index 94a6d9aea862..000000000000 --- a/sys-fs/aufs3/files/3_p20121129/aufs3-base-5.patch +++ /dev/null @@ -1,95 +0,0 @@ -aufs3.5 base patch - -diff --git a/fs/inode.c b/fs/inode.c -index c99163b..7f772fd 100644 ---- a/fs/inode.c -+++ b/fs/inode.c -@@ -1491,7 +1491,7 @@ static int relatime_need_update(struct vfsmount *mnt, struct inode *inode, - * This does the actual work of updating an inodes time or version. Must have - * had called mnt_want_write() before calling this. - */ --static int update_time(struct inode *inode, struct timespec *time, int flags) -+int update_time(struct inode *inode, struct timespec *time, int flags) - { - if (inode->i_op->update_time) - return inode->i_op->update_time(inode, time, flags); -diff --git a/fs/namei.c b/fs/namei.c -index 7d69419..18c9782 100644 ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -1864,7 +1864,7 @@ int vfs_path_lookup(struct dentry *dentry, struct vfsmount *mnt, - * needs parent already locked. Doesn't follow mounts. - * SMP-safe. - */ --static struct dentry *lookup_hash(struct nameidata *nd) -+struct dentry *lookup_hash(struct nameidata *nd) - { - return __lookup_hash(&nd->last, nd->path.dentry, nd); - } -diff --git a/fs/splice.c b/fs/splice.c -index 7bf08fa..e3c40b5 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1090,8 +1090,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); - /* - * Attempt to initiate a splice from pipe to file. - */ --static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -- loff_t *ppos, size_t len, unsigned int flags) -+long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags) - { - ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, - loff_t *, size_t, unsigned int); -@@ -1118,9 +1118,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - /* - * Attempt to initiate a splice from a file to a pipe. - */ --static long do_splice_to(struct file *in, loff_t *ppos, -- struct pipe_inode_info *pipe, size_t len, -- unsigned int flags) -+long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags) - { - ssize_t (*splice_read)(struct file *, loff_t *, - struct pipe_inode_info *, size_t, unsigned int); -diff --git a/include/linux/fs.h b/include/linux/fs.h -index 17fd887..9c75a47 100644 ---- a/include/linux/fs.h -+++ b/include/linux/fs.h -@@ -2591,6 +2591,7 @@ extern int inode_change_ok(const struct inode *, struct iattr *); - extern int inode_newsize_ok(const struct inode *, loff_t offset); - extern void setattr_copy(struct inode *inode, const struct iattr *attr); - -+extern int update_time(struct inode *, struct timespec *, int); - extern int file_update_time(struct file *file); - - extern int generic_show_options(struct seq_file *m, struct dentry *root); -diff --git a/include/linux/namei.h b/include/linux/namei.h -index ffc0213..ef35a31 100644 ---- a/include/linux/namei.h -+++ b/include/linux/namei.h -@@ -85,6 +85,7 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *, - extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry, - int (*open)(struct inode *, struct file *)); - -+extern struct dentry *lookup_hash(struct nameidata *nd); - extern struct dentry *lookup_one_len(const char *, struct dentry *, int); - - extern int follow_down_one(struct path *); -diff --git a/include/linux/splice.h b/include/linux/splice.h -index 09a545a..1ac5727 100644 ---- a/include/linux/splice.h -+++ b/include/linux/splice.h -@@ -91,4 +91,10 @@ extern void splice_shrink_spd(struct splice_pipe_desc *); - extern void spd_release_page(struct splice_pipe_desc *, unsigned int); - - extern const struct pipe_buf_operations page_cache_pipe_buf_ops; -+ -+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags); -+extern long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags); - #endif diff --git a/sys-fs/aufs3/files/3_p20121129/aufs3-base-6.patch b/sys-fs/aufs3/files/3_p20121129/aufs3-base-6.patch deleted file mode 100644 index adb9ab7ccfdb..000000000000 --- a/sys-fs/aufs3/files/3_p20121129/aufs3-base-6.patch +++ /dev/null @@ -1,70 +0,0 @@ -aufs3.6 base patch - -diff --git a/fs/inode.c b/fs/inode.c -index ac8d904..7b2c8fa 100644 ---- a/fs/inode.c -+++ b/fs/inode.c -@@ -1491,7 +1491,7 @@ static int relatime_need_update(struct vfsmount *mnt, struct inode *inode, - * This does the actual work of updating an inodes time or version. Must have - * had called mnt_want_write() before calling this. - */ --static int update_time(struct inode *inode, struct timespec *time, int flags) -+int update_time(struct inode *inode, struct timespec *time, int flags) - { - if (inode->i_op->update_time) - return inode->i_op->update_time(inode, time, flags); -diff --git a/fs/splice.c b/fs/splice.c -index 41514dd..663b402 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1093,8 +1093,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); - /* - * Attempt to initiate a splice from pipe to file. - */ --static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -- loff_t *ppos, size_t len, unsigned int flags) -+long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags) - { - ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, - loff_t *, size_t, unsigned int); -@@ -1121,9 +1121,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - /* - * Attempt to initiate a splice from a file to a pipe. - */ --static long do_splice_to(struct file *in, loff_t *ppos, -- struct pipe_inode_info *pipe, size_t len, -- unsigned int flags) -+long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags) - { - ssize_t (*splice_read)(struct file *, loff_t *, - struct pipe_inode_info *, size_t, unsigned int); -diff --git a/include/linux/fs.h b/include/linux/fs.h -index aa11047..9116d2e 100644 ---- a/include/linux/fs.h -+++ b/include/linux/fs.h -@@ -2741,6 +2741,7 @@ extern int inode_change_ok(const struct inode *, struct iattr *); - extern int inode_newsize_ok(const struct inode *, loff_t offset); - extern void setattr_copy(struct inode *inode, const struct iattr *attr); - -+extern int update_time(struct inode *, struct timespec *, int); - extern int file_update_time(struct file *file); - - extern int generic_show_options(struct seq_file *m, struct dentry *root); -diff --git a/include/linux/splice.h b/include/linux/splice.h -index 09a545a..1ac5727 100644 ---- a/include/linux/splice.h -+++ b/include/linux/splice.h -@@ -91,4 +91,10 @@ extern void splice_shrink_spd(struct splice_pipe_desc *); - extern void spd_release_page(struct splice_pipe_desc *, unsigned int); - - extern const struct pipe_buf_operations page_cache_pipe_buf_ops; -+ -+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags); -+extern long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags); - #endif diff --git a/sys-fs/aufs3/files/3_p20121129/aufs3-base-x-rcN.patch b/sys-fs/aufs3/files/3_p20121129/aufs3-base-x-rcN.patch deleted file mode 100644 index 4514a59ec444..000000000000 --- a/sys-fs/aufs3/files/3_p20121129/aufs3-base-x-rcN.patch +++ /dev/null @@ -1,83 +0,0 @@ -aufs3.x-rcN base patch - -diff --git a/fs/file_table.c b/fs/file_table.c -index a72bf9d..dac6792 100644 ---- a/fs/file_table.c -+++ b/fs/file_table.c -@@ -36,7 +36,7 @@ struct files_stat_struct files_stat = { - .max_files = NR_FILE - }; - --DEFINE_STATIC_LGLOCK(files_lglock); -+DEFINE_LGLOCK(files_lglock); - - /* SLAB cache for file structures */ - static struct kmem_cache *filp_cachep __read_mostly; -diff --git a/fs/inode.c b/fs/inode.c -index b03c719..ee497f9 100644 ---- a/fs/inode.c -+++ b/fs/inode.c -@@ -1491,7 +1491,7 @@ static int relatime_need_update(struct vfsmount *mnt, struct inode *inode, - * This does the actual work of updating an inodes time or version. Must have - * had called mnt_want_write() before calling this. - */ --static int update_time(struct inode *inode, struct timespec *time, int flags) -+int update_time(struct inode *inode, struct timespec *time, int flags) - { - if (inode->i_op->update_time) - return inode->i_op->update_time(inode, time, flags); -diff --git a/fs/splice.c b/fs/splice.c -index 13e5b47..f185c6c 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1093,8 +1093,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); - /* - * Attempt to initiate a splice from pipe to file. - */ --static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -- loff_t *ppos, size_t len, unsigned int flags) -+long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags) - { - ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, - loff_t *, size_t, unsigned int); -@@ -1121,9 +1121,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - /* - * Attempt to initiate a splice from a file to a pipe. - */ --static long do_splice_to(struct file *in, loff_t *ppos, -- struct pipe_inode_info *pipe, size_t len, -- unsigned int flags) -+long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags) - { - ssize_t (*splice_read)(struct file *, loff_t *, - struct pipe_inode_info *, size_t, unsigned int); -diff --git a/include/linux/fs.h b/include/linux/fs.h -index b33cfc9..963a61b 100644 ---- a/include/linux/fs.h -+++ b/include/linux/fs.h -@@ -2558,6 +2558,7 @@ extern int inode_change_ok(const struct inode *, struct iattr *); - extern int inode_newsize_ok(const struct inode *, loff_t offset); - extern void setattr_copy(struct inode *inode, const struct iattr *attr); - -+extern int update_time(struct inode *, struct timespec *, int); - extern int file_update_time(struct file *file); - - extern int generic_show_options(struct seq_file *m, struct dentry *root); -diff --git a/include/linux/splice.h b/include/linux/splice.h -index 09a545a..1ac5727 100644 ---- a/include/linux/splice.h -+++ b/include/linux/splice.h -@@ -91,4 +91,10 @@ extern void splice_shrink_spd(struct splice_pipe_desc *); - extern void spd_release_page(struct splice_pipe_desc *, unsigned int); - - extern const struct pipe_buf_operations page_cache_pipe_buf_ops; -+ -+extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, -+ loff_t *ppos, size_t len, unsigned int flags); -+extern long do_splice_to(struct file *in, loff_t *ppos, -+ struct pipe_inode_info *pipe, size_t len, -+ unsigned int flags); - #endif diff --git a/sys-fs/aufs3/files/3_p20121129/aufs3-standalone-0.patch b/sys-fs/aufs3/files/3_p20121129/aufs3-standalone-0.patch deleted file mode 100644 index ada3df9d4b06..000000000000 --- a/sys-fs/aufs3/files/3_p20121129/aufs3-standalone-0.patch +++ /dev/null @@ -1,257 +0,0 @@ -aufs3.0 standalone patch - -diff --git a/fs/file_table.c b/fs/file_table.c -index 01e4c1e..0e800e2 100644 ---- a/fs/file_table.c -+++ b/fs/file_table.c -@@ -443,6 +443,8 @@ void file_sb_list_del(struct file *file) - } - } - -+EXPORT_SYMBOL(file_sb_list_del); -+ - #ifdef CONFIG_SMP - - /* -diff --git a/fs/inode.c b/fs/inode.c -index 43566d1..4291eae 100644 ---- a/fs/inode.c -+++ b/fs/inode.c -@@ -69,6 +69,7 @@ static DEFINE_SPINLOCK(inode_lru_lock); - - __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock); - __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_wb_list_lock); -+EXPORT_SYMBOL(inode_sb_list_lock); - - /* - * iprune_sem provides exclusion between the icache shrinking and the -diff --git a/fs/namei.c b/fs/namei.c -index eb4aef1..66d04c6 100644 ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -365,6 +365,7 @@ int deny_write_access(struct file * file) - - return 0; - } -+EXPORT_SYMBOL(deny_write_access); - - /** - * path_get - get a reference to a path -@@ -1701,6 +1702,7 @@ struct dentry *lookup_hash(struct nameidata *nd) - { - return __lookup_hash(&nd->last, nd->path.dentry, nd); - } -+EXPORT_SYMBOL(lookup_hash); - - /** - * lookup_one_len - filesystem helper to lookup single pathname component -diff --git a/fs/namespace.c b/fs/namespace.c -index fe59bd1..7d3843f 100644 ---- a/fs/namespace.c -+++ b/fs/namespace.c -@@ -1508,6 +1508,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, - } - return 0; - } -+EXPORT_SYMBOL(iterate_mounts); - - static void cleanup_group_ids(struct vfsmount *mnt, struct vfsmount *end) - { -diff --git a/fs/notify/group.c b/fs/notify/group.c -index d309f38..f0e9568 100644 ---- a/fs/notify/group.c -+++ b/fs/notify/group.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #include - #include "fsnotify.h" -@@ -70,6 +71,7 @@ void fsnotify_put_group(struct fsnotify_group *group) - if (atomic_dec_and_test(&group->refcnt)) - fsnotify_destroy_group(group); - } -+EXPORT_SYMBOL(fsnotify_put_group); - - /* - * Create a new fsnotify_group and hold a reference for the group returned. -@@ -102,3 +104,4 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops) - - return group; - } -+EXPORT_SYMBOL(fsnotify_alloc_group); -diff --git a/fs/notify/mark.c b/fs/notify/mark.c -index 252ab1f..2199b9b 100644 ---- a/fs/notify/mark.c -+++ b/fs/notify/mark.c -@@ -112,6 +112,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark) - if (atomic_dec_and_test(&mark->refcnt)) - mark->free_mark(mark); - } -+EXPORT_SYMBOL(fsnotify_put_mark); - - /* - * Any time a mark is getting freed we end up here. -@@ -189,6 +190,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark) - if (unlikely(atomic_dec_and_test(&group->num_marks))) - fsnotify_final_destroy_group(group); - } -+EXPORT_SYMBOL(fsnotify_destroy_mark); - - void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask) - { -@@ -276,6 +278,7 @@ err: - - return ret; - } -+EXPORT_SYMBOL(fsnotify_add_mark); - - /* - * clear any marks in a group in which mark->flags & flags is true -@@ -331,6 +334,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark, - atomic_set(&mark->refcnt, 1); - mark->free_mark = free_mark; - } -+EXPORT_SYMBOL(fsnotify_init_mark); - - static int fsnotify_mark_destroy(void *ignored) - { -diff --git a/fs/open.c b/fs/open.c -index b52cf01..c1b341c 100644 ---- a/fs/open.c -+++ b/fs/open.c -@@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, - mutex_unlock(&dentry->d_inode->i_mutex); - return ret; - } -+EXPORT_SYMBOL(do_truncate); - - static long do_sys_truncate(const char __user *pathname, loff_t length) - { -diff --git a/fs/splice.c b/fs/splice.c -index 19afec6..11f07f86 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1109,6 +1109,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - - return splice_write(pipe, out, ppos, len, flags); - } -+EXPORT_SYMBOL(do_splice_from); - - /* - * Attempt to initiate a splice from a file to a pipe. -@@ -1135,6 +1136,7 @@ long do_splice_to(struct file *in, loff_t *ppos, - - return splice_read(in, ppos, pipe, len, flags); - } -+EXPORT_SYMBOL(do_splice_to); - - /** - * splice_direct_to_actor - splices data directly between two non-pipes -diff --git a/security/commoncap.c b/security/commoncap.c -index a93b3b7..024282c 100644 ---- a/security/commoncap.c -+++ b/security/commoncap.c -@@ -971,3 +971,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot, - } - return ret; - } -+EXPORT_SYMBOL(cap_file_mmap); -diff --git a/security/device_cgroup.c b/security/device_cgroup.c -index 1be6826..215278c 100644 ---- a/security/device_cgroup.c -+++ b/security/device_cgroup.c -@@ -508,6 +508,7 @@ found: - - return -EPERM; - } -+EXPORT_SYMBOL(__devcgroup_inode_permission); - - int devcgroup_inode_mknod(int mode, dev_t dev) - { -diff --git a/security/security.c b/security/security.c -index 4ba6d4c..9f64bb8 100644 ---- a/security/security.c -+++ b/security/security.c -@@ -373,6 +373,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry) - return 0; - return security_ops->path_rmdir(dir, dentry); - } -+EXPORT_SYMBOL(security_path_rmdir); - - int security_path_unlink(struct path *dir, struct dentry *dentry) - { -@@ -389,6 +390,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry, - return 0; - return security_ops->path_symlink(dir, dentry, old_name); - } -+EXPORT_SYMBOL(security_path_symlink); - - int security_path_link(struct dentry *old_dentry, struct path *new_dir, - struct dentry *new_dentry) -@@ -397,6 +399,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir, - return 0; - return security_ops->path_link(old_dentry, new_dir, new_dentry); - } -+EXPORT_SYMBOL(security_path_link); - - int security_path_rename(struct path *old_dir, struct dentry *old_dentry, - struct path *new_dir, struct dentry *new_dentry) -@@ -415,6 +418,7 @@ int security_path_truncate(struct path *path) - return 0; - return security_ops->path_truncate(path); - } -+EXPORT_SYMBOL(security_path_truncate); - - int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, - mode_t mode) -@@ -423,6 +427,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, - return 0; - return security_ops->path_chmod(dentry, mnt, mode); - } -+EXPORT_SYMBOL(security_path_chmod); - - int security_path_chown(struct path *path, uid_t uid, gid_t gid) - { -@@ -430,6 +435,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid) - return 0; - return security_ops->path_chown(path, uid, gid); - } -+EXPORT_SYMBOL(security_path_chown); - - int security_path_chroot(struct path *path) - { -@@ -506,6 +512,7 @@ int security_inode_readlink(struct dentry *dentry) - return 0; - return security_ops->inode_readlink(dentry); - } -+EXPORT_SYMBOL(security_inode_readlink); - - int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd) - { -@@ -520,6 +527,7 @@ int security_inode_permission(struct inode *inode, int mask) - return 0; - return security_ops->inode_permission(inode, mask, 0); - } -+EXPORT_SYMBOL(security_inode_permission); - - int security_inode_exec_permission(struct inode *inode, unsigned int flags) - { -@@ -626,6 +634,7 @@ int security_file_permission(struct file *file, int mask) - - return fsnotify_perm(file, mask); - } -+EXPORT_SYMBOL(security_file_permission); - - int security_file_alloc(struct file *file) - { -@@ -653,6 +662,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot, - return ret; - return ima_file_mmap(file, prot); - } -+EXPORT_SYMBOL(security_file_mmap); - - int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot, - unsigned long prot) diff --git a/sys-fs/aufs3/files/3_p20121129/aufs3-standalone-1.patch b/sys-fs/aufs3/files/3_p20121129/aufs3-standalone-1.patch deleted file mode 100644 index 72f3ae9e432b..000000000000 --- a/sys-fs/aufs3/files/3_p20121129/aufs3-standalone-1.patch +++ /dev/null @@ -1,249 +0,0 @@ -aufs3.1 standalone patch - -diff --git a/fs/file_table.c b/fs/file_table.c -index c322794..2aad244 100644 ---- a/fs/file_table.c -+++ b/fs/file_table.c -@@ -443,6 +443,8 @@ void file_sb_list_del(struct file *file) - } - } - -+EXPORT_SYMBOL(file_sb_list_del); -+ - #ifdef CONFIG_SMP - - /* -diff --git a/fs/inode.c b/fs/inode.c -index ec79246..46ac6f9 100644 ---- a/fs/inode.c -+++ b/fs/inode.c -@@ -65,6 +65,7 @@ static struct hlist_head *inode_hashtable __read_mostly; - static __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_hash_lock); - - __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock); -+EXPORT_SYMBOL(inode_sb_list_lock); - - /* - * Empty aops. Can be used for the cases where the user does not -diff --git a/fs/namei.c b/fs/namei.c -index 8edad02..50e8718 100644 ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -1752,6 +1752,7 @@ struct dentry *lookup_hash(struct nameidata *nd) - { - return __lookup_hash(&nd->last, nd->path.dentry, nd); - } -+EXPORT_SYMBOL(lookup_hash); - - /** - * lookup_one_len - filesystem helper to lookup single pathname component -diff --git a/fs/namespace.c b/fs/namespace.c -index b4febb2..598a308 100644 ---- a/fs/namespace.c -+++ b/fs/namespace.c -@@ -1508,6 +1508,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, - } - return 0; - } -+EXPORT_SYMBOL(iterate_mounts); - - static void cleanup_group_ids(struct vfsmount *mnt, struct vfsmount *end) - { -diff --git a/fs/notify/group.c b/fs/notify/group.c -index 63fc294..6f4adca 100644 ---- a/fs/notify/group.c -+++ b/fs/notify/group.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #include - #include "fsnotify.h" -@@ -70,6 +71,7 @@ void fsnotify_put_group(struct fsnotify_group *group) - if (atomic_dec_and_test(&group->refcnt)) - fsnotify_destroy_group(group); - } -+EXPORT_SYMBOL(fsnotify_put_group); - - /* - * Create a new fsnotify_group and hold a reference for the group returned. -@@ -102,3 +104,4 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops) - - return group; - } -+EXPORT_SYMBOL(fsnotify_alloc_group); -diff --git a/fs/notify/mark.c b/fs/notify/mark.c -index e14587d..be6533b 100644 ---- a/fs/notify/mark.c -+++ b/fs/notify/mark.c -@@ -112,6 +112,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark) - if (atomic_dec_and_test(&mark->refcnt)) - mark->free_mark(mark); - } -+EXPORT_SYMBOL(fsnotify_put_mark); - - /* - * Any time a mark is getting freed we end up here. -@@ -189,6 +190,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark) - if (unlikely(atomic_dec_and_test(&group->num_marks))) - fsnotify_final_destroy_group(group); - } -+EXPORT_SYMBOL(fsnotify_destroy_mark); - - void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask) - { -@@ -276,6 +278,7 @@ err: - - return ret; - } -+EXPORT_SYMBOL(fsnotify_add_mark); - - /* - * clear any marks in a group in which mark->flags & flags is true -@@ -331,6 +334,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark, - atomic_set(&mark->refcnt, 1); - mark->free_mark = free_mark; - } -+EXPORT_SYMBOL(fsnotify_init_mark); - - static int fsnotify_mark_destroy(void *ignored) - { -diff --git a/fs/open.c b/fs/open.c -index f711921..d742fc0 100644 ---- a/fs/open.c -+++ b/fs/open.c -@@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, - mutex_unlock(&dentry->d_inode->i_mutex); - return ret; - } -+EXPORT_SYMBOL(do_truncate); - - static long do_sys_truncate(const char __user *pathname, loff_t length) - { -diff --git a/fs/splice.c b/fs/splice.c -index e3569b0..9dc07b7 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1109,6 +1109,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - - return splice_write(pipe, out, ppos, len, flags); - } -+EXPORT_SYMBOL(do_splice_from); - - /* - * Attempt to initiate a splice from a file to a pipe. -@@ -1135,6 +1136,7 @@ long do_splice_to(struct file *in, loff_t *ppos, - - return splice_read(in, ppos, pipe, len, flags); - } -+EXPORT_SYMBOL(do_splice_to); - - /** - * splice_direct_to_actor - splices data directly between two non-pipes -diff --git a/security/commoncap.c b/security/commoncap.c -index a93b3b7..024282c 100644 ---- a/security/commoncap.c -+++ b/security/commoncap.c -@@ -971,3 +971,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot, - } - return ret; - } -+EXPORT_SYMBOL(cap_file_mmap); -diff --git a/security/device_cgroup.c b/security/device_cgroup.c -index 4450fbe..2c437e5 100644 ---- a/security/device_cgroup.c -+++ b/security/device_cgroup.c -@@ -500,6 +500,7 @@ found: - - return -EPERM; - } -+EXPORT_SYMBOL(__devcgroup_inode_permission); - - int devcgroup_inode_mknod(int mode, dev_t dev) - { -diff --git a/security/security.c b/security/security.c -index d9e1533..466ee5c 100644 ---- a/security/security.c -+++ b/security/security.c -@@ -373,6 +373,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry) - return 0; - return security_ops->path_rmdir(dir, dentry); - } -+EXPORT_SYMBOL(security_path_rmdir); - - int security_path_unlink(struct path *dir, struct dentry *dentry) - { -@@ -389,6 +390,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry, - return 0; - return security_ops->path_symlink(dir, dentry, old_name); - } -+EXPORT_SYMBOL(security_path_symlink); - - int security_path_link(struct dentry *old_dentry, struct path *new_dir, - struct dentry *new_dentry) -@@ -397,6 +399,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir, - return 0; - return security_ops->path_link(old_dentry, new_dir, new_dentry); - } -+EXPORT_SYMBOL(security_path_link); - - int security_path_rename(struct path *old_dir, struct dentry *old_dentry, - struct path *new_dir, struct dentry *new_dentry) -@@ -415,6 +418,7 @@ int security_path_truncate(struct path *path) - return 0; - return security_ops->path_truncate(path); - } -+EXPORT_SYMBOL(security_path_truncate); - - int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, - mode_t mode) -@@ -423,6 +427,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, - return 0; - return security_ops->path_chmod(dentry, mnt, mode); - } -+EXPORT_SYMBOL(security_path_chmod); - - int security_path_chown(struct path *path, uid_t uid, gid_t gid) - { -@@ -430,6 +435,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid) - return 0; - return security_ops->path_chown(path, uid, gid); - } -+EXPORT_SYMBOL(security_path_chown); - - int security_path_chroot(struct path *path) - { -@@ -506,6 +512,7 @@ int security_inode_readlink(struct dentry *dentry) - return 0; - return security_ops->inode_readlink(dentry); - } -+EXPORT_SYMBOL(security_inode_readlink); - - int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd) - { -@@ -520,6 +527,7 @@ int security_inode_permission(struct inode *inode, int mask) - return 0; - return security_ops->inode_permission(inode, mask); - } -+EXPORT_SYMBOL(security_inode_permission); - - int security_inode_setattr(struct dentry *dentry, struct iattr *attr) - { -@@ -619,6 +627,7 @@ int security_file_permission(struct file *file, int mask) - - return fsnotify_perm(file, mask); - } -+EXPORT_SYMBOL(security_file_permission); - - int security_file_alloc(struct file *file) - { -@@ -646,6 +655,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot, - return ret; - return ima_file_mmap(file, prot); - } -+EXPORT_SYMBOL(security_file_mmap); - - int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot, - unsigned long prot) diff --git a/sys-fs/aufs3/files/3_p20121129/aufs3-standalone-2.patch b/sys-fs/aufs3/files/3_p20121129/aufs3-standalone-2.patch deleted file mode 100644 index ae897f388cb7..000000000000 --- a/sys-fs/aufs3/files/3_p20121129/aufs3-standalone-2.patch +++ /dev/null @@ -1,257 +0,0 @@ -aufs3.2 standalone patch - -diff --git a/fs/file_table.c b/fs/file_table.c -index c322794..2aad244 100644 ---- a/fs/file_table.c -+++ b/fs/file_table.c -@@ -443,6 +443,8 @@ void file_sb_list_del(struct file *file) - } - } - -+EXPORT_SYMBOL(file_sb_list_del); -+ - #ifdef CONFIG_SMP - - /* -diff --git a/fs/inode.c b/fs/inode.c -index ee4e66b..728042b 100644 ---- a/fs/inode.c -+++ b/fs/inode.c -@@ -65,6 +65,7 @@ static struct hlist_head *inode_hashtable __read_mostly; - static __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_hash_lock); - - __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock); -+EXPORT_SYMBOL(inode_sb_list_lock); - - /* - * Empty aops. Can be used for the cases where the user does not -diff --git a/fs/namei.c b/fs/namei.c -index 4cc94cf..af19e30 100644 ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -1757,6 +1757,7 @@ struct dentry *lookup_hash(struct nameidata *nd) - { - return __lookup_hash(&nd->last, nd->path.dentry, nd); - } -+EXPORT_SYMBOL(lookup_hash); - - /** - * lookup_one_len - filesystem helper to lookup single pathname component -diff --git a/fs/namespace.c b/fs/namespace.c -index cfc6d44..173d15a 100644 ---- a/fs/namespace.c -+++ b/fs/namespace.c -@@ -1506,6 +1506,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, - } - return 0; - } -+EXPORT_SYMBOL(iterate_mounts); - - static void cleanup_group_ids(struct vfsmount *mnt, struct vfsmount *end) - { -diff --git a/fs/notify/group.c b/fs/notify/group.c -index 63fc294..6f4adca 100644 ---- a/fs/notify/group.c -+++ b/fs/notify/group.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #include - #include "fsnotify.h" -@@ -70,6 +71,7 @@ void fsnotify_put_group(struct fsnotify_group *group) - if (atomic_dec_and_test(&group->refcnt)) - fsnotify_destroy_group(group); - } -+EXPORT_SYMBOL(fsnotify_put_group); - - /* - * Create a new fsnotify_group and hold a reference for the group returned. -@@ -102,3 +104,4 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops) - - return group; - } -+EXPORT_SYMBOL(fsnotify_alloc_group); -diff --git a/fs/notify/mark.c b/fs/notify/mark.c -index e14587d..be6533b 100644 ---- a/fs/notify/mark.c -+++ b/fs/notify/mark.c -@@ -112,6 +112,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark) - if (atomic_dec_and_test(&mark->refcnt)) - mark->free_mark(mark); - } -+EXPORT_SYMBOL(fsnotify_put_mark); - - /* - * Any time a mark is getting freed we end up here. -@@ -189,6 +190,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark) - if (unlikely(atomic_dec_and_test(&group->num_marks))) - fsnotify_final_destroy_group(group); - } -+EXPORT_SYMBOL(fsnotify_destroy_mark); - - void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask) - { -@@ -276,6 +278,7 @@ err: - - return ret; - } -+EXPORT_SYMBOL(fsnotify_add_mark); - - /* - * clear any marks in a group in which mark->flags & flags is true -@@ -331,6 +334,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark, - atomic_set(&mark->refcnt, 1); - mark->free_mark = free_mark; - } -+EXPORT_SYMBOL(fsnotify_init_mark); - - static int fsnotify_mark_destroy(void *ignored) - { -diff --git a/fs/open.c b/fs/open.c -index 22c41b5..33b4033 100644 ---- a/fs/open.c -+++ b/fs/open.c -@@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, - mutex_unlock(&dentry->d_inode->i_mutex); - return ret; - } -+EXPORT_SYMBOL(do_truncate); - - static long do_sys_truncate(const char __user *pathname, loff_t length) - { -diff --git a/fs/splice.c b/fs/splice.c -index e3569b0..9dc07b7 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1109,6 +1109,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - - return splice_write(pipe, out, ppos, len, flags); - } -+EXPORT_SYMBOL(do_splice_from); - - /* - * Attempt to initiate a splice from a file to a pipe. -@@ -1135,6 +1136,7 @@ long do_splice_to(struct file *in, loff_t *ppos, - - return splice_read(in, ppos, pipe, len, flags); - } -+EXPORT_SYMBOL(do_splice_to); - - /** - * splice_direct_to_actor - splices data directly between two non-pipes -diff --git a/security/commoncap.c b/security/commoncap.c -index ee4f848..611fd70 100644 ---- a/security/commoncap.c -+++ b/security/commoncap.c -@@ -975,3 +975,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot, - } - return ret; - } -+EXPORT_SYMBOL(cap_file_mmap); -diff --git a/security/device_cgroup.c b/security/device_cgroup.c -index 4450fbe..bc94175 100644 ---- a/security/device_cgroup.c -+++ b/security/device_cgroup.c -@@ -7,6 +7,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -500,6 +501,7 @@ found: - - return -EPERM; - } -+EXPORT_SYMBOL(__devcgroup_inode_permission); - - int devcgroup_inode_mknod(int mode, dev_t dev) - { -diff --git a/security/security.c b/security/security.c -index e2f684a..892000c 100644 ---- a/security/security.c -+++ b/security/security.c -@@ -411,6 +411,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry) - return 0; - return security_ops->path_rmdir(dir, dentry); - } -+EXPORT_SYMBOL(security_path_rmdir); - - int security_path_unlink(struct path *dir, struct dentry *dentry) - { -@@ -427,6 +428,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry, - return 0; - return security_ops->path_symlink(dir, dentry, old_name); - } -+EXPORT_SYMBOL(security_path_symlink); - - int security_path_link(struct dentry *old_dentry, struct path *new_dir, - struct dentry *new_dentry) -@@ -435,6 +437,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir, - return 0; - return security_ops->path_link(old_dentry, new_dir, new_dentry); - } -+EXPORT_SYMBOL(security_path_link); - - int security_path_rename(struct path *old_dir, struct dentry *old_dentry, - struct path *new_dir, struct dentry *new_dentry) -@@ -453,6 +456,7 @@ int security_path_truncate(struct path *path) - return 0; - return security_ops->path_truncate(path); - } -+EXPORT_SYMBOL(security_path_truncate); - - int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, - mode_t mode) -@@ -461,6 +465,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt, - return 0; - return security_ops->path_chmod(dentry, mnt, mode); - } -+EXPORT_SYMBOL(security_path_chmod); - - int security_path_chown(struct path *path, uid_t uid, gid_t gid) - { -@@ -468,6 +473,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid) - return 0; - return security_ops->path_chown(path, uid, gid); - } -+EXPORT_SYMBOL(security_path_chown); - - int security_path_chroot(struct path *path) - { -@@ -544,6 +550,7 @@ int security_inode_readlink(struct dentry *dentry) - return 0; - return security_ops->inode_readlink(dentry); - } -+EXPORT_SYMBOL(security_inode_readlink); - - int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd) - { -@@ -558,6 +565,7 @@ int security_inode_permission(struct inode *inode, int mask) - return 0; - return security_ops->inode_permission(inode, mask); - } -+EXPORT_SYMBOL(security_inode_permission); - - int security_inode_setattr(struct dentry *dentry, struct iattr *attr) - { -@@ -673,6 +681,7 @@ int security_file_permission(struct file *file, int mask) - - return fsnotify_perm(file, mask); - } -+EXPORT_SYMBOL(security_file_permission); - - int security_file_alloc(struct file *file) - { -@@ -700,6 +709,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot, - return ret; - return ima_file_mmap(file, prot); - } -+EXPORT_SYMBOL(security_file_mmap); - - int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot, - unsigned long prot) diff --git a/sys-fs/aufs3/files/3_p20121129/aufs3-standalone-3.patch b/sys-fs/aufs3/files/3_p20121129/aufs3-standalone-3.patch deleted file mode 100644 index 584d592ef068..000000000000 --- a/sys-fs/aufs3/files/3_p20121129/aufs3-standalone-3.patch +++ /dev/null @@ -1,257 +0,0 @@ -aufs3.3 standalone patch - -diff --git a/fs/file_table.c b/fs/file_table.c -index 20002e3..6d792ad 100644 ---- a/fs/file_table.c -+++ b/fs/file_table.c -@@ -443,6 +443,8 @@ void file_sb_list_del(struct file *file) - } - } - -+EXPORT_SYMBOL(file_sb_list_del); -+ - #ifdef CONFIG_SMP - - /* -diff --git a/fs/inode.c b/fs/inode.c -index 83ab215..45242cd 100644 ---- a/fs/inode.c -+++ b/fs/inode.c -@@ -66,6 +66,7 @@ static struct hlist_head *inode_hashtable __read_mostly; - static __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_hash_lock); - - __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock); -+EXPORT_SYMBOL(inode_sb_list_lock); - - /* - * Empty aops. Can be used for the cases where the user does not -diff --git a/fs/namei.c b/fs/namei.c -index f2dcf8d..bcccefd 100644 ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -1785,6 +1785,7 @@ struct dentry *lookup_hash(struct nameidata *nd) - { - return __lookup_hash(&nd->last, nd->path.dentry, nd); - } -+EXPORT_SYMBOL(lookup_hash); - - /** - * lookup_one_len - filesystem helper to lookup single pathname component -diff --git a/fs/namespace.c b/fs/namespace.c -index e608199..38fcc2e 100644 ---- a/fs/namespace.c -+++ b/fs/namespace.c -@@ -1339,6 +1339,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, - } - return 0; - } -+EXPORT_SYMBOL(iterate_mounts); - - static void cleanup_group_ids(struct mount *mnt, struct mount *end) - { -diff --git a/fs/notify/group.c b/fs/notify/group.c -index 63fc294..6f4adca 100644 ---- a/fs/notify/group.c -+++ b/fs/notify/group.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #include - #include "fsnotify.h" -@@ -70,6 +71,7 @@ void fsnotify_put_group(struct fsnotify_group *group) - if (atomic_dec_and_test(&group->refcnt)) - fsnotify_destroy_group(group); - } -+EXPORT_SYMBOL(fsnotify_put_group); - - /* - * Create a new fsnotify_group and hold a reference for the group returned. -@@ -102,3 +104,4 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops) - - return group; - } -+EXPORT_SYMBOL(fsnotify_alloc_group); -diff --git a/fs/notify/mark.c b/fs/notify/mark.c -index f104d56..54f36db 100644 ---- a/fs/notify/mark.c -+++ b/fs/notify/mark.c -@@ -112,6 +112,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark) - if (atomic_dec_and_test(&mark->refcnt)) - mark->free_mark(mark); - } -+EXPORT_SYMBOL(fsnotify_put_mark); - - /* - * Any time a mark is getting freed we end up here. -@@ -191,6 +192,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark) - if (unlikely(atomic_dec_and_test(&group->num_marks))) - fsnotify_final_destroy_group(group); - } -+EXPORT_SYMBOL(fsnotify_destroy_mark); - - void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask) - { -@@ -278,6 +280,7 @@ err: - - return ret; - } -+EXPORT_SYMBOL(fsnotify_add_mark); - - /* - * clear any marks in a group in which mark->flags & flags is true -@@ -333,6 +336,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark, - atomic_set(&mark->refcnt, 1); - mark->free_mark = free_mark; - } -+EXPORT_SYMBOL(fsnotify_init_mark); - - static int fsnotify_mark_destroy(void *ignored) - { -diff --git a/fs/open.c b/fs/open.c -index 77becc0..f634f02 100644 ---- a/fs/open.c -+++ b/fs/open.c -@@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, - mutex_unlock(&dentry->d_inode->i_mutex); - return ret; - } -+EXPORT_SYMBOL(do_truncate); - - static long do_sys_truncate(const char __user *pathname, loff_t length) - { -diff --git a/fs/splice.c b/fs/splice.c -index c599f73..00303ba 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1108,6 +1108,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - - return splice_write(pipe, out, ppos, len, flags); - } -+EXPORT_SYMBOL(do_splice_from); - - /* - * Attempt to initiate a splice from a file to a pipe. -@@ -1134,6 +1135,7 @@ long do_splice_to(struct file *in, loff_t *ppos, - - return splice_read(in, ppos, pipe, len, flags); - } -+EXPORT_SYMBOL(do_splice_to); - - /** - * splice_direct_to_actor - splices data directly between two non-pipes -diff --git a/security/commoncap.c b/security/commoncap.c -index 7ce191e..19a95be 100644 ---- a/security/commoncap.c -+++ b/security/commoncap.c -@@ -965,3 +965,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot, - } - return ret; - } -+EXPORT_SYMBOL(cap_file_mmap); -diff --git a/security/device_cgroup.c b/security/device_cgroup.c -index 8b5b5d8..911850c 100644 ---- a/security/device_cgroup.c -+++ b/security/device_cgroup.c -@@ -7,6 +7,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -501,6 +502,7 @@ found: - - return -EPERM; - } -+EXPORT_SYMBOL(__devcgroup_inode_permission); - - int devcgroup_inode_mknod(int mode, dev_t dev) - { -diff --git a/security/security.c b/security/security.c -index d754249..1aa6154 100644 ---- a/security/security.c -+++ b/security/security.c -@@ -392,6 +392,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry) - return 0; - return security_ops->path_rmdir(dir, dentry); - } -+EXPORT_SYMBOL(security_path_rmdir); - - int security_path_unlink(struct path *dir, struct dentry *dentry) - { -@@ -408,6 +409,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry, - return 0; - return security_ops->path_symlink(dir, dentry, old_name); - } -+EXPORT_SYMBOL(security_path_symlink); - - int security_path_link(struct dentry *old_dentry, struct path *new_dir, - struct dentry *new_dentry) -@@ -416,6 +418,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir, - return 0; - return security_ops->path_link(old_dentry, new_dir, new_dentry); - } -+EXPORT_SYMBOL(security_path_link); - - int security_path_rename(struct path *old_dir, struct dentry *old_dentry, - struct path *new_dir, struct dentry *new_dentry) -@@ -434,6 +437,7 @@ int security_path_truncate(struct path *path) - return 0; - return security_ops->path_truncate(path); - } -+EXPORT_SYMBOL(security_path_truncate); - - int security_path_chmod(struct path *path, umode_t mode) - { -@@ -441,6 +445,7 @@ int security_path_chmod(struct path *path, umode_t mode) - return 0; - return security_ops->path_chmod(path, mode); - } -+EXPORT_SYMBOL(security_path_chmod); - - int security_path_chown(struct path *path, uid_t uid, gid_t gid) - { -@@ -448,6 +453,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid) - return 0; - return security_ops->path_chown(path, uid, gid); - } -+EXPORT_SYMBOL(security_path_chown); - - int security_path_chroot(struct path *path) - { -@@ -524,6 +530,7 @@ int security_inode_readlink(struct dentry *dentry) - return 0; - return security_ops->inode_readlink(dentry); - } -+EXPORT_SYMBOL(security_inode_readlink); - - int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd) - { -@@ -538,6 +545,7 @@ int security_inode_permission(struct inode *inode, int mask) - return 0; - return security_ops->inode_permission(inode, mask); - } -+EXPORT_SYMBOL(security_inode_permission); - - int security_inode_setattr(struct dentry *dentry, struct iattr *attr) - { -@@ -653,6 +661,7 @@ int security_file_permission(struct file *file, int mask) - - return fsnotify_perm(file, mask); - } -+EXPORT_SYMBOL(security_file_permission); - - int security_file_alloc(struct file *file) - { -@@ -680,6 +689,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot, - return ret; - return ima_file_mmap(file, prot); - } -+EXPORT_SYMBOL(security_file_mmap); - - int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot, - unsigned long prot) diff --git a/sys-fs/aufs3/files/3_p20121129/aufs3-standalone-4.patch b/sys-fs/aufs3/files/3_p20121129/aufs3-standalone-4.patch deleted file mode 100644 index 67cd853bd87b..000000000000 --- a/sys-fs/aufs3/files/3_p20121129/aufs3-standalone-4.patch +++ /dev/null @@ -1,257 +0,0 @@ -aufs3.4 standalone patch - -diff --git a/fs/file_table.c b/fs/file_table.c -index 70f2a0f..146a3d7 100644 ---- a/fs/file_table.c -+++ b/fs/file_table.c -@@ -442,6 +442,8 @@ void file_sb_list_del(struct file *file) - } - } - -+EXPORT_SYMBOL(file_sb_list_del); -+ - #ifdef CONFIG_SMP - - /* -diff --git a/fs/inode.c b/fs/inode.c -index 9f4f5fe..bb0f3ba 100644 ---- a/fs/inode.c -+++ b/fs/inode.c -@@ -56,6 +56,7 @@ static struct hlist_head *inode_hashtable __read_mostly; - static __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_hash_lock); - - __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock); -+EXPORT_SYMBOL(inode_sb_list_lock); - - /* - * Empty aops. Can be used for the cases where the user does not -diff --git a/fs/namei.c b/fs/namei.c -index 7ff959b..b170167 100644 ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -1835,6 +1835,7 @@ struct dentry *lookup_hash(struct nameidata *nd) - { - return __lookup_hash(&nd->last, nd->path.dentry, nd); - } -+EXPORT_SYMBOL(lookup_hash); - - /** - * lookup_one_len - filesystem helper to lookup single pathname component -diff --git a/fs/namespace.c b/fs/namespace.c -index e608199..38fcc2e 100644 ---- a/fs/namespace.c -+++ b/fs/namespace.c -@@ -1339,6 +1339,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, - } - return 0; - } -+EXPORT_SYMBOL(iterate_mounts); - - static void cleanup_group_ids(struct mount *mnt, struct mount *end) - { -diff --git a/fs/notify/group.c b/fs/notify/group.c -index 63fc294..6f4adca 100644 ---- a/fs/notify/group.c -+++ b/fs/notify/group.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #include - #include "fsnotify.h" -@@ -70,6 +71,7 @@ void fsnotify_put_group(struct fsnotify_group *group) - if (atomic_dec_and_test(&group->refcnt)) - fsnotify_destroy_group(group); - } -+EXPORT_SYMBOL(fsnotify_put_group); - - /* - * Create a new fsnotify_group and hold a reference for the group returned. -@@ -102,3 +104,4 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops) - - return group; - } -+EXPORT_SYMBOL(fsnotify_alloc_group); -diff --git a/fs/notify/mark.c b/fs/notify/mark.c -index f104d56..54f36db 100644 ---- a/fs/notify/mark.c -+++ b/fs/notify/mark.c -@@ -112,6 +112,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark) - if (atomic_dec_and_test(&mark->refcnt)) - mark->free_mark(mark); - } -+EXPORT_SYMBOL(fsnotify_put_mark); - - /* - * Any time a mark is getting freed we end up here. -@@ -191,6 +192,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark) - if (unlikely(atomic_dec_and_test(&group->num_marks))) - fsnotify_final_destroy_group(group); - } -+EXPORT_SYMBOL(fsnotify_destroy_mark); - - void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask) - { -@@ -278,6 +280,7 @@ err: - - return ret; - } -+EXPORT_SYMBOL(fsnotify_add_mark); - - /* - * clear any marks in a group in which mark->flags & flags is true -@@ -333,6 +336,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark, - atomic_set(&mark->refcnt, 1); - mark->free_mark = free_mark; - } -+EXPORT_SYMBOL(fsnotify_init_mark); - - static int fsnotify_mark_destroy(void *ignored) - { -diff --git a/fs/open.c b/fs/open.c -index 5720854..ec59242 100644 ---- a/fs/open.c -+++ b/fs/open.c -@@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, - mutex_unlock(&dentry->d_inode->i_mutex); - return ret; - } -+EXPORT_SYMBOL(do_truncate); - - static long do_sys_truncate(const char __user *pathname, loff_t length) - { -diff --git a/fs/splice.c b/fs/splice.c -index f871233..70f5481 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1108,6 +1108,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - - return splice_write(pipe, out, ppos, len, flags); - } -+EXPORT_SYMBOL(do_splice_from); - - /* - * Attempt to initiate a splice from a file to a pipe. -@@ -1134,6 +1135,7 @@ long do_splice_to(struct file *in, loff_t *ppos, - - return splice_read(in, ppos, pipe, len, flags); - } -+EXPORT_SYMBOL(do_splice_to); - - /** - * splice_direct_to_actor - splices data directly between two non-pipes -diff --git a/security/commoncap.c b/security/commoncap.c -index 71a166a..5d63aac 100644 ---- a/security/commoncap.c -+++ b/security/commoncap.c -@@ -972,3 +972,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot, - } - return ret; - } -+EXPORT_SYMBOL(cap_file_mmap); -diff --git a/security/device_cgroup.c b/security/device_cgroup.c -index c43a332..0c37289 100644 ---- a/security/device_cgroup.c -+++ b/security/device_cgroup.c -@@ -7,6 +7,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -499,6 +500,7 @@ found: - - return -EPERM; - } -+EXPORT_SYMBOL(__devcgroup_inode_permission); - - int devcgroup_inode_mknod(int mode, dev_t dev) - { -diff --git a/security/security.c b/security/security.c -index bf619ff..60b996a 100644 ---- a/security/security.c -+++ b/security/security.c -@@ -380,6 +380,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry) - return 0; - return security_ops->path_rmdir(dir, dentry); - } -+EXPORT_SYMBOL(security_path_rmdir); - - int security_path_unlink(struct path *dir, struct dentry *dentry) - { -@@ -396,6 +397,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry, - return 0; - return security_ops->path_symlink(dir, dentry, old_name); - } -+EXPORT_SYMBOL(security_path_symlink); - - int security_path_link(struct dentry *old_dentry, struct path *new_dir, - struct dentry *new_dentry) -@@ -404,6 +406,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir, - return 0; - return security_ops->path_link(old_dentry, new_dir, new_dentry); - } -+EXPORT_SYMBOL(security_path_link); - - int security_path_rename(struct path *old_dir, struct dentry *old_dentry, - struct path *new_dir, struct dentry *new_dentry) -@@ -422,6 +425,7 @@ int security_path_truncate(struct path *path) - return 0; - return security_ops->path_truncate(path); - } -+EXPORT_SYMBOL(security_path_truncate); - - int security_path_chmod(struct path *path, umode_t mode) - { -@@ -429,6 +433,7 @@ int security_path_chmod(struct path *path, umode_t mode) - return 0; - return security_ops->path_chmod(path, mode); - } -+EXPORT_SYMBOL(security_path_chmod); - - int security_path_chown(struct path *path, uid_t uid, gid_t gid) - { -@@ -436,6 +441,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid) - return 0; - return security_ops->path_chown(path, uid, gid); - } -+EXPORT_SYMBOL(security_path_chown); - - int security_path_chroot(struct path *path) - { -@@ -512,6 +518,7 @@ int security_inode_readlink(struct dentry *dentry) - return 0; - return security_ops->inode_readlink(dentry); - } -+EXPORT_SYMBOL(security_inode_readlink); - - int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd) - { -@@ -526,6 +533,7 @@ int security_inode_permission(struct inode *inode, int mask) - return 0; - return security_ops->inode_permission(inode, mask); - } -+EXPORT_SYMBOL(security_inode_permission); - - int security_inode_setattr(struct dentry *dentry, struct iattr *attr) - { -@@ -641,6 +649,7 @@ int security_file_permission(struct file *file, int mask) - - return fsnotify_perm(file, mask); - } -+EXPORT_SYMBOL(security_file_permission); - - int security_file_alloc(struct file *file) - { -@@ -668,6 +677,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot, - return ret; - return ima_file_mmap(file, prot); - } -+EXPORT_SYMBOL(security_file_mmap); - - int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot, - unsigned long prot) diff --git a/sys-fs/aufs3/files/3_p20121129/aufs3-standalone-5.patch b/sys-fs/aufs3/files/3_p20121129/aufs3-standalone-5.patch deleted file mode 100644 index bd753fd34ef5..000000000000 --- a/sys-fs/aufs3/files/3_p20121129/aufs3-standalone-5.patch +++ /dev/null @@ -1,288 +0,0 @@ -aufs3.5 standalone patch - -diff --git a/fs/file_table.c b/fs/file_table.c -index a305d9e..6a768be 100644 ---- a/fs/file_table.c -+++ b/fs/file_table.c -@@ -35,6 +35,7 @@ struct files_stat_struct files_stat = { - }; - - DEFINE_LGLOCK(files_lglock); -+EXPORT_SYMBOL(files_lglock); - - /* SLAB cache for file structures */ - static struct kmem_cache *filp_cachep __read_mostly; -@@ -441,6 +442,8 @@ void file_sb_list_del(struct file *file) - } - } - -+EXPORT_SYMBOL(file_sb_list_del); -+ - #ifdef CONFIG_SMP - - /* -diff --git a/fs/inode.c b/fs/inode.c -index 7f772fd..e789d2f 100644 ---- a/fs/inode.c -+++ b/fs/inode.c -@@ -56,6 +56,7 @@ static struct hlist_head *inode_hashtable __read_mostly; - static __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_hash_lock); - - __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock); -+EXPORT_SYMBOL(inode_sb_list_lock); - - /* - * Empty aops. Can be used for the cases where the user does not -@@ -1507,6 +1508,7 @@ int update_time(struct inode *inode, struct timespec *time, int flags) - mark_inode_dirty_sync(inode); - return 0; - } -+EXPORT_SYMBOL(update_time); - - /** - * touch_atime - update the access time -diff --git a/fs/namei.c b/fs/namei.c -index 18c9782..f09edf3 100644 ---- a/fs/namei.c -+++ b/fs/namei.c -@@ -1868,6 +1868,7 @@ struct dentry *lookup_hash(struct nameidata *nd) - { - return __lookup_hash(&nd->last, nd->path.dentry, nd); - } -+EXPORT_SYMBOL(lookup_hash); - - /** - * lookup_one_len - filesystem helper to lookup single pathname component -diff --git a/fs/namespace.c b/fs/namespace.c -index 1e4a5fe..06aa768 100644 ---- a/fs/namespace.c -+++ b/fs/namespace.c -@@ -50,6 +50,7 @@ EXPORT_SYMBOL_GPL(fs_kobj); - * tree or hash is modified or when a vfsmount structure is modified. - */ - DEFINE_BRLOCK(vfsmount_lock); -+EXPORT_SYMBOL(vfsmount_lock); - - static inline unsigned long hash(struct vfsmount *mnt, struct dentry *dentry) - { -@@ -1341,6 +1342,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, - } - return 0; - } -+EXPORT_SYMBOL(iterate_mounts); - - static void cleanup_group_ids(struct mount *mnt, struct mount *end) - { -diff --git a/fs/notify/group.c b/fs/notify/group.c -index 63fc294..6f4adca 100644 ---- a/fs/notify/group.c -+++ b/fs/notify/group.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #include - #include "fsnotify.h" -@@ -70,6 +71,7 @@ void fsnotify_put_group(struct fsnotify_group *group) - if (atomic_dec_and_test(&group->refcnt)) - fsnotify_destroy_group(group); - } -+EXPORT_SYMBOL(fsnotify_put_group); - - /* - * Create a new fsnotify_group and hold a reference for the group returned. -@@ -102,3 +104,4 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops) - - return group; - } -+EXPORT_SYMBOL(fsnotify_alloc_group); -diff --git a/fs/notify/mark.c b/fs/notify/mark.c -index f104d56..54f36db 100644 ---- a/fs/notify/mark.c -+++ b/fs/notify/mark.c -@@ -112,6 +112,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark) - if (atomic_dec_and_test(&mark->refcnt)) - mark->free_mark(mark); - } -+EXPORT_SYMBOL(fsnotify_put_mark); - - /* - * Any time a mark is getting freed we end up here. -@@ -191,6 +192,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark) - if (unlikely(atomic_dec_and_test(&group->num_marks))) - fsnotify_final_destroy_group(group); - } -+EXPORT_SYMBOL(fsnotify_destroy_mark); - - void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask) - { -@@ -278,6 +280,7 @@ err: - - return ret; - } -+EXPORT_SYMBOL(fsnotify_add_mark); - - /* - * clear any marks in a group in which mark->flags & flags is true -@@ -333,6 +336,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark, - atomic_set(&mark->refcnt, 1); - mark->free_mark = free_mark; - } -+EXPORT_SYMBOL(fsnotify_init_mark); - - static int fsnotify_mark_destroy(void *ignored) - { -diff --git a/fs/open.c b/fs/open.c -index 1540632..2463289 100644 ---- a/fs/open.c -+++ b/fs/open.c -@@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, - mutex_unlock(&dentry->d_inode->i_mutex); - return ret; - } -+EXPORT_SYMBOL(do_truncate); - - static long do_sys_truncate(const char __user *pathname, loff_t length) - { -diff --git a/fs/splice.c b/fs/splice.c -index e3c40b5..3afc547 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1114,6 +1114,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - - return splice_write(pipe, out, ppos, len, flags); - } -+EXPORT_SYMBOL(do_splice_from); - - /* - * Attempt to initiate a splice from a file to a pipe. -@@ -1140,6 +1141,7 @@ long do_splice_to(struct file *in, loff_t *ppos, - - return splice_read(in, ppos, pipe, len, flags); - } -+EXPORT_SYMBOL(do_splice_to); - - /** - * splice_direct_to_actor - splices data directly between two non-pipes -diff --git a/security/commoncap.c b/security/commoncap.c -index 6dbae46..9f4f29a 100644 ---- a/security/commoncap.c -+++ b/security/commoncap.c -@@ -979,9 +979,11 @@ int cap_mmap_addr(unsigned long addr) - } - return ret; - } -+EXPORT_SYMBOL(cap_mmap_addr); - - int cap_mmap_file(struct file *file, unsigned long reqprot, - unsigned long prot, unsigned long flags) - { - return 0; - } -+EXPORT_SYMBOL(cap_mmap_file); -diff --git a/security/device_cgroup.c b/security/device_cgroup.c -index 442204c..e644a1c 100644 ---- a/security/device_cgroup.c -+++ b/security/device_cgroup.c -@@ -7,6 +7,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -493,6 +494,7 @@ found: - - return -EPERM; - } -+EXPORT_SYMBOL(__devcgroup_inode_permission); - - int devcgroup_inode_mknod(int mode, dev_t dev) - { -diff --git a/security/security.c b/security/security.c -index 860aeb3..ffb57bf 100644 ---- a/security/security.c -+++ b/security/security.c -@@ -384,6 +384,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry) - return 0; - return security_ops->path_rmdir(dir, dentry); - } -+EXPORT_SYMBOL(security_path_rmdir); - - int security_path_unlink(struct path *dir, struct dentry *dentry) - { -@@ -400,6 +401,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry, - return 0; - return security_ops->path_symlink(dir, dentry, old_name); - } -+EXPORT_SYMBOL(security_path_symlink); - - int security_path_link(struct dentry *old_dentry, struct path *new_dir, - struct dentry *new_dentry) -@@ -408,6 +410,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir, - return 0; - return security_ops->path_link(old_dentry, new_dir, new_dentry); - } -+EXPORT_SYMBOL(security_path_link); - - int security_path_rename(struct path *old_dir, struct dentry *old_dentry, - struct path *new_dir, struct dentry *new_dentry) -@@ -426,6 +429,7 @@ int security_path_truncate(struct path *path) - return 0; - return security_ops->path_truncate(path); - } -+EXPORT_SYMBOL(security_path_truncate); - - int security_path_chmod(struct path *path, umode_t mode) - { -@@ -433,6 +437,7 @@ int security_path_chmod(struct path *path, umode_t mode) - return 0; - return security_ops->path_chmod(path, mode); - } -+EXPORT_SYMBOL(security_path_chmod); - - int security_path_chown(struct path *path, uid_t uid, gid_t gid) - { -@@ -440,6 +445,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid) - return 0; - return security_ops->path_chown(path, uid, gid); - } -+EXPORT_SYMBOL(security_path_chown); - - int security_path_chroot(struct path *path) - { -@@ -516,6 +522,7 @@ int security_inode_readlink(struct dentry *dentry) - return 0; - return security_ops->inode_readlink(dentry); - } -+EXPORT_SYMBOL(security_inode_readlink); - - int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd) - { -@@ -530,6 +537,7 @@ int security_inode_permission(struct inode *inode, int mask) - return 0; - return security_ops->inode_permission(inode, mask); - } -+EXPORT_SYMBOL(security_inode_permission); - - int security_inode_setattr(struct dentry *dentry, struct iattr *attr) - { -@@ -645,6 +653,7 @@ int security_file_permission(struct file *file, int mask) - - return fsnotify_perm(file, mask); - } -+EXPORT_SYMBOL(security_file_permission); - - int security_file_alloc(struct file *file) - { -@@ -705,6 +714,7 @@ int security_mmap_file(struct file *file, unsigned long prot, - return ret; - return ima_file_mmap(file, prot); - } -+EXPORT_SYMBOL(security_mmap_file); - - int security_mmap_addr(unsigned long addr) - { diff --git a/sys-fs/aufs3/files/3_p20121129/aufs3-standalone-6.patch b/sys-fs/aufs3/files/3_p20121129/aufs3-standalone-6.patch deleted file mode 100644 index b5dcadcc3c3d..000000000000 --- a/sys-fs/aufs3/files/3_p20121129/aufs3-standalone-6.patch +++ /dev/null @@ -1,276 +0,0 @@ -aufs3.6 standalone patch - -diff --git a/fs/file_table.c b/fs/file_table.c -index 701985e..a9fe741 100644 ---- a/fs/file_table.c -+++ b/fs/file_table.c -@@ -37,6 +37,7 @@ struct files_stat_struct files_stat = { - }; - - DEFINE_LGLOCK(files_lglock); -+EXPORT_SYMBOL(files_lglock); - - /* SLAB cache for file structures */ - static struct kmem_cache *filp_cachep __read_mostly; -@@ -509,6 +510,8 @@ void file_sb_list_del(struct file *file) - } - } - -+EXPORT_SYMBOL(file_sb_list_del); -+ - #ifdef CONFIG_SMP - - /* -diff --git a/fs/inode.c b/fs/inode.c -index 7b2c8fa..0c4318d 100644 ---- a/fs/inode.c -+++ b/fs/inode.c -@@ -56,6 +56,7 @@ static struct hlist_head *inode_hashtable __read_mostly; - static __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_hash_lock); - - __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock); -+EXPORT_SYMBOL(inode_sb_list_lock); - - /* - * Empty aops. Can be used for the cases where the user does not -@@ -1507,6 +1508,7 @@ int update_time(struct inode *inode, struct timespec *time, int flags) - mark_inode_dirty_sync(inode); - return 0; - } -+EXPORT_SYMBOL(update_time); - - /** - * touch_atime - update the access time -diff --git a/fs/namespace.c b/fs/namespace.c -index 7bdf790..5b85c4c 100644 ---- a/fs/namespace.c -+++ b/fs/namespace.c -@@ -50,6 +50,7 @@ EXPORT_SYMBOL_GPL(fs_kobj); - * tree or hash is modified or when a vfsmount structure is modified. - */ - DEFINE_BRLOCK(vfsmount_lock); -+EXPORT_SYMBOL(vfsmount_lock); - - static inline unsigned long hash(struct vfsmount *mnt, struct dentry *dentry) - { -@@ -1401,6 +1402,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, - } - return 0; - } -+EXPORT_SYMBOL(iterate_mounts); - - static void cleanup_group_ids(struct mount *mnt, struct mount *end) - { -diff --git a/fs/notify/group.c b/fs/notify/group.c -index 63fc294..6f4adca 100644 ---- a/fs/notify/group.c -+++ b/fs/notify/group.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #include - #include "fsnotify.h" -@@ -70,6 +71,7 @@ void fsnotify_put_group(struct fsnotify_group *group) - if (atomic_dec_and_test(&group->refcnt)) - fsnotify_destroy_group(group); - } -+EXPORT_SYMBOL(fsnotify_put_group); - - /* - * Create a new fsnotify_group and hold a reference for the group returned. -@@ -102,3 +104,4 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops) - - return group; - } -+EXPORT_SYMBOL(fsnotify_alloc_group); -diff --git a/fs/notify/mark.c b/fs/notify/mark.c -index f104d56..54f36db 100644 ---- a/fs/notify/mark.c -+++ b/fs/notify/mark.c -@@ -112,6 +112,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark) - if (atomic_dec_and_test(&mark->refcnt)) - mark->free_mark(mark); - } -+EXPORT_SYMBOL(fsnotify_put_mark); - - /* - * Any time a mark is getting freed we end up here. -@@ -191,6 +192,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark) - if (unlikely(atomic_dec_and_test(&group->num_marks))) - fsnotify_final_destroy_group(group); - } -+EXPORT_SYMBOL(fsnotify_destroy_mark); - - void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask) - { -@@ -278,6 +280,7 @@ err: - - return ret; - } -+EXPORT_SYMBOL(fsnotify_add_mark); - - /* - * clear any marks in a group in which mark->flags & flags is true -@@ -333,6 +336,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark, - atomic_set(&mark->refcnt, 1); - mark->free_mark = free_mark; - } -+EXPORT_SYMBOL(fsnotify_init_mark); - - static int fsnotify_mark_destroy(void *ignored) - { -diff --git a/fs/open.c b/fs/open.c -index e1f2cdb..2804cd6 100644 ---- a/fs/open.c -+++ b/fs/open.c -@@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, - mutex_unlock(&dentry->d_inode->i_mutex); - return ret; - } -+EXPORT_SYMBOL(do_truncate); - - static long do_sys_truncate(const char __user *pathname, loff_t length) - { -diff --git a/fs/splice.c b/fs/splice.c -index 663b402..51e1deb 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1117,6 +1117,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - - return splice_write(pipe, out, ppos, len, flags); - } -+EXPORT_SYMBOL(do_splice_from); - - /* - * Attempt to initiate a splice from a file to a pipe. -@@ -1143,6 +1144,7 @@ long do_splice_to(struct file *in, loff_t *ppos, - - return splice_read(in, ppos, pipe, len, flags); - } -+EXPORT_SYMBOL(do_splice_to); - - /** - * splice_direct_to_actor - splices data directly between two non-pipes -diff --git a/security/commoncap.c b/security/commoncap.c -index 6dbae46..9f4f29a 100644 ---- a/security/commoncap.c -+++ b/security/commoncap.c -@@ -979,9 +979,11 @@ int cap_mmap_addr(unsigned long addr) - } - return ret; - } -+EXPORT_SYMBOL(cap_mmap_addr); - - int cap_mmap_file(struct file *file, unsigned long reqprot, - unsigned long prot, unsigned long flags) - { - return 0; - } -+EXPORT_SYMBOL(cap_mmap_file); -diff --git a/security/device_cgroup.c b/security/device_cgroup.c -index 442204c..e644a1c 100644 ---- a/security/device_cgroup.c -+++ b/security/device_cgroup.c -@@ -7,6 +7,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -493,6 +494,7 @@ found: - - return -EPERM; - } -+EXPORT_SYMBOL(__devcgroup_inode_permission); - - int devcgroup_inode_mknod(int mode, dev_t dev) - { -diff --git a/security/security.c b/security/security.c -index 860aeb3..ffb57bf 100644 ---- a/security/security.c -+++ b/security/security.c -@@ -384,6 +384,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry) - return 0; - return security_ops->path_rmdir(dir, dentry); - } -+EXPORT_SYMBOL(security_path_rmdir); - - int security_path_unlink(struct path *dir, struct dentry *dentry) - { -@@ -400,6 +401,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry, - return 0; - return security_ops->path_symlink(dir, dentry, old_name); - } -+EXPORT_SYMBOL(security_path_symlink); - - int security_path_link(struct dentry *old_dentry, struct path *new_dir, - struct dentry *new_dentry) -@@ -408,6 +410,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir, - return 0; - return security_ops->path_link(old_dentry, new_dir, new_dentry); - } -+EXPORT_SYMBOL(security_path_link); - - int security_path_rename(struct path *old_dir, struct dentry *old_dentry, - struct path *new_dir, struct dentry *new_dentry) -@@ -426,6 +429,7 @@ int security_path_truncate(struct path *path) - return 0; - return security_ops->path_truncate(path); - } -+EXPORT_SYMBOL(security_path_truncate); - - int security_path_chmod(struct path *path, umode_t mode) - { -@@ -433,6 +437,7 @@ int security_path_chmod(struct path *path, umode_t mode) - return 0; - return security_ops->path_chmod(path, mode); - } -+EXPORT_SYMBOL(security_path_chmod); - - int security_path_chown(struct path *path, uid_t uid, gid_t gid) - { -@@ -440,6 +445,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid) - return 0; - return security_ops->path_chown(path, uid, gid); - } -+EXPORT_SYMBOL(security_path_chown); - - int security_path_chroot(struct path *path) - { -@@ -516,6 +522,7 @@ int security_inode_readlink(struct dentry *dentry) - return 0; - return security_ops->inode_readlink(dentry); - } -+EXPORT_SYMBOL(security_inode_readlink); - - int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd) - { -@@ -530,6 +537,7 @@ int security_inode_permission(struct inode *inode, int mask) - return 0; - return security_ops->inode_permission(inode, mask); - } -+EXPORT_SYMBOL(security_inode_permission); - - int security_inode_setattr(struct dentry *dentry, struct iattr *attr) - { -@@ -645,6 +653,7 @@ int security_file_permission(struct file *file, int mask) - - return fsnotify_perm(file, mask); - } -+EXPORT_SYMBOL(security_file_permission); - - int security_file_alloc(struct file *file) - { -@@ -705,6 +714,7 @@ int security_mmap_file(struct file *file, unsigned long prot, - return ret; - return ima_file_mmap(file, prot); - } -+EXPORT_SYMBOL(security_mmap_file); - - int security_mmap_addr(unsigned long addr) - { diff --git a/sys-fs/aufs3/files/3_p20121129/aufs3-standalone-x-rcN.patch b/sys-fs/aufs3/files/3_p20121129/aufs3-standalone-x-rcN.patch deleted file mode 100644 index 764157ecd94b..000000000000 --- a/sys-fs/aufs3/files/3_p20121129/aufs3-standalone-x-rcN.patch +++ /dev/null @@ -1,276 +0,0 @@ -aufs3.x-rcN standalone patch - -diff --git a/fs/file_table.c b/fs/file_table.c -index dac6792..e3f2c15 100644 ---- a/fs/file_table.c -+++ b/fs/file_table.c -@@ -37,6 +37,7 @@ struct files_stat_struct files_stat = { - }; - - DEFINE_LGLOCK(files_lglock); -+EXPORT_SYMBOL(files_lglock); - - /* SLAB cache for file structures */ - static struct kmem_cache *filp_cachep __read_mostly; -@@ -403,6 +404,8 @@ void file_sb_list_del(struct file *file) - } - } - -+EXPORT_SYMBOL(file_sb_list_del); -+ - #ifdef CONFIG_SMP - - /* -diff --git a/fs/inode.c b/fs/inode.c -index ee497f9..5e7eee7 100644 ---- a/fs/inode.c -+++ b/fs/inode.c -@@ -56,6 +56,7 @@ static struct hlist_head *inode_hashtable __read_mostly; - static __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_hash_lock); - - __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock); -+EXPORT_SYMBOL(inode_sb_list_lock); - - /* - * Empty aops. Can be used for the cases where the user does not -@@ -1507,6 +1508,7 @@ int update_time(struct inode *inode, struct timespec *time, int flags) - mark_inode_dirty_sync(inode); - return 0; - } -+EXPORT_SYMBOL(update_time); - - /** - * touch_atime - update the access time -diff --git a/fs/namespace.c b/fs/namespace.c -index 2496062..3e66a90 100644 ---- a/fs/namespace.c -+++ b/fs/namespace.c -@@ -50,6 +50,7 @@ EXPORT_SYMBOL_GPL(fs_kobj); - * tree or hash is modified or when a vfsmount structure is modified. - */ - DEFINE_BRLOCK(vfsmount_lock); -+EXPORT_SYMBOL(vfsmount_lock); - - static inline unsigned long hash(struct vfsmount *mnt, struct dentry *dentry) - { -@@ -1401,6 +1402,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, - } - return 0; - } -+EXPORT_SYMBOL(iterate_mounts); - - static void cleanup_group_ids(struct mount *mnt, struct mount *end) - { -diff --git a/fs/notify/group.c b/fs/notify/group.c -index 63fc294..6f4adca 100644 ---- a/fs/notify/group.c -+++ b/fs/notify/group.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #include - #include "fsnotify.h" -@@ -70,6 +71,7 @@ void fsnotify_put_group(struct fsnotify_group *group) - if (atomic_dec_and_test(&group->refcnt)) - fsnotify_destroy_group(group); - } -+EXPORT_SYMBOL(fsnotify_put_group); - - /* - * Create a new fsnotify_group and hold a reference for the group returned. -@@ -102,3 +104,4 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops) - - return group; - } -+EXPORT_SYMBOL(fsnotify_alloc_group); -diff --git a/fs/notify/mark.c b/fs/notify/mark.c -index f104d56..54f36db 100644 ---- a/fs/notify/mark.c -+++ b/fs/notify/mark.c -@@ -112,6 +112,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark) - if (atomic_dec_and_test(&mark->refcnt)) - mark->free_mark(mark); - } -+EXPORT_SYMBOL(fsnotify_put_mark); - - /* - * Any time a mark is getting freed we end up here. -@@ -191,6 +192,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark) - if (unlikely(atomic_dec_and_test(&group->num_marks))) - fsnotify_final_destroy_group(group); - } -+EXPORT_SYMBOL(fsnotify_destroy_mark); - - void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask) - { -@@ -278,6 +280,7 @@ err: - - return ret; - } -+EXPORT_SYMBOL(fsnotify_add_mark); - - /* - * clear any marks in a group in which mark->flags & flags is true -@@ -333,6 +336,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark, - atomic_set(&mark->refcnt, 1); - mark->free_mark = free_mark; - } -+EXPORT_SYMBOL(fsnotify_init_mark); - - static int fsnotify_mark_destroy(void *ignored) - { -diff --git a/fs/open.c b/fs/open.c -index 59071f5..7e4c856 100644 ---- a/fs/open.c -+++ b/fs/open.c -@@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, - mutex_unlock(&dentry->d_inode->i_mutex); - return ret; - } -+EXPORT_SYMBOL(do_truncate); - - static long do_sys_truncate(const char __user *pathname, loff_t length) - { -diff --git a/fs/splice.c b/fs/splice.c -index f185c6c..f3d89da 100644 ---- a/fs/splice.c -+++ b/fs/splice.c -@@ -1117,6 +1117,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, - - return splice_write(pipe, out, ppos, len, flags); - } -+EXPORT_SYMBOL(do_splice_from); - - /* - * Attempt to initiate a splice from a file to a pipe. -@@ -1143,6 +1144,7 @@ long do_splice_to(struct file *in, loff_t *ppos, - - return splice_read(in, ppos, pipe, len, flags); - } -+EXPORT_SYMBOL(do_splice_to); - - /** - * splice_direct_to_actor - splices data directly between two non-pipes -diff --git a/security/commoncap.c b/security/commoncap.c -index 6dbae46..9f4f29a 100644 ---- a/security/commoncap.c -+++ b/security/commoncap.c -@@ -979,9 +979,11 @@ int cap_mmap_addr(unsigned long addr) - } - return ret; - } -+EXPORT_SYMBOL(cap_mmap_addr); - - int cap_mmap_file(struct file *file, unsigned long reqprot, - unsigned long prot, unsigned long flags) - { - return 0; - } -+EXPORT_SYMBOL(cap_mmap_file); -diff --git a/security/device_cgroup.c b/security/device_cgroup.c -index b08d20c..a90420b 100644 ---- a/security/device_cgroup.c -+++ b/security/device_cgroup.c -@@ -7,6 +7,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -617,6 +618,7 @@ int __devcgroup_inode_permission(struct inode *inode, int mask) - return __devcgroup_check_permission(type, imajor(inode), iminor(inode), - access); - } -+EXPORT_SYMBOL(__devcgroup_inode_permission); - - int devcgroup_inode_mknod(int mode, dev_t dev) - { -diff --git a/security/security.c b/security/security.c -index 8dcd4ae..6efe561 100644 ---- a/security/security.c -+++ b/security/security.c -@@ -396,6 +396,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry) - return 0; - return security_ops->path_rmdir(dir, dentry); - } -+EXPORT_SYMBOL(security_path_rmdir); - - int security_path_unlink(struct path *dir, struct dentry *dentry) - { -@@ -412,6 +413,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry, - return 0; - return security_ops->path_symlink(dir, dentry, old_name); - } -+EXPORT_SYMBOL(security_path_symlink); - - int security_path_link(struct dentry *old_dentry, struct path *new_dir, - struct dentry *new_dentry) -@@ -420,6 +422,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir, - return 0; - return security_ops->path_link(old_dentry, new_dir, new_dentry); - } -+EXPORT_SYMBOL(security_path_link); - - int security_path_rename(struct path *old_dir, struct dentry *old_dentry, - struct path *new_dir, struct dentry *new_dentry) -@@ -438,6 +441,7 @@ int security_path_truncate(struct path *path) - return 0; - return security_ops->path_truncate(path); - } -+EXPORT_SYMBOL(security_path_truncate); - - int security_path_chmod(struct path *path, umode_t mode) - { -@@ -445,6 +449,7 @@ int security_path_chmod(struct path *path, umode_t mode) - return 0; - return security_ops->path_chmod(path, mode); - } -+EXPORT_SYMBOL(security_path_chmod); - - int security_path_chown(struct path *path, kuid_t uid, kgid_t gid) - { -@@ -452,6 +457,7 @@ int security_path_chown(struct path *path, kuid_t uid, kgid_t gid) - return 0; - return security_ops->path_chown(path, uid, gid); - } -+EXPORT_SYMBOL(security_path_chown); - - int security_path_chroot(struct path *path) - { -@@ -528,6 +534,7 @@ int security_inode_readlink(struct dentry *dentry) - return 0; - return security_ops->inode_readlink(dentry); - } -+EXPORT_SYMBOL(security_inode_readlink); - - int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd) - { -@@ -542,6 +549,7 @@ int security_inode_permission(struct inode *inode, int mask) - return 0; - return security_ops->inode_permission(inode, mask); - } -+EXPORT_SYMBOL(security_inode_permission); - - int security_inode_setattr(struct dentry *dentry, struct iattr *attr) - { -@@ -663,6 +671,7 @@ int security_file_permission(struct file *file, int mask) - - return fsnotify_perm(file, mask); - } -+EXPORT_SYMBOL(security_file_permission); - - int security_file_alloc(struct file *file) - { -@@ -723,6 +732,7 @@ int security_mmap_file(struct file *file, unsigned long prot, - return ret; - return ima_file_mmap(file, prot); - } -+EXPORT_SYMBOL(security_mmap_file); - - int security_mmap_addr(unsigned long addr) - { diff --git a/sys-kernel/aufs-sources/Manifest b/sys-kernel/aufs-sources/Manifest index 7cdbc65bb44b..c31d3e44d5e6 100644 --- a/sys-kernel/aufs-sources/Manifest +++ b/sys-kernel/aufs-sources/Manifest @@ -1,8 +1,7 @@ DIST aufs-sources-3.6.10.tar.xz 142848 SHA256 fe8d930a4ff9f49c77d5cd2ba0456e6ead8e397527fa6d03c3d0a3443916ab5a SHA512 a1f802f25d62a191bab82b1324f8e8631324419f7e466402d28d15d3518e6cbd4c574c116ca4a7611c103ba5dfe4d724455a422e50aa489af4b27f8dd2751a85 WHIRLPOOL fd672e25429c22166b0564e5295fe9b42e5f864175d2d273232672e84a539c77ba3c02b4cbf297e8caeb73c20d254915fb5e2e91d887ebda95d4575850425e1e DIST aufs-sources-3.6.11.tar.xz 142476 SHA256 a758a7b81813c882bfb58fd08be35dd18a9f609dd7d1c1c07b5e043592afa4e7 SHA512 b13192a51443a6620fe0c571b34055ae6a706946a9011547d636b70c3fb226f1fd13304c291e8cf4db149b41eda745300bb767fa804f44b04792e0f467d0668a WHIRLPOOL 27c96a860a64580eb11b7a72991be4c56493981e4c1b3fc23ddedb79bef2339801316d0cc7c51911d8f5a3b39215cc282381dbff272536f979e3785b9d0c1a78 -DIST aufs-sources-3.6.6.tar.xz 142428 SHA256 06858480e67b59206d4a1b7c4cfea56eb7c0faaa9b8fd7aebc2ca318087647c6 SHA512 405199f53f8f5ae61ff6d0a86937254a51b76b9b0f827ee927bb76b3fbcfd550f67954d152735306e2023179dd5a268e420457885d81c1fe8960784d1a71b598 WHIRLPOOL bbca21c15bbde1149b881c0a0396d2abc5e0b3bc77db53d02d7ed1015b5396ebfeccce6c09678217eb250dcc6964038f5d0651e4cf209e29f2b8a32d00c9b3f8 -DIST aufs-sources-3.6.8.tar.xz 142476 SHA256 a758a7b81813c882bfb58fd08be35dd18a9f609dd7d1c1c07b5e043592afa4e7 SHA512 b13192a51443a6620fe0c571b34055ae6a706946a9011547d636b70c3fb226f1fd13304c291e8cf4db149b41eda745300bb767fa804f44b04792e0f467d0668a WHIRLPOOL 27c96a860a64580eb11b7a72991be4c56493981e4c1b3fc23ddedb79bef2339801316d0cc7c51911d8f5a3b39215cc282381dbff272536f979e3785b9d0c1a78 DIST aufs-sources-3.7.1.tar.xz 142976 SHA256 2c98c605254403a1fa0765fbe7c53c02d257bbce94e4de2b2d4d2e623882947f SHA512 497cdfdcb402456a5f5c572dd1bf8269590f7ed22acbe9d1b8a8347d07da06c7183ddccea33f76d8eefbfe1f25b22c2a7e4b330a3c27097f5ce54b83feb1f24b WHIRLPOOL 50b056b10f720899ee799718e2c23816964408eab12467324071a60d6c7953cbd9da283a236200590a671c7bafcaaf0925440d35e92714df03220ee4237d848a +DIST aufs-sources-3.7.2.tar.xz 142984 SHA256 f2d307363f4c4c8d991ada374134ad97c05ed7a9fc3f3e8403308bc0ff7fcd4d SHA512 ae894352f96afa99911e8de47dc946e60d3339538405e79894e699ec11226ca879f98f8c6444703daf3baaa84dac2a15a18fe5d34b2c3d1a72eb426e68c0b8b4 WHIRLPOOL d76e7e5c2ec60ee56e55ba83eeb417adfc03eadd9d9a3817452eeb95e9d751c804fe7e07004ce4e43e5d29ae5a511c711b6cba8dc72e39d6a9e3da0030a65113 DIST deblob-3.6 108747 SHA256 93df902f141fe72e9fb15b9acde2b2cb35f4632844d9073a94f0e4f15a074cbc SHA512 399a878b7f30f98434d21b50e2f3055788be5305498758ea00d0bc7fe53a891848435933aad0a9c335a68da0d4ba8fdd9aa87c67252e3ebc43c6e2143c183c84 WHIRLPOOL cb15045b152cd9d44d2b92e2a0bff392d53f2d75d2fe0705962c84113ad4703ef7d14401c4534f7c2752a669140b498eea3a0a4c1afdbadc3b2bc498c631437f DIST deblob-3.7 112072 SHA256 8b341a3d8d07ce3a21889d6bde312d534fa97490eac549b04948fa52fabbe7ea SHA512 42ab77708b4f07037b7a161b83b1790fde26408e3459794d793ea91fec21227dc6dbc462d694a13f90630f567f4df6f08d60a6ff8294078426b877b4d8e7a3be WHIRLPOOL c9071fcef9f6143ee2a4d4648bdb92ab3c514f5731e096bde9db392abc8e3450711875d7018c99255869dc280ad1116f7e07f87e1fbde7656aaa39a0ad595b9c DIST deblob-check-3.6 477608 SHA256 d0e0e90d766bc474fadfd91b83ccff74bf614cb4d31fab7d60d62b28ba4a90b9 SHA512 b4c152a1b5f20c9e46b0a7c7c76fde531798b7c135757cd6908b793825868cd8f2c4e3d5d5e1f8818e2e989fa344543d5799e0151e3001fafd00faaf97c65512 WHIRLPOOL 7fc07416bd7d5f278854272c25ea30455aed21ec75a6613fbac13751b66a21d131b1820e55f15776f61d6bcba377ef7ef5d49d2bfc964458d5af6c144deba284 @@ -11,10 +10,6 @@ DIST genpatches-3.6-10.base.tar.bz2 227441 SHA256 23ef124f2cb600f4675ad4b8033845 DIST genpatches-3.6-10.extras.tar.bz2 17038 SHA256 bf6be402ec3ef125ecaf626379f777a262e2f6776d8f5115ac0834f1e3d18b25 SHA512 614c845d474890ad0fd4271ea133464626498c3877d49c1df9940cfb2bc2a68a13828b6cae590a0d5619cf21521fe119fab782714d0bc37c287e0bba29f22fdf WHIRLPOOL ef8c9a76be1ac027b3d01e47bf22dbe178b2b68e85f4ace1186aedd89e513ff010d6e50e1392e17dde3bfebabcff07c348b04163398c43c045d6e37e78caf954 DIST genpatches-3.6-11.base.tar.bz2 244398 SHA256 464238ceee9aee5a292dc4c5c8311a47d086995b920bb68fc223a7f65ad3c44e SHA512 826413a3a87fdf29a764b75c6cb07e58aca47481ba7c60d4789e7c38d6d9a6ba8343cb8be2c3e5fbcc54b5efd5b55c6fee61feebf6a8568e2c31aa9eed0239fc WHIRLPOOL db2967f5545090a5e33b296c92bd62cc2f8294ad5c03d07f6a9635cabdca3725fa0d1d25f4e0a8458797b325f3467ece70154c7eb3aa9ebcd09c1ac7c28594a8 DIST genpatches-3.6-11.extras.tar.bz2 17038 SHA256 bf6be402ec3ef125ecaf626379f777a262e2f6776d8f5115ac0834f1e3d18b25 SHA512 614c845d474890ad0fd4271ea133464626498c3877d49c1df9940cfb2bc2a68a13828b6cae590a0d5619cf21521fe119fab782714d0bc37c287e0bba29f22fdf WHIRLPOOL ef8c9a76be1ac027b3d01e47bf22dbe178b2b68e85f4ace1186aedd89e513ff010d6e50e1392e17dde3bfebabcff07c348b04163398c43c045d6e37e78caf954 -DIST genpatches-3.6-8.base.tar.bz2 158928 SHA256 5a79567b0d12a2684255543a14dc38db46c75abda01a2871cc22bfa74d5852de SHA512 74ef54ab9f31a88acfba6f0a39029e1038f1a174bf905a6bf2e2ad89a31c3bbf4209e5fa3f2decbe077c468fbd9926207e453b41401f5b810cee84b185445d59 WHIRLPOOL e2cdc52cb8d3bff37a7bf40d77352b616e177131847570a5dd73cf7a20b8c038fbea192b5d02b5b3e859870d27dae982a344c4080af2f2e681548eed5acac236 -DIST genpatches-3.6-8.extras.tar.bz2 17038 SHA256 bf6be402ec3ef125ecaf626379f777a262e2f6776d8f5115ac0834f1e3d18b25 SHA512 614c845d474890ad0fd4271ea133464626498c3877d49c1df9940cfb2bc2a68a13828b6cae590a0d5619cf21521fe119fab782714d0bc37c287e0bba29f22fdf WHIRLPOOL ef8c9a76be1ac027b3d01e47bf22dbe178b2b68e85f4ace1186aedd89e513ff010d6e50e1392e17dde3bfebabcff07c348b04163398c43c045d6e37e78caf954 -DIST genpatches-3.6-9.base.tar.bz2 202356 SHA256 a84f9595721860cb57309fb540560e7292320ee2557165e8ef9cc649b18feec8 SHA512 366fad0e53a2e9b6833a8f05e127d97ed640e797dd114f3e541f3a69b4340bfd641d697f07e2f4c36eaf1080192d0b6af371eee94efe407739ae6f7114433c87 WHIRLPOOL a418e47dfa8a44ff08eed274f22e7468cd4ff9a85cedfe6428877ca35776467bf824c3a6876387d3228db3ce76944e36b3ea5223d751b3f65a8e16aa20022b86 -DIST genpatches-3.6-9.extras.tar.bz2 17029 SHA256 7e22574a6618fbb2eade0610fd130a06a322891f109d5ad79b1b8674da5321c8 SHA512 243ac5d7b78e0e308cfb5536439eb6da01f46bebc1a549c61eb9cb0b1199ccabfad2a7d6186a3b1387417dc40082fc931d37d07ed31bb0e78a0e9afc0e4bf655 WHIRLPOOL 71f32176b12b1b08450854afc52e603ba687628a21d18b1ffb83063cd5db159e53b729901085b57dd969fcf731f3ebdb191a1015c6c98bb1a6015f965d23e543 DIST genpatches-3.7-2.base.tar.bz2 14787 SHA256 a4ce4247ebcbba337f7efa25acf3e42a19f8d165068c6c13d3cae63bc5fe603e SHA512 89b0b5dbd050ec07f5bbbb999e44113d1e1a1898ca4c8ba5f88e1645d1b88169d7a2a534d08e8eed342f685693142794d27b09dfe4bc067c64332c38ce4d6b9f WHIRLPOOL f213a1793c0d3883659ebab53ff9aa5ecc7dbb842b1a89330b3b637f4bb3a356c3f9be9ca712fe1ab5bde06d27118f62c33434275c9aa6bf0871e39a06c20fcd DIST linux-3.6.tar.bz2 82296001 SHA256 88ae0a20fd39ecae79db0ce8f9397922fae33c8b06a54ed2c883c861126c9771 SHA512 cbaefc2c4c8ab2251c3345b7b2c88d55a49e3468d8b177b05dd6d96a802efa9a052b1a1ecab8b71298bac97f45259516d88253838332b4fdb4307780ebcddce9 WHIRLPOOL e17e3800951f0c3af21015d1a1c99698d0ef70815bd4f131dd60b30baef70d4c255988857533a9a7c058388c2febfcf02d12cde2a7ed46b24fa85aeb260c0251 DIST linux-3.7.tar.bz2 83671392 SHA256 dc08d87a579fe2918362e6666e503a95a76296419195cb499aa9dd4dbe171a9e SHA512 dad07e23b5d05a1a12092b59ea25c514ff9e89803ecf65b08f09b82aebc511fd06d2a492dea6364c3740a517f0a06a0ddb1c6847658d158205ad88995d69aaf3 WHIRLPOOL 572514032d7d64cc6a2b6ceeae7489e4b3fb48b5b63543d041ad675cd0569549ed88dc9c04ffdf91e78b8424d00b62384af78d7a41b7f399c31c056f0aa0344b diff --git a/sys-kernel/aufs-sources/aufs-sources-3.6.10.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.6.10.ebuild index fe146a218be2..1a04b576b67c 100644 --- a/sys-kernel/aufs-sources/aufs-sources-3.6.10.ebuild +++ b/sys-kernel/aufs-sources/aufs-sources-3.6.10.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/sys-kernel/aufs-sources/aufs-sources-3.6.10.ebuild,v 1.3 2012/12/21 09:17:22 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.6.10.ebuild,v 1.4 2013/01/14 09:18:29 jlec Exp $ EAPI=5 ETYPE="sources" @@ -28,8 +28,6 @@ UNIPATCH_LIST=" "${WORKDIR}"/aufs3-base.patch" # ${WORKDIR}/aufs3-proc_map.patch" -PDEPEND="sys-fs/aufs-util" - src_unpack() { use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch" unpack ${AUFS_TARBALL} @@ -46,6 +44,9 @@ pkg_postinst() { kernel-2_pkg_postinst einfo "For more info on this patchset, and how to report problems, see:" einfo "${HOMEPAGE}" + if ! has_version sys-fs/aufs-util; then + einfo "In order to use aufs FS you need to install sys-fs/aufs-util" + fi } pkg_postrm() { diff --git a/sys-kernel/aufs-sources/aufs-sources-3.6.11.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.6.11.ebuild index e97d45ede977..db1738f53beb 100644 --- a/sys-kernel/aufs-sources/aufs-sources-3.6.11.ebuild +++ b/sys-kernel/aufs-sources/aufs-sources-3.6.11.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/sys-kernel/aufs-sources/aufs-sources-3.6.11.ebuild,v 1.2 2012/12/23 09:49:57 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.6.11.ebuild,v 1.3 2013/01/14 09:18:29 jlec Exp $ EAPI=5 ETYPE="sources" @@ -28,8 +28,6 @@ UNIPATCH_LIST=" "${WORKDIR}"/aufs3-base.patch" # ${WORKDIR}/aufs3-proc_map.patch" -PDEPEND="sys-fs/aufs-util" - src_unpack() { use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch" unpack ${AUFS_TARBALL} @@ -46,6 +44,9 @@ pkg_postinst() { kernel-2_pkg_postinst einfo "For more info on this patchset, and how to report problems, see:" einfo "${HOMEPAGE}" + if ! has_version sys-fs/aufs-util; then + einfo "In order to use aufs FS you need to install sys-fs/aufs-util" + fi } pkg_postrm() { diff --git a/sys-kernel/aufs-sources/aufs-sources-3.6.6.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.6.6.ebuild deleted file mode 100644 index e9bc855dd96b..000000000000 --- a/sys-kernel/aufs-sources/aufs-sources-3.6.6.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.6.6.ebuild,v 1.3 2012/12/21 09:17:22 jlec Exp $ - -EAPI=5 -ETYPE="sources" -K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="8" -K_DEBLOB_AVAILABLE="1" -inherit kernel-2 eutils -detect_version -detect_arch - -AUFS_TARBALL="${P}.tar.xz" - -# git archive -v --remote=git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git aufs3.6 ${AUFS_TARBALL} -AUFS_URI="http://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}" - -KEYWORDS="~amd64 ~x86" -HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/" -IUSE="deblob" - -DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs3 support" -SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${AUFS_URI}" - -UNIPATCH_LIST=" - "${WORKDIR}"/aufs3-kbuild.patch - "${WORKDIR}"/aufs3-base.patch" -# ${WORKDIR}/aufs3-proc_map.patch" - -PDEPEND="sys-fs/aufs-util" - -src_unpack() { - unpack ${AUFS_TARBALL} - kernel-2_src_unpack -} - -src_prepare() { - cp -i "${WORKDIR}"/include/linux/aufs_type.h include/linux/aufs_type.h || die - cp -ri "${WORKDIR}"/{Documentation,fs} . || die - sed -i "s:__user::g" include/linux/aufs_type.h || die -} - -pkg_postinst() { - kernel-2_pkg_postinst - einfo "For more info on this patchset, and how to report problems, see:" - einfo "${HOMEPAGE}" -} - -pkg_postrm() { - kernel-2_pkg_postrm -} diff --git a/sys-kernel/aufs-sources/aufs-sources-3.7.1.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.7.1.ebuild index 84e771be202f..5f6f9f4cfc4d 100644 --- a/sys-kernel/aufs-sources/aufs-sources-3.7.1.ebuild +++ b/sys-kernel/aufs-sources/aufs-sources-3.7.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/sys-kernel/aufs-sources/aufs-sources-3.7.1.ebuild,v 1.1 2013/01/07 11:09:02 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.7.1.ebuild,v 1.2 2013/01/14 09:18:29 jlec Exp $ EAPI=5 @@ -48,6 +48,9 @@ pkg_postinst() { kernel-2_pkg_postinst einfo "For more info on this patchset, and how to report problems, see:" einfo "${HOMEPAGE}" + if ! has_version sys-fs/aufs-util; then + einfo "In order to use aufs FS you need to install sys-fs/aufs-util" + fi } pkg_postrm() { diff --git a/sys-kernel/aufs-sources/aufs-sources-3.6.8.ebuild b/sys-kernel/aufs-sources/aufs-sources-3.7.2.ebuild similarity index 71% rename from sys-kernel/aufs-sources/aufs-sources-3.6.8.ebuild rename to sys-kernel/aufs-sources/aufs-sources-3.7.2.ebuild index f9a2ebe4d95d..1a40aa757794 100644 --- a/sys-kernel/aufs-sources/aufs-sources-3.6.8.ebuild +++ b/sys-kernel/aufs-sources/aufs-sources-3.7.2.ebuild @@ -1,11 +1,12 @@ -# 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/sys-kernel/aufs-sources/aufs-sources-3.6.8.ebuild,v 1.5 2012/12/21 09:17:22 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aufs-sources/aufs-sources-3.7.2.ebuild,v 1.1 2013/01/14 09:18:29 jlec Exp $ EAPI=5 + ETYPE="sources" -K_WANT_GENPATCHES="base extras" -K_GENPATCHES_VER="9" +K_WANT_GENPATCHES="base" +K_GENPATCHES_VER="2" K_DEBLOB_AVAILABLE="1" inherit kernel-2 eutils detect_version @@ -13,7 +14,7 @@ detect_arch AUFS_TARBALL="${P}.tar.xz" -# git archive -v --remote=git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git aufs3.6 ${AUFS_TARBALL} +# git archive -v --remote=git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-standalone.git aufs3.6 > ${AUFS_TARBALL} AUFS_URI="http://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}" KEYWORDS="~amd64 ~x86" @@ -28,7 +29,7 @@ UNIPATCH_LIST=" "${WORKDIR}"/aufs3-base.patch" # ${WORKDIR}/aufs3-proc_map.patch" -PDEPEND="sys-fs/aufs-util" +PDEPEND=">=sys-fs/aufs-util-3.7" src_unpack() { use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs3-standalone.patch" @@ -38,14 +39,18 @@ src_unpack() { src_prepare() { cp -i "${WORKDIR}"/include/linux/aufs_type.h include/linux/aufs_type.h || die + cp -i "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die cp -ri "${WORKDIR}"/{Documentation,fs} . || die - sed -i "s:__user::g" include/linux/aufs_type.h || die + sed -i "s:__user::g" include/uapi/linux/aufs_type.h || die } pkg_postinst() { kernel-2_pkg_postinst einfo "For more info on this patchset, and how to report problems, see:" einfo "${HOMEPAGE}" + if ! has_version sys-fs/aufs-util; then + einfo "In order to use aufs FS you need to install sys-fs/aufs-util" + fi } pkg_postrm() { diff --git a/virtual/python-unittest2/python-unittest2-1.ebuild b/virtual/python-unittest2/python-unittest2-1.ebuild index 3874542cb45a..b5585ea27863 100644 --- a/virtual/python-unittest2/python-unittest2-1.ebuild +++ b/virtual/python-unittest2/python-unittest2-1.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/virtual/python-unittest2/python-unittest2-1.ebuild,v 1.1 2013/01/07 20:16:05 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/virtual/python-unittest2/python-unittest2-1.ebuild,v 1.2 2013/01/14 09:30:38 mgorny Exp $ EAPI=5 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} ) inherit python-r1 -DESCRIPTION="A virtual for Python 2.7/3.2+-compatible unittest or unittest2" +DESCRIPTION="A virtual for packages needing unittest2 in Python 2.5, 2.6, 3.1" HOMEPAGE="" SRC_URI="" diff --git a/www-apps/webdavcgi/webdavcgi-0.8.3.ebuild b/www-apps/webdavcgi/webdavcgi-0.8.3.ebuild index 20f27cd6735d..3eee8c8a2c46 100644 --- a/www-apps/webdavcgi/webdavcgi-0.8.3.ebuild +++ b/www-apps/webdavcgi/webdavcgi-0.8.3.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/www-apps/webdavcgi/webdavcgi-0.8.3.ebuild,v 1.1 2013/01/11 10:43:38 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/webdavcgi/webdavcgi-0.8.3.ebuild,v 1.2 2013/01/14 08:22:33 dev-zero Exp $ EAPI=4 @@ -47,9 +47,12 @@ src_prepare() { src_compile() { if use suid; then + # There are several webdavwrappers, TODO: make it configureable + export WEBDAVWRAPPER="webdavwrapper" + $(tc-getCC) ${LDFLAGS} ${CFLAGS} \ - -o "${CGIBINDIR}/webdavwrapper" \ - helper/webdavwrapper.c || die "compile webdavwrapper failed" + -o "${CGIBINDIR}/${WEBDAVWRAPPER}" \ + helper/webdavwrapper.c || die "compile ${WEBDAVWRAPPER} failed" fi } @@ -68,7 +71,7 @@ src_install() { newexe "${CGIBINDIR}/logout-dist" logout doexe "${CGIBINDIR}/webdav.pl" - use suid && doexe "${CGIBINDIR}/webdavwrapper" + use suid && doexe "${CGIBINDIR}/${WEBDAVWRAPPER}" local currentDir for currentDir in ${installDirs}; do @@ -92,10 +95,10 @@ src_install() { # In order to change the user and group ID at runtime, the webdavwrapper # needs to be run as root (set-user-ID and set-group-ID bit) if use suid; then - einfo "Setting SUID and SGID bit for webdavwrapper" - fowners root:root "${MY_CGIBINDIR}/webdavwrapper" - fperms 6755 "${MY_CGIBINDIR}/webdavwrapper" - webapp_postinst_txt en "${FILESDIR}/postinstall-webdavwrapper-en.txt" + einfo "Setting SUID and SGID bit for ${WEBDAVWRAPPER}" + fowners root:root "${MY_CGIBINDIR}/${WEBDAVWRAPPER}" + fperms 6755 "${MY_CGIBINDIR}/${WEBDAVWRAPPER}" + webapp_postinst_txt en "${FILESDIR}/postinstall-${WEBDAVWRAPPER}-en.txt" webapp_hook_script "${FILESDIR}/reconfig-suid" else ewarn "You have the 'suid' USE flag disabled" diff --git a/www-client/seamonkey/files/icon/seamonkey.png b/www-client/seamonkey/files/icon/seamonkey.png deleted file mode 100644 index b2b7f624ff4c9676235faf2844950a3e35d3d903..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4172 zcmV-S5VP-zP)gUw?nU{!Pyaes8}$29N@g0!{*) z2flXz^kq_tt*&dWcU^OZZOaiMgsnAzCMrQ|?fJf%Xf)JBx$GSU{UXR`VCU)o2LfO0 zf^bJHX1uSrH$I%rI(@cn*rq8l41w05wO&+05GaB`;dx)LVOc+$EY`TGy{bOknXe}0y4ed{Goohm-*`|49#>*vlFv5eONzcQ7wzqod7_U5iGXC7$F zsx46M;9KWP>1En!Vlk8Vy>C5teEf3C-TnM>LNZl>$r79{!dS)RJ=gVe_}~;%Q!%iz{qH*nWo zTlwx}ibGSdE+-gF3UaQXH!k?@QNfgUS+}kW(==ovVO?t&@?O{z`wa-}ab4H^{OZ-| zPvmm08v$V+Wapte%7u1nN!y!l8sP(fxrGM~IjqUT^{bDQZqtGm11 zPxtjD0I@^{i)GU(A(jws9XH>+7CV>bQ~@sT5zN)WQ&0(lYm#;p z_$odW>M)kqoGEJxbxp<7SeYbu+_{vKztW|}f*82l6L%`Hp7G{sHXtaGF5nr%*~ zE+8A`33bj?r&C{b)e!wdX`Vg}BUzZOMVc=(;1^?x)A@j;8SwMh0$!Mc&DXBsbDz7K z7LFDH0K<^$K!12y0+uB|l}_6+t=pY)vGr*qq83?usZS&lHe0szbE0g~6BpEj$of?; zTDAKUa7mA5Q?F*rfTq_~yf~@YxNVqQZn*(}Ham{dA%k|Q zbjs&^(MEOLH#C&u+Ur*G!xM1X08EylJE$!Vx4KNhT)9W@D^blj+QTgupNaQi>}; z51GxhYfCa|4Yn`+=PNtY=EW(rZcExgO1S=Q!#r7lKt)l<3!%|G{4gRkRo28UjYd#v zK*EBHyA`7~o8jR!LI|Xc4k18Ffl_)!7_zxZK#bV7k!`KG5s(Fti__!I%u=5>sav-$ zM{Y%y%0W%hi@F9_tj<-KA*I0IU=Pn z!!R1yvJ70;!f`AtOOi;$kW$QBSZgSi8r17Pb8}UyRgdW2&WD&AZyaH=1SgAN$w>QN z2!W0i?T289=){zejX@?RkV4=GEdtD2zkLSc@iNDv2o)XY}@2(4?H$t zf=*^Kse!BBvXvD>J@d|@n*#|TnaYw#X31uIs8q_7N(E}QDoUw{gw|v-Ibv>{ATTJG zDqL|zioU@VKlm{WCL!-feF_1hDMLeQ`V)eol)zUSQ)=oy2sCqb*wil=9$v}2-<@LR zsy_O9vzV5N5Kyhw(VBH8KqiyKvdp&KgH94HtC^-vI-Mh#%n}4XTIsgnCNND4fy8z+ zS6m4PrUf9V`jIb55gA0tNJ^fssCbH6Ag~P>&Ppw>2?xQ2r3mK0@X^5 zN+ray7A#+_HtXj=N{wwtWuqRjV#p+wmY^1vmlhEzVbh!8$%!ahl)a`SipWtd1H4cZ zh9QQ8-UKuPfh9FcM~>}>(4Ufwj|cqpr*(udNT*HWaTCLc`qMfj3^gX;RVvl;%uIt= zOkvwH0@VbkfvHKKiHQbNQ$D3qKq@83WDTx*OPrAr8{3id1V&ba-6eSTSTn4)fJ<u12Jij+}W zU#TdnRi9I*D%iHfFv?Ua;c*jWRjJAurD`e&v@8}vlnUo%(YY8>7C$}#1IY+<%#18=NEn?}WNd{nAk><;ElAlKQ$nZ&=@?9w4c?rS{P4eOOi!x? zzZ0!BATngBR3Z$+;}Y%;wAQDBpje4=8akeTqnv-?dV9TnWxnAChxhzhoNpe2lr2cu zkZc}Oz?ou*BSU)P8Ywizy5^#;D8y>536F2F% z^k^8Kn+U_k1+BegS4_aFRR;Imljh}$;E6FP`@jF@CS&ECH+ z@}nO$<}=v^@KHh+9T0|Ps@18dfN`^JlkO{FczmZ2gGq4CyWQ2A%6MF`YgdX7eI&_e ze+C0d!C(reD~g$Nz{Va;z6Qe?L5~|f3c6;rs1-fIRL#J(4c_}E!81Rr^R=&4c=gq= z&1o0(->SFDxw%(QdS2~6VRyBSz}<6j|D#$@Z5LwIvKDW3kV*-5>`1Wvqe&imF*$<_gZI^(nNs|_A~v_`F_mw;bR|DIQ3 zW@hZU=*38LC0_VdzX20BK;Lj{7Fsv9I&~bu2R|5R*RB*_dJcYl23$jvHUq9*rCF5$ zQ$!)O)QBuz^(Bra*)$;Ojl=Y70gwJ`l>-NS&YlfXiuo1RFhs|A3xothD5jp68>}AcyZq3baQVb4 z$3l)A@p(#^~#l?An#$_S;?l=9loR)9~?a@UHcem?>~g7#|Bbbt+)$RLJ)ac#MvQ|>U)FQ)eLZwtWO2_E z(Zl&Cu7DLN_U!}q;DLvE$;gX^e5pXTVU#CkDXtwuz!DJe&Ck#T?ou_a=DO%!mz>Q zB_3%M#F9zZv)kFXW1EJg@oh7va4Z!@JfCe(;?t4?Ixj5dSUS8 z0G`i5FWi1~^u^h;XJ7rhMx**5?Dj55Kx>@@E(bnT_PF)wagzI9h%&|d-a+8jYsJ65 z`)ula-*YU(kc*e5R&O zc$1UIpD2~4zYMz{d)?QpTI)xEw;i9=Jr5s37VB{BFl-qV;b4+yErWjq{znKg3ws9) z!@VOG>-%Ury>1|xT=`o&XuE`j(3H#P7#}}UD-_P|sntpkgFf*_zNHX;sE>~3^@hSo+cKH8D_yrM?l=id(_V(m^5Ie`AK$N0s};S8 ziKC-)bCW*|!|;CCdE__x)Ie+f7r+h8^CQ4>z*9nq@*8-Ee7RvbZ*`pP<%vY^X2(g5 z*mfcoi^Z`lr^88w0Hr)UuR^0yq0y)utyJcY77Ayd2?Fm2U>t(G>->g4p|v)FWOE-f z|66?YVM3S%Jz!bMA={2`l2ZPGVc1QlWWH1?2*c1j9R&V?TCFe&;#_p>41U{BPW~4L W+e^UAHbqtd0000