aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-doc/gromacs-manual/ChangeLog12
-rw-r--r--app-doc/gromacs-manual/Manifest18
-rw-r--r--app-doc/gromacs-manual/gromacs-manual-9999.ebuild11
-rw-r--r--app-doc/gromacs-manual/metadata.xml2
-rw-r--r--app-portage/g-cran/ChangeLog6
-rw-r--r--app-portage/g-cran/Manifest16
-rw-r--r--app-portage/g-cran/g-cran-9999.ebuild4
-rw-r--r--app-portage/g-cran/metadata.xml4
-rw-r--r--app-text/dgs/ChangeLog5
-rw-r--r--app-text/dgs/Manifest22
-rw-r--r--app-text/dgs/dgs-0.5.10-r2.ebuild4
-rw-r--r--app-vim/freefem++-syntax/ChangeLog5
-rw-r--r--app-vim/freefem++-syntax/Manifest22
-rw-r--r--app-vim/freefem++-syntax/metadata.xml4
-rw-r--r--dev-cpp/growler-link/ChangeLog11
-rw-r--r--dev-cpp/growler-link/Manifest22
-rw-r--r--dev-cpp/growler-link/growler-link-0.3.7.ebuild25
-rw-r--r--dev-java/jgraphx/ChangeLog8
-rw-r--r--dev-java/jgraphx/jgraphx-1.4.1.0.ebuild42
-rw-r--r--dev-lang/aldor/ChangeLog22
-rw-r--r--dev-lang/aldor/Manifest9
-rw-r--r--dev-lang/aldor/aldor-1.1.0.ebuild79
-rw-r--r--dev-lang/aldor/files/aldor-1.1.0.patch23
-rw-r--r--dev-lang/aldor/metadata.xml19
-rw-r--r--dev-libs/libunzip/ChangeLog5
-rw-r--r--dev-libs/libunzip/Manifest22
-rw-r--r--dev-libs/libunzip/libunzip-5.52.ebuild4
-rw-r--r--dev-ml/ocamlgraph/ChangeLog3
-rw-r--r--dev-ml/ocamlgraph/Manifest14
-rw-r--r--dev-ml/ocamlgraph/ocamlgraph-1.7.ebuild4
-rw-r--r--dev-perl/Lab-Tools/ChangeLog5
-rw-r--r--dev-perl/Lab-Tools/Manifest14
-rw-r--r--dev-perl/Lab-Tools/metadata.xml2
-rw-r--r--dev-python/coords/ChangeLog6
-rw-r--r--dev-python/coords/Manifest16
-rw-r--r--dev-python/coords/coords-0.37.ebuild10
-rw-r--r--dev-python/coords/metadata.xml4
-rw-r--r--dev-python/cvxopt/ChangeLog11
-rw-r--r--dev-python/cvxopt/Manifest13
-rw-r--r--dev-python/cvxopt/cvxopt-1.1.3.ebuild28
-rw-r--r--dev-python/cvxopt/files/cvxopt-1.1.3-blas.patch76
-rw-r--r--dev-python/cvxopt/metadata.xml3
-rw-r--r--dev-python/ffc/Manifest11
-rw-r--r--dev-python/ffnet/ChangeLog8
-rw-r--r--dev-python/ffnet/Manifest12
-rw-r--r--dev-python/ffnet/ffnet-0.6.2.ebuild20
-rw-r--r--dev-python/fiat/Manifest11
-rw-r--r--dev-python/inference/ChangeLog11
-rw-r--r--dev-python/inference/Manifest14
-rw-r--r--dev-python/inference/inference-0.4.ebuild20
-rw-r--r--dev-python/instant/Manifest11
-rw-r--r--dev-python/numpydoc/ChangeLog6
-rw-r--r--dev-python/numpydoc/Manifest16
-rw-r--r--dev-python/numpydoc/metadata.xml6
-rw-r--r--dev-python/numpydoc/numpydoc-0.4.ebuild9
-rw-r--r--dev-python/numscons/ChangeLog6
-rw-r--r--dev-python/numscons/Manifest16
-rw-r--r--dev-python/numscons/metadata.xml4
-rw-r--r--dev-python/numscons/numscons-0.10.1.ebuild10
-rw-r--r--dev-python/omniorbpy/ChangeLog5
-rw-r--r--dev-python/omniorbpy/Manifest12
-rw-r--r--dev-python/omniorbpy/omniorbpy-3.4.ebuild4
-rw-r--r--dev-python/pymvpa/ChangeLog8
-rw-r--r--dev-python/pymvpa/Manifest15
-rw-r--r--dev-python/pymvpa/metadata.xml6
-rw-r--r--dev-python/pymvpa/pymvpa-0.4.4.ebuild16
-rw-r--r--dev-python/pythoncgns/ChangeLog5
-rw-r--r--dev-python/pythoncgns/Manifest14
-rw-r--r--dev-python/pythoncgns/pythoncgns-2009.10.30.ebuild11
-rw-r--r--dev-python/ufl/Manifest11
-rw-r--r--dev-python/viper/Manifest11
-rw-r--r--dev-util/smartgit/ChangeLog5
-rw-r--r--dev-util/smartgit/Manifest12
-rw-r--r--dev-util/smartgit/metadata.xml2
-rw-r--r--eclass/fortran-2.eclass172
-rw-r--r--media-gfx/brlcad/ChangeLog89
-rw-r--r--media-gfx/brlcad/Manifest22
-rw-r--r--media-gfx/brlcad/metadata.xml34
-rw-r--r--media-gfx/librecad/ChangeLog7
-rw-r--r--media-gfx/librecad/Manifest17
-rw-r--r--media-gfx/librecad/librecad-1.0.0_beta5.ebuild2
-rw-r--r--media-gfx/librecad/librecad-1.0.0_rc1.ebuild42
-rw-r--r--media-gfx/librecad/librecad-9999.ebuild2
-rw-r--r--net-firewall/gcb/ChangeLog5
-rw-r--r--net-firewall/gcb/Manifest26
-rw-r--r--net-firewall/gcb/gcb-1.5.6.ebuild13
-rw-r--r--net-firewall/gcb/metadata.xml10
-rw-r--r--net-ftp/bbftp-server/ChangeLog5
-rw-r--r--net-ftp/bbftp-server/Manifest22
-rw-r--r--net-ftp/bbftp-server/bbftp-server-3.2.0.ebuild4
-rw-r--r--net-misc/dhcp/ChangeLog11
-rw-r--r--net-misc/dhcp/Manifest45
-rw-r--r--net-misc/dhcp/dhcp-4.2.1_p1-r1.ebuild231
-rw-r--r--net-misc/dhcp/files/dhcp-3.0-fix-perms.patch15
-rw-r--r--net-misc/dhcp/files/dhcp-3.0-paranoia.patch207
-rw-r--r--net-misc/dhcp/files/dhcp-3.0.2-gmake.patch66
-rw-r--r--net-misc/dhcp/files/dhcp-3.0.3-dhclient-dbus.patch84
-rw-r--r--net-misc/dhcp/files/dhcp-3.0.3-dhclient-hostname.patch16
-rw-r--r--net-misc/dhcp/files/dhcp-3.0.3-dhclient-metric.patch200
-rw-r--r--net-misc/dhcp/files/dhcp-3.0.3-dhclient-mtu.patch180
-rw-r--r--net-misc/dhcp/files/dhcp-3.0.3-dhclient-no-down.patch70
-rw-r--r--net-misc/dhcp/files/dhcp-3.0.3-dhclient-ntp.patch186
-rw-r--r--net-misc/dhcp/files/dhcp-3.0.3-libdst.patch14
-rw-r--r--net-misc/dhcp/files/dhcp-3.0.3-no_isc_blurb.patch105
-rw-r--r--net-misc/dhcp/files/dhcp-3.0.4-dhclient-stdin-conf.patch83
-rw-r--r--net-misc/dhcp/files/dhcp-3.0.5-bpf-nofallback.patch44
-rw-r--r--net-misc/dhcp/files/dhcp-3.1.0a1-dhclient-resolvconf.patch254
-rw-r--r--net-misc/dhcp/files/dhcp-3.1.2_p1-CVE-2009-1892.patch12
-rw-r--r--net-misc/dhcp/files/dhcp-3.1.3-dhclient-no-down.patch77
-rw-r--r--net-misc/dhcp/files/dhcp-4.0-dhclient-ntp.patch216
-rw-r--r--net-misc/dhcp/files/dhcp-4.0.1-dhclient-stdin-conf.patch114
-rw-r--r--net-misc/dhcp/files/dhcp-4.2.0-errwarn-message.patch31
-rw-r--r--net-misc/dhcp/files/dhcp-4.2.0-improved-xid.patch138
-rw-r--r--net-misc/dhcp/files/dhcp-4.2.0-lpf-ib.patch538
-rw-r--r--net-misc/dhcp/files/dhcp-4.2.0-options.patch401
-rw-r--r--net-misc/dhcp/files/dhcp-4.2.0-xen-checksum.patch245
-rw-r--r--net-misc/dhcp/files/dhcp-4.2.1-dhclient-resolvconf.patch384
-rw-r--r--net-misc/dhcp/files/dhcp-4.2.1-nogateway.patch46
-rw-r--r--net-misc/dhcp/files/dhcpd.conf29
-rw-r--r--net-misc/dhcp/files/dhcpd.init294
-rwxr-xr-xnet-misc/dhcp/files/dhcpd.init394
-rw-r--r--net-misc/dhcp/files/dhcrelay.conf13
-rw-r--r--net-misc/dhcp/files/dhcrelay.init32
-rwxr-xr-xnet-misc/dhcp/files/dhcrelay.init229
-rw-r--r--net-misc/dhcp/metadata.xml12
-rw-r--r--perl-core/encoding-warnings/ChangeLog5
-rw-r--r--perl-core/encoding-warnings/Manifest14
-rw-r--r--perl-core/encoding-warnings/encoding-warnings-0.11.ebuild3
-rw-r--r--profiles/package.mask85
-rw-r--r--sci-astronomy/casacore/ChangeLog7
-rw-r--r--sci-astronomy/casacore/Manifest13
-rw-r--r--sci-astronomy/casacore/casacore-1.2.20110516.ebuild2
-rw-r--r--sci-astronomy/eye/ChangeLog5
-rw-r--r--sci-astronomy/eye/Manifest14
-rw-r--r--sci-astronomy/eye/eye-1.4.1.ebuild4
-rw-r--r--sci-astronomy/missfits/ChangeLog6
-rw-r--r--sci-astronomy/missfits/Manifest16
-rw-r--r--sci-astronomy/missfits/metadata.xml7
-rw-r--r--sci-astronomy/missfits/missfits-2.4.0.ebuild17
-rw-r--r--sci-astronomy/psfex/Manifest10
-rw-r--r--sci-astronomy/psfex/psfex-3.9.1.ebuild2
-rw-r--r--sci-astronomy/skymaker/Manifest12
-rw-r--r--sci-astronomy/skymaker/skymaker-3.3.3.ebuild2
-rw-r--r--sci-astronomy/stuff/Manifest12
-rw-r--r--sci-astronomy/stuff/stuff-1.19.ebuild2
-rw-r--r--sci-astronomy/weightwatcher/ChangeLog6
-rw-r--r--sci-astronomy/weightwatcher/Manifest15
-rw-r--r--sci-astronomy/weightwatcher/metadata.xml4
-rw-r--r--sci-astronomy/weightwatcher/weightwatcher-1.8.10.ebuild17
-rw-r--r--sci-biology/OBO-Edit/ChangeLog7
-rw-r--r--sci-biology/OBO-Edit/Manifest13
-rw-r--r--sci-biology/OBO-Edit/OBO-Edit-2.1_beta8.ebuild23
-rw-r--r--sci-biology/ONTO-PERL/ChangeLog7
-rw-r--r--sci-biology/ONTO-PERL/Manifest13
-rw-r--r--sci-biology/ONTO-PERL/ONTO-PERL-1.31.ebuild9
-rw-r--r--sci-biology/amos/Manifest13
-rw-r--r--sci-biology/apollo/Manifest12
-rw-r--r--sci-biology/argo-bin/ChangeLog7
-rw-r--r--sci-biology/argo-bin/Manifest15
-rw-r--r--sci-biology/argo-bin/argo-bin-1.0.31.ebuild11
-rw-r--r--sci-biology/argo/Manifest14
-rw-r--r--sci-biology/argo/argo-1.0.24.ebuild11
-rw-r--r--sci-biology/autoeditor/ChangeLog7
-rw-r--r--sci-biology/autoeditor/Manifest15
-rw-r--r--sci-biology/autoeditor/autoeditor-1.20.ebuild25
-rw-r--r--sci-biology/bamtools/ChangeLog7
-rw-r--r--sci-biology/bamtools/Manifest15
-rw-r--r--sci-biology/bamtools/bamtools-9999.ebuild4
-rw-r--r--sci-biology/bedtools/ChangeLog7
-rw-r--r--sci-biology/bedtools/Manifest15
-rw-r--r--sci-biology/bedtools/bedtools-2.10.1.ebuild18
-rw-r--r--sci-biology/caftools/Manifest12
-rw-r--r--sci-biology/cap3-bin/Manifest14
-rw-r--r--sci-biology/cap3-bin/cap3-bin-20071221.ebuild26
-rw-r--r--sci-biology/clover/Manifest42
-rw-r--r--sci-biology/clover/clover-2010.02.19.ebuild2
-rw-r--r--sci-biology/clover/metadata.xml3
-rw-r--r--sci-biology/codonw/Manifest12
-rw-r--r--sci-biology/codonw/codonw-1.4.4-r1.ebuild2
-rw-r--r--sci-biology/consed/Manifest12
-rw-r--r--sci-biology/consed/consed-20-r1.ebuild2
-rw-r--r--sci-biology/dawg/ChangeLog5
-rw-r--r--sci-biology/dawg/Manifest14
-rw-r--r--sci-biology/dawg/metadata.xml2
-rw-r--r--sci-biology/embassy-cbstools/ChangeLog4
-rw-r--r--sci-biology/embassy-cbstools/Manifest12
-rw-r--r--sci-biology/embassy-cbstools/embassy-cbstools-1.0.0-r2.ebuild2
-rw-r--r--sci-biology/embassy-domainatrix/ChangeLog4
-rw-r--r--sci-biology/embassy-domainatrix/Manifest12
-rw-r--r--sci-biology/embassy-domainatrix/embassy-domainatrix-0.1.0-r5.ebuild2
-rw-r--r--sci-biology/embassy-domalign/ChangeLog4
-rw-r--r--sci-biology/embassy-domalign/Manifest12
-rw-r--r--sci-biology/embassy-domalign/embassy-domalign-0.1.0-r5.ebuild2
-rw-r--r--sci-biology/embassy-domsearch/ChangeLog4
-rw-r--r--sci-biology/embassy-domsearch/Manifest12
-rw-r--r--sci-biology/embassy-domsearch/embassy-domsearch-0.1.0-r5.ebuild2
-rw-r--r--sci-biology/embassy-emnu/ChangeLog3
-rw-r--r--sci-biology/embassy-emnu/Manifest12
-rw-r--r--sci-biology/embassy-emnu/embassy-emnu-1.05-r7.ebuild2
-rw-r--r--sci-biology/embassy-esim4/ChangeLog3
-rw-r--r--sci-biology/embassy-esim4/Manifest12
-rw-r--r--sci-biology/embassy-esim4/embassy-esim4-1.0.0-r7.ebuild2
-rw-r--r--sci-biology/embassy-hmmer/ChangeLog3
-rw-r--r--sci-biology/embassy-hmmer/Manifest12
-rw-r--r--sci-biology/embassy-hmmer/embassy-hmmer-2.3.2-r4.ebuild2
-rw-r--r--sci-biology/embassy-iprscan/ChangeLog3
-rw-r--r--sci-biology/embassy-iprscan/Manifest12
-rw-r--r--sci-biology/embassy-iprscan/embassy-iprscan-4.3.1-r2.ebuild2
-rw-r--r--sci-biology/embassy-memenew/ChangeLog3
-rw-r--r--sci-biology/embassy-memenew/Manifest12
-rw-r--r--sci-biology/embassy-memenew/embassy-memenew-4.0.0-r1.ebuild2
-rw-r--r--sci-biology/embassy-mira/ChangeLog3
-rw-r--r--sci-biology/embassy-mira/Manifest12
-rw-r--r--sci-biology/embassy-mira/embassy-mira-2.8.2-r2.ebuild2
-rw-r--r--sci-biology/embassy-mse/ChangeLog3
-rw-r--r--sci-biology/embassy-mse/Manifest12
-rw-r--r--sci-biology/embassy-mse/embassy-mse-3.0.0.ebuild2
-rw-r--r--sci-biology/embassy-phylipnew/ChangeLog3
-rw-r--r--sci-biology/embassy-phylipnew/Manifest12
-rw-r--r--sci-biology/embassy-phylipnew/embassy-phylipnew-3.69.ebuild2
-rw-r--r--sci-biology/embassy-signature/ChangeLog4
-rw-r--r--sci-biology/embassy-signature/Manifest12
-rw-r--r--sci-biology/embassy-signature/embassy-signature-0.1.0-r5.ebuild2
-rw-r--r--sci-biology/embassy-structure/ChangeLog4
-rw-r--r--sci-biology/embassy-structure/Manifest12
-rw-r--r--sci-biology/embassy-structure/embassy-structure-0.1.0-r5.ebuild2
-rw-r--r--sci-biology/embassy-topo/ChangeLog3
-rw-r--r--sci-biology/embassy-topo/Manifest12
-rw-r--r--sci-biology/embassy-topo/embassy-topo-2.0.0.ebuild2
-rw-r--r--sci-biology/embassy-vienna/ChangeLog3
-rw-r--r--sci-biology/embassy-vienna/Manifest12
-rw-r--r--sci-biology/embassy-vienna/embassy-vienna-1.7.2-r2.ebuild2
-rw-r--r--sci-biology/embassy/ChangeLog3
-rw-r--r--sci-biology/embassy/Manifest12
-rw-r--r--sci-biology/embassy/embassy-6.3.1.ebuild2
-rw-r--r--sci-biology/est2uni/Manifest16
-rw-r--r--sci-biology/est2uni/est2uni-0.27.ebuild20
-rw-r--r--sci-biology/estscan/ChangeLog12
-rw-r--r--sci-biology/estscan/Manifest15
-rw-r--r--sci-biology/estscan/estscan-3.0.3.ebuild91
-rw-r--r--sci-biology/estscan/metadata.xml1
-rw-r--r--sci-biology/gap2caf/Manifest12
-rw-r--r--sci-biology/gap2caf/gap2caf-2.1.0.ebuild2
-rw-r--r--sci-biology/gbrowse/ChangeLog17
-rw-r--r--sci-biology/gbrowse/Manifest26
-rw-r--r--sci-biology/gbrowse/files/GBrowseInstall.pm-2.26.patch72
-rw-r--r--sci-biology/gbrowse/files/GBrowseInstall.pm-2.38.patch (renamed from sci-biology/gbrowse/files/GBrowseInstall.pm-2.33.patch)0
-rw-r--r--sci-biology/gbrowse/files/GBrowseInstall.pm-disable-gbrowse_metadb_config.pl.pm-2.26.patch21
-rw-r--r--sci-biology/gbrowse/gbrowse-1.70.ebuild68
-rw-r--r--sci-biology/gbrowse/gbrowse-2.00.ebuild76
-rw-r--r--sci-biology/gbrowse/gbrowse-2.26.ebuild167
-rw-r--r--sci-biology/gbrowse/gbrowse-2.38.ebuild (renamed from sci-biology/gbrowse/gbrowse-2.33.ebuild)33
-rw-r--r--sci-biology/mira/Manifest7
-rw-r--r--sci-biology/mira/files/libtool.m4.patch13
-rw-r--r--sci-biology/mira/mira-3.2.1-r2.ebuild1
-rw-r--r--sci-biology/mira/mira-3.2.1.17-r1.ebuild5
-rw-r--r--sci-biology/mira/mira-3.2.1.18.ebuild58
-rw-r--r--sci-biology/mrbayes/ChangeLog6
-rw-r--r--sci-biology/mrbayes/Manifest26
-rw-r--r--sci-biology/mrbayes/metadata.xml4
-rw-r--r--sci-biology/mrbayes/mrbayes-3.1.2-r1.ebuild15
-rw-r--r--sci-biology/newbler/ChangeLog7
-rw-r--r--sci-biology/newbler/Manifest4
-rw-r--r--sci-biology/newbler/newbler-2.0.01.10.ebuild37
-rw-r--r--sci-biology/nrcl/ChangeLog14
-rw-r--r--sci-biology/nrcl/Manifest18
-rw-r--r--sci-biology/nrcl/files/110625-build.patch48
-rw-r--r--sci-biology/nrcl/nrcl-0.1.ebuild39
-rw-r--r--sci-biology/nrcl/nrcl-110625.ebuild30
-rw-r--r--sci-biology/proda/ChangeLog5
-rw-r--r--sci-biology/proda/Manifest14
-rw-r--r--sci-biology/proda/metadata.xml2
-rw-r--r--sci-biology/seqclean/ChangeLog10
-rw-r--r--sci-biology/seqclean/Manifest20
-rw-r--r--sci-biology/seqclean/files/seqclean-110625-build.patch135
-rw-r--r--sci-biology/seqclean/seqclean-0.1.ebuild57
-rw-r--r--sci-biology/seqclean/seqclean-110625.ebuild54
-rw-r--r--sci-biology/sequin/ChangeLog5
-rw-r--r--sci-biology/sequin/Manifest14
-rw-r--r--sci-biology/sequin/metadata.xml2
-rw-r--r--sci-biology/sff_dump/ChangeLog7
-rw-r--r--sci-biology/sff_dump/Manifest15
-rw-r--r--sci-biology/sff_dump/sff_dump-1.04.ebuild26
-rw-r--r--sci-biology/smalt-bin/ChangeLog7
-rw-r--r--sci-biology/smalt-bin/Manifest13
-rw-r--r--sci-biology/smalt-bin/smalt-bin-0.5.1.ebuild26
-rw-r--r--sci-biology/ssaha2-bin/ChangeLog7
-rw-r--r--sci-biology/ssaha2-bin/Manifest13
-rw-r--r--sci-biology/ssaha2-bin/ssaha2-bin-2.5.3.ebuild41
-rw-r--r--sci-biology/staden/ChangeLog16
-rw-r--r--sci-biology/staden/Manifest15
-rw-r--r--sci-biology/staden/staden-2.0.0_beta8.ebuild53
-rw-r--r--sci-biology/staden/staden-9999.ebuild54
-rw-r--r--sci-biology/tablet-bin/Manifest12
-rw-r--r--sci-biology/tablet-bin/tablet-bin-1.11.05.03.ebuild2
-rw-r--r--sci-biology/tclust/ChangeLog10
-rw-r--r--sci-biology/tclust/Manifest18
-rw-r--r--sci-biology/tclust/files/tclust-110625-build.patch43
-rw-r--r--sci-biology/tclust/tclust-0.1.ebuild39
-rw-r--r--sci-biology/tclust/tclust-110625.ebuild30
-rw-r--r--sci-biology/tigr-assembler/ChangeLog5
-rw-r--r--sci-biology/tigr-assembler/Manifest16
-rw-r--r--sci-biology/tigr-assembler/tigr-assembler-2.0.ebuild5
-rw-r--r--sci-biology/tigr-foundation-libs/ChangeLog8
-rw-r--r--sci-biology/tigr-foundation-libs/Manifest15
-rw-r--r--sci-biology/tigr-foundation-libs/tigr-foundation-libs-2.0-r1.ebuild5
-rw-r--r--sci-biology/wcd/ChangeLog10
-rw-r--r--sci-biology/wcd/Manifest17
-rw-r--r--sci-biology/wcd/wcd-0.6.0.ebuild52
-rw-r--r--sci-biology/wcd/wcd-0.6.0_beta.ebuild47
-rw-r--r--sci-biology/zmsort/ChangeLog10
-rw-r--r--sci-biology/zmsort/Manifest18
-rw-r--r--sci-biology/zmsort/files/zmsort-110625-build.patch41
-rw-r--r--sci-biology/zmsort/zmsort-0.1.ebuild40
-rw-r--r--sci-biology/zmsort/zmsort-110625.ebuild30
-rw-r--r--sci-chemistry/almost/Manifest12
-rw-r--r--sci-chemistry/almost/almost-1.0.3-r2.ebuild2
-rw-r--r--sci-chemistry/almost/metadata.xml11
-rw-r--r--sci-chemistry/ambertools/ChangeLog13
-rw-r--r--sci-chemistry/ambertools/Manifest20
-rw-r--r--sci-chemistry/ambertools/ambertools-1.4.ebuild31
-rw-r--r--sci-chemistry/ambertools/ambertools-1.5.ebuild31
-rw-r--r--sci-chemistry/ambertools/files/ambertools-1.4-bugfix_1-18.patch9025
-rw-r--r--sci-chemistry/ambertools/files/ambertools-1.5-bugfix_1-3.patch3831
-rw-r--r--sci-chemistry/avogadro/ChangeLog8
-rw-r--r--sci-chemistry/avogadro/Manifest23
-rw-r--r--sci-chemistry/avogadro/avogadro-9999.ebuild20
-rw-r--r--sci-chemistry/avogadro/metadata.xml16
-rw-r--r--sci-chemistry/bist/Manifest20
-rw-r--r--sci-chemistry/bist/bist-0.5.1-r1.ebuild18
-rw-r--r--sci-chemistry/camshift/Manifest10
-rw-r--r--sci-chemistry/camshift/camshift-1.35.0.ebuild2
-rw-r--r--sci-chemistry/chooch/Manifest22
-rw-r--r--sci-chemistry/chooch/chooch-5.0.2-r1.ebuild2
-rw-r--r--sci-chemistry/coot/ChangeLog5
-rw-r--r--sci-chemistry/coot/Manifest17
-rw-r--r--sci-chemistry/coot/coot-9999.ebuild48
-rw-r--r--sci-chemistry/coot/files/9999-clipper-config.patch17
-rw-r--r--sci-chemistry/coot/files/9999-mmdb-config.patch18
-rw-r--r--sci-chemistry/coot/files/9999-test.patch16
-rw-r--r--sci-chemistry/coot/metadata.xml8
-rw-r--r--sci-chemistry/drawxtl/Manifest10
-rw-r--r--sci-chemistry/drawxtl/drawxtl-44.ebuild2
-rw-r--r--sci-chemistry/drawxtl/drawxtl-54.ebuild2
-rw-r--r--sci-chemistry/gromacs/ChangeLog20
-rw-r--r--sci-chemistry/gromacs/Manifest22
-rw-r--r--sci-chemistry/gromacs/gromacs-4.5.9999.ebuild118
-rw-r--r--sci-chemistry/gromacs/gromacs-9999.ebuild7
-rw-r--r--sci-chemistry/gromacs/metadata.xml7
-rw-r--r--sci-chemistry/icm/ChangeLog3
-rw-r--r--sci-chemistry/icm/Manifest12
-rw-r--r--sci-chemistry/icm/metadata.xml14
-rw-r--r--sci-chemistry/jana2000/ChangeLog8
-rw-r--r--sci-chemistry/jana2000/Manifest12
-rw-r--r--sci-chemistry/jana2000/jana2000-20071218.ebuild27
-rw-r--r--sci-chemistry/jligand/ChangeLog6
-rw-r--r--sci-chemistry/jligand/Manifest18
-rw-r--r--sci-chemistry/jligand/jligand-0.1.ebuild40
-rw-r--r--sci-chemistry/jligand/jligand-1.0.19.ebuild (renamed from sci-chemistry/jligand/jligand-1.0.7.ebuild)4
-rw-r--r--sci-chemistry/jligand/metadata.xml8
-rw-r--r--sci-chemistry/jmol/Manifest32
-rw-r--r--sci-chemistry/jmol/files/12.0.45/jmol-manifest.patch (renamed from sci-chemistry/jmol/files/12.0.34/jmol-manifest.patch)0
-rw-r--r--sci-chemistry/jmol/files/12.0.45/jmol-nointl.patch (renamed from sci-chemistry/jmol/files/12.0.34/jmol-nointl.patch)0
-rw-r--r--sci-chemistry/jmol/files/jmol-11.6-manifest.patch96
-rw-r--r--sci-chemistry/jmol/files/jmol-11.6-nointl.patch274
-rw-r--r--sci-chemistry/jmol/jmol-11.6.ebuild119
-rw-r--r--sci-chemistry/jmol/jmol-12.0.45-r1.ebuild (renamed from sci-chemistry/jmol/jmol-12.0.34.ebuild)0
-rw-r--r--sci-chemistry/nmrpipe/ChangeLog7
-rw-r--r--sci-chemistry/nmrpipe/Manifest18
-rw-r--r--sci-chemistry/nmrpipe/files/5.91.2011.167.16.39-lib.patch (renamed from sci-chemistry/nmrpipe/files/5.91.2011.138.14.57-lib.patch)0
-rw-r--r--sci-chemistry/nmrpipe/nmrpipe-5.91.2011.167.16.39.ebuild (renamed from sci-chemistry/nmrpipe/nmrpipe-5.91.2011.138.14.57.ebuild)2
-rw-r--r--sci-chemistry/phaser/Manifest22
-rw-r--r--sci-chemistry/phaser/phaser-2.1.4-r1.ebuild2
-rw-r--r--sci-chemistry/phaser/phaser-2.1.4.ebuild2
-rw-r--r--sci-chemistry/pymol/Manifest8
-rw-r--r--sci-chemistry/pymol/pymol-9999.ebuild2
-rw-r--r--sci-chemistry/rosetta/Manifest11
-rw-r--r--sci-chemistry/rosetta/rosetta-3.0-r1.ebuild4
-rw-r--r--sci-chemistry/rosetta/rosetta-3.0.ebuild128
-rw-r--r--sci-chemistry/simpson/ChangeLog6
-rw-r--r--sci-chemistry/simpson/Manifest16
-rw-r--r--sci-chemistry/simpson/metadata.xml14
-rw-r--r--sci-chemistry/simpson/simpson-3.0.1.ebuild13
-rw-r--r--sci-chemistry/smmp/ChangeLog8
-rw-r--r--sci-chemistry/smmp/Manifest12
-rw-r--r--sci-chemistry/smmp/smmp-3.0.5.ebuild21
-rw-r--r--sci-chemistry/sparta+/ChangeLog8
-rw-r--r--sci-chemistry/sparta+/Manifest14
-rw-r--r--sci-chemistry/sparta+/sparta+-2.60.2011.167.16.39.ebuild (renamed from sci-chemistry/sparta+/sparta+-1.00.2010.0804.14.ebuild)8
-rw-r--r--sci-chemistry/votca-csg/ChangeLog3
-rw-r--r--sci-chemistry/votca-csg/Manifest14
-rw-r--r--sci-chemistry/votca-csg/votca-csg-9999.ebuild4
-rw-r--r--sci-electronics/player/Manifest10
-rw-r--r--sci-electronics/player/metadata.xml9
-rw-r--r--sci-electronics/player/player-2.0.4.ebuild2
-rw-r--r--sci-electronics/tnt/ChangeLog6
-rw-r--r--sci-electronics/tnt/Manifest20
-rw-r--r--sci-electronics/tnt/tnt-1.2.2.ebuild25
-rw-r--r--sci-geosciences/pydap_handlers_sql/ChangeLog6
-rw-r--r--sci-geosciences/pydap_handlers_sql/Manifest16
-rw-r--r--sci-geosciences/pydap_handlers_sql/metadata.xml12
-rw-r--r--sci-geosciences/pydap_handlers_sql/pydap_handlers_sql-0.1.0.ebuild13
-rw-r--r--sci-geosciences/qgis/Manifest12
-rw-r--r--sci-geosciences/qgis/qgis-9999.ebuild2
-rw-r--r--sci-geosciences/tcd-editor/ChangeLog8
-rw-r--r--sci-geosciences/tcd-editor/Manifest4
-rw-r--r--sci-geosciences/tcd-editor/tcd-editor-1.4.1.ebuild32
-rw-r--r--sci-libs/Cgraph/Cgraph-2.04.ebuild27
-rw-r--r--sci-libs/Cgraph/ChangeLog5
-rw-r--r--sci-libs/Cgraph/Manifest24
-rw-r--r--sci-libs/bigdft/ChangeLog7
-rw-r--r--sci-libs/bigdft/Manifest15
-rw-r--r--sci-libs/bigdft/bigdft-1.2.0.2.ebuild42
-rw-r--r--sci-libs/bigdft/metadata.xml (renamed from sci-geosciences/tcd-editor/metadata.xml)7
-rw-r--r--sci-libs/cgnsfoam/ChangeLog4
-rw-r--r--sci-libs/cgnsfoam/Manifest16
-rw-r--r--sci-libs/cgnsfoam/cgnsfoam-1732.ebuild12
-rw-r--r--sci-libs/cgnsfoam/metadata.xml2
-rw-r--r--sci-libs/cgnslib/ChangeLog6
-rw-r--r--sci-libs/cgnslib/Manifest14
-rw-r--r--sci-libs/cgnslib/cgnslib-2.5.4.ebuild28
-rw-r--r--sci-libs/cgnstools/Manifest12
-rw-r--r--sci-libs/cgnstools/cgnstools-2.5.4-r1.ebuild2
-rw-r--r--sci-libs/dcmtk/Manifest10
-rw-r--r--sci-libs/dcmtk/dcmtk-3.5.4-r3.ebuild2
-rw-r--r--sci-libs/dcmtk/dcmtk-3.5.5_pre20101008.ebuild2
-rw-r--r--sci-libs/etsf_io/ChangeLog11
-rw-r--r--sci-libs/etsf_io/Manifest17
-rw-r--r--sci-libs/etsf_io/etsf_io-1.0.3.ebuild32
-rw-r--r--sci-libs/etsf_io/metadata.xml (renamed from sci-biology/newbler/metadata.xml)5
-rw-r--r--sci-libs/fftw/ChangeLog8
-rw-r--r--sci-libs/fftw/Manifest12
-rw-r--r--sci-libs/fftw/fftw-3.3_alpha1.ebuild22
-rw-r--r--sci-libs/fgsl/ChangeLog14
-rw-r--r--sci-libs/fgsl/Manifest16
-rw-r--r--sci-libs/fgsl/fgsl-0.9.3.ebuild20
-rw-r--r--sci-libs/fgsl/fgsl-0.9.4.ebuild57
-rw-r--r--sci-libs/fox/ChangeLog7
-rw-r--r--sci-libs/fox/Manifest17
-rw-r--r--sci-libs/fox/fox-4.0.4.ebuild7
-rw-r--r--sci-libs/fox/fox-4.1.0.ebuild7
-rw-r--r--sci-libs/fox/metadata.xml15
-rw-r--r--sci-libs/ghmm/ChangeLog7
-rw-r--r--sci-libs/ghmm/Manifest13
-rw-r--r--sci-libs/ghmm/metadata.xml10
-rw-r--r--sci-libs/gmsh/ChangeLog8
-rw-r--r--sci-libs/gmsh/Manifest12
-rw-r--r--sci-libs/gmsh/gmsh-2.5.0.ebuild25
-rw-r--r--sci-libs/gmsh/gmsh-9999.ebuild73
-rw-r--r--sci-libs/hdf5/ChangeLog8
-rw-r--r--sci-libs/hdf5/Manifest14
-rw-r--r--sci-libs/hdf5/hdf5-1.8.4-r2.ebuild32
-rw-r--r--sci-libs/iml/Manifest12
-rw-r--r--sci-libs/iml/iml-1.0.3.ebuild2
-rw-r--r--sci-libs/libcmatrix/Manifest10
-rw-r--r--sci-libs/libcmatrix/libcmatrix-3.2.1.ebuild2
-rw-r--r--sci-libs/libfac/ChangeLog6
-rw-r--r--sci-libs/libfac/Manifest18
-rw-r--r--sci-libs/libfac/libfac-3.1.0.ebuild29
-rw-r--r--sci-libs/libfac/libfac-3.1.1.ebuild14
-rw-r--r--sci-libs/libfac/metadata.xml15
-rw-r--r--sci-libs/libxc/ChangeLog4
-rw-r--r--sci-libs/libxc/Manifest12
-rw-r--r--sci-libs/libxc/libxc-1.0.ebuild14
-rw-r--r--sci-libs/libxc/libxc-9999.ebuild14
-rw-r--r--sci-libs/lpsolve/Manifest22
-rw-r--r--sci-libs/lpsolve/lpsolve-5.5.2.0.ebuild2
-rw-r--r--sci-libs/matio/ChangeLog5
-rw-r--r--sci-libs/matio/Manifest14
-rw-r--r--sci-libs/matio/matio-1.3.4.ebuild4
-rw-r--r--sci-libs/modglue/Manifest8
-rw-r--r--sci-libs/modglue/modglue-1.16.ebuild2
-rw-r--r--sci-libs/nfft/Manifest10
-rw-r--r--sci-libs/nfft/nfft-3.1.3.ebuild2
-rw-r--r--sci-libs/omalloc/Manifest12
-rw-r--r--sci-libs/omalloc/omalloc-0.9.6.ebuild2
-rw-r--r--sci-libs/pagmo/ChangeLog11
-rw-r--r--sci-libs/pagmo/Manifest14
-rw-r--r--sci-libs/pagmo/metadata.xml12
-rw-r--r--sci-libs/pagmo/pagmo-9999.ebuild18
-rw-r--r--sci-libs/pfft/ChangeLog5
-rw-r--r--sci-libs/pfft/Manifest12
-rw-r--r--sci-libs/pfft/pfft-1.0_alpha1.ebuild24
-rw-r--r--sci-libs/votca-tools/ChangeLog3
-rw-r--r--sci-libs/votca-tools/Manifest14
-rw-r--r--sci-libs/votca-tools/votca-tools-9999.ebuild2
-rw-r--r--sci-libs/wannier90/ChangeLog4
-rw-r--r--sci-libs/wannier90/Manifest15
-rw-r--r--sci-libs/wannier90/metadata.xml8
-rw-r--r--sci-libs/wannier90/wannier90-1.2.ebuild23
-rw-r--r--sci-mathematics/acl2/ChangeLog5
-rw-r--r--sci-mathematics/acl2/Manifest15
-rw-r--r--sci-mathematics/acl2/acl2-4.2.ebuild10
-rw-r--r--sci-mathematics/algae/ChangeLog9
-rw-r--r--sci-mathematics/algae/Manifest16
-rw-r--r--sci-mathematics/algae/algae-4.3.6.ebuild73
-rw-r--r--sci-mathematics/algae/metadata.xml1
-rw-r--r--sci-mathematics/aribas/ChangeLog5
-rw-r--r--sci-mathematics/aribas/Manifest14
-rw-r--r--sci-mathematics/aribas/aribas-1.63.ebuild21
-rw-r--r--sci-mathematics/axiom/ChangeLog6
-rw-r--r--sci-mathematics/axiom/Manifest16
-rw-r--r--sci-mathematics/axiom/axiom-201009.ebuild12
-rw-r--r--sci-mathematics/axiom/metadata.xml2
-rw-r--r--sci-mathematics/cipi/ChangeLog8
-rw-r--r--sci-mathematics/cipi/Manifest16
-rw-r--r--sci-mathematics/cipi/cipi-1.0.ebuild24
-rw-r--r--sci-mathematics/cipi/metadata.xml12
-rw-r--r--sci-mathematics/flocq/ChangeLog3
-rw-r--r--sci-mathematics/flocq/Manifest14
-rw-r--r--sci-mathematics/flocq/flocq-1.4.0.ebuild15
-rw-r--r--sci-mathematics/freefem++/Manifest12
-rw-r--r--sci-mathematics/freefem++/freefem++-3.5.ebuild2
-rw-r--r--sci-mathematics/freefem++/freefem++-3.8.ebuild2
-rw-r--r--sci-mathematics/gambit/ChangeLog6
-rw-r--r--sci-mathematics/gambit/Manifest16
-rw-r--r--sci-mathematics/gambit/gambit-0.2010.09.01.ebuild44
-rw-r--r--sci-mathematics/gambit/metadata.xml16
-rw-r--r--sci-mathematics/gap/ChangeLog7
-rw-r--r--sci-mathematics/gap/Manifest16
-rw-r--r--sci-mathematics/gap/gap-4.4.12.ebuild30
-rw-r--r--sci-mathematics/gap/metadata.xml13
-rw-r--r--sci-mathematics/gappa/ChangeLog6
-rw-r--r--sci-mathematics/gappa/Manifest16
-rw-r--r--sci-mathematics/gappa/gappa-0.14.0.ebuild56
-rw-r--r--sci-mathematics/gappa/gappa-0.15.0.ebuild56
-rw-r--r--sci-mathematics/gappalib-coq/ChangeLog8
-rw-r--r--sci-mathematics/gappalib-coq/Manifest16
-rw-r--r--sci-mathematics/gappalib-coq/gappalib-coq-0.14.1.ebuild34
-rw-r--r--sci-mathematics/gappalib-coq/gappalib-coq-0.16.0.ebuild33
-rw-r--r--sci-mathematics/giac/ChangeLog5
-rw-r--r--sci-mathematics/giac/Manifest14
-rw-r--r--sci-mathematics/giac/giac-0.9.2.ebuild41
-rw-r--r--sci-mathematics/hypre/ChangeLog4
-rw-r--r--sci-mathematics/hypre/Manifest16
-rw-r--r--sci-mathematics/hypre/hypre-2.6.0b.ebuild2
-rw-r--r--sci-mathematics/hypre/hypre-2.7.0b.ebuild2
-rw-r--r--sci-mathematics/lattE-macchiato/Manifest20
-rw-r--r--sci-mathematics/lattE-macchiato/lattE-macchiato-0.9.3.ebuild2
-rw-r--r--sci-mathematics/netgen/Manifest8
-rw-r--r--sci-mathematics/netgen/netgen-4.9.13.ebuild4
-rw-r--r--sci-mathematics/normaliz/ChangeLog6
-rw-r--r--sci-mathematics/normaliz/Manifest16
-rw-r--r--sci-mathematics/normaliz/metadata.xml16
-rw-r--r--sci-mathematics/normaliz/normaliz-2.2.ebuild13
-rw-r--r--sci-mathematics/pest/ChangeLog5
-rw-r--r--sci-mathematics/pest/Manifest12
-rw-r--r--sci-mathematics/pest/pest-12.1.ebuild24
-rw-r--r--sci-mathematics/petsc/ChangeLog5
-rw-r--r--sci-mathematics/petsc/Manifest24
-rw-r--r--sci-mathematics/petsc/metadata.xml1
-rw-r--r--sci-mathematics/petsc/petsc-3.1_p4.ebuild6
-rw-r--r--sci-mathematics/petsc/petsc-3.1_p5-r2.ebuild6
-rw-r--r--sci-mathematics/petsc/petsc-3.1_p7.ebuild4
-rw-r--r--sci-mathematics/petsc/petsc-3.1_p8-r1.ebuild14
-rw-r--r--sci-mathematics/petsc/petsc-3.1_p8.ebuild4
-rw-r--r--sci-mathematics/pff/ChangeLog5
-rw-r--r--sci-mathematics/pff/Manifest14
-rw-r--r--sci-mathematics/pff/pff-8.2.1.2.ebuild18
-rw-r--r--sci-mathematics/scilab/ChangeLog4
-rw-r--r--sci-mathematics/scilab/Manifest8
-rw-r--r--sci-mathematics/scilab/files/scilab-5.3.2-scilib-fix.patch (renamed from sci-mathematics/scilab/files/scilib-5.3.2-scilib-fix.patch)0
-rw-r--r--sci-mathematics/scilab/scilab-5.2.1.ebuild4
-rw-r--r--sci-mathematics/scilab/scilab-5.3.2.ebuild6
-rw-r--r--sci-mathematics/why/ChangeLog3
-rw-r--r--sci-mathematics/why/Manifest14
-rw-r--r--sci-mathematics/why/why-2.29.ebuild46
-rw-r--r--sci-mathematics/yorick/Manifest12
-rw-r--r--sci-mathematics/yorick/yorick-2.1.06.ebuild2
-rw-r--r--sci-misc/emu/ChangeLog9
-rw-r--r--sci-misc/emu/Manifest4
-rw-r--r--sci-misc/emu/emu-1.10.ebuild60
-rw-r--r--sci-misc/emu/metadata.xml14
-rw-r--r--sci-misc/finomaton/ChangeLog5
-rw-r--r--sci-misc/finomaton/Manifest22
-rw-r--r--sci-misc/finomaton/finomaton-1.0.ebuild11
-rw-r--r--sci-misc/foma/ChangeLog4
-rw-r--r--sci-misc/foma/Manifest20
-rw-r--r--sci-misc/foma/foma-0.9.14_alpha.ebuild37
-rw-r--r--sci-misc/foma/foma-0.9.1_alpha.ebuild33
-rw-r--r--sci-misc/foma/foma-0.9.4_alpha.ebuild39
-rw-r--r--sci-misc/foma/metadata.xml8
-rw-r--r--sci-misc/hfst/ChangeLog4
-rw-r--r--sci-misc/hfst/Manifest16
-rw-r--r--sci-misc/hfst/hfst-2.2.ebuild15
-rw-r--r--sci-misc/hfst/hfst-3.0.2.ebuild26
-rw-r--r--sci-misc/jwnl/Manifest20
-rw-r--r--sci-misc/jwnl/jwnl-1.3_rc3.ebuild2
-rw-r--r--sci-misc/nco/.#Manifest.1.216
-rw-r--r--sci-misc/nco/Manifest2
-rw-r--r--sci-misc/nco/nco-4.0.7.ebuild6
-rw-r--r--sci-misc/nltk/ChangeLog8
-rw-r--r--sci-misc/nltk/Manifest29
-rw-r--r--sci-misc/nltk/metadata.xml10
-rw-r--r--sci-misc/nltk/nltk-2.0.1_rc1.ebuild (renamed from sci-misc/nltk/nltk-0.9.5.ebuild)24
-rw-r--r--sci-misc/openfst/Manifest16
-rw-r--r--sci-misc/openfst/openfst-1.2.7.ebuild2
-rw-r--r--sci-misc/opennlp-tools/ChangeLog6
-rw-r--r--sci-misc/opennlp-tools/Manifest16
-rw-r--r--sci-misc/opennlp-tools/metadata.xml13
-rw-r--r--sci-misc/opennlp-tools/opennlp-tools-1.3.0.ebuild13
-rw-r--r--sci-misc/praat/ChangeLog6
-rw-r--r--sci-misc/praat/Manifest22
-rw-r--r--sci-misc/praat/metadata.xml9
-rw-r--r--sci-misc/praat/praat-5.0.38.ebuild49
-rw-r--r--sci-misc/praat/praat-5.0.45.ebuild51
-rw-r--r--sci-misc/praat/praat-5.1.00.ebuild23
-rw-r--r--sci-misc/praat/praat-5.1.15.ebuild23
-rw-r--r--sci-misc/salome-med/Manifest10
-rw-r--r--sci-misc/salome-med/salome-med-5.1.3.ebuild2
-rw-r--r--sci-misc/salome-med/salome-med-5.1.4.ebuild2
-rw-r--r--sci-misc/sfst/ChangeLog4
-rw-r--r--sci-misc/sfst/Manifest26
-rw-r--r--sci-misc/sfst/metadata.xml12
-rw-r--r--sci-misc/sfst/sfst-1.1.ebuild75
-rw-r--r--sci-misc/sfst/sfst-1.2.ebuild77
-rw-r--r--sci-misc/sfst/sfst-1.3.ebuild78
-rw-r--r--sci-misc/sfst/sfst-1.4.2.ebuild41
-rw-r--r--sci-physics/abinit/ChangeLog19
-rw-r--r--sci-physics/abinit/Manifest8
-rw-r--r--sci-physics/abinit/abinit-6.6.3.ebuild24
-rw-r--r--sci-physics/abinit/abinit-6.8.1.ebuild (renamed from sci-physics/abinit/abinit-6.6.2.ebuild)66
-rw-r--r--sci-physics/atompaw/ChangeLog4
-rw-r--r--sci-physics/atompaw/Manifest15
-rw-r--r--sci-physics/atompaw/atompaw-3.0.1.ebuild22
-rw-r--r--sci-physics/atompaw/metadata.xml9
-rw-r--r--sci-physics/atompaw2abinit/ChangeLog4
-rw-r--r--sci-physics/atompaw2abinit/Manifest17
-rw-r--r--sci-physics/atompaw2abinit/atompaw2abinit-3.3.0.ebuild18
-rw-r--r--sci-physics/atompaw2abinit/metadata.xml8
-rw-r--r--sci-physics/espresso/ChangeLog7
-rw-r--r--sci-physics/espresso/Manifest20
-rw-r--r--sci-physics/espresso/espresso-9999.ebuild14
-rw-r--r--sci-physics/espresso/metadata.xml4
-rw-r--r--sci-physics/qcl/Manifest12
-rw-r--r--sci-physics/qcl/qcl-0.6.3-r1.ebuild2
-rw-r--r--sci-visualization/ferret-bin/Manifest12
-rw-r--r--sci-visualization/ferret-bin/ferret-bin-6.6.4.ebuild2
-rw-r--r--sci-visualization/gri/Manifest12
-rw-r--r--sci-visualization/gri/gri-2.12.22.ebuild2
-rw-r--r--sci-visualization/paraview/Manifest14
-rw-r--r--sci-visualization/paraview/paraview-3.10.1.ebuild4
-rw-r--r--sci-visualization/paraview/paraview-3.8.1.ebuild4
-rw-r--r--sci-visualization/v_sim/Manifest16
-rw-r--r--sci-visualization/v_sim/v_sim-3.5.1.ebuild2
-rw-r--r--sci-visualization/v_sim/v_sim-3.5.2.ebuild2
-rw-r--r--sci-visualization/v_sim/v_sim-3.6.0.ebuild2
-rw-r--r--sci-visualization/vtkPOFFReader/Manifest12
-rw-r--r--sci-visualization/vtkPOFFReader/vtkPOFFReader-300.ebuild2
-rw-r--r--sys-cluster/classads/ChangeLog5
-rw-r--r--sys-cluster/classads/Manifest14
-rw-r--r--sys-cluster/classads/metadata.xml10
-rw-r--r--sys-cluster/condor/Manifest16
-rw-r--r--sys-cluster/condor/condor-7.5.2.ebuild2
-rw-r--r--sys-cluster/condor/condor-7.5.4.ebuild2
-rw-r--r--sys-cluster/condor/metadata.xml22
-rw-r--r--sys-cluster/ganglia_jobmonarch/Manifest26
-rw-r--r--sys-cluster/ganglia_jobmonarch/files/job_monarch_link.sh64
-rw-r--r--sys-cluster/ganglia_jobmonarch/files/jobarchived.initd28
-rw-r--r--sys-cluster/ganglia_jobmonarch/files/jobmond.initd28
-rw-r--r--sys-cluster/ganglia_jobmonarch/ganglia_jobmonarch-0.3.1.ebuild76
-rw-r--r--sys-cluster/ganglia_jobmonarch/metadata.xml5
-rw-r--r--sys-cluster/mpe2/ChangeLog5
-rw-r--r--sys-cluster/mpe2/Manifest12
-rw-r--r--sys-cluster/mpe2/mpe2-1.0.6_p1.ebuild8
-rw-r--r--sys-cluster/mpich2/ChangeLog4
-rw-r--r--sys-cluster/mpich2/Manifest12
-rw-r--r--sys-cluster/mpich2/mpich2-1.2.1_p1-r2.ebuild5
-rw-r--r--sys-cluster/mpich2/mpich2-1.4_rc2-r1.ebuild5
-rw-r--r--sys-cluster/nullmpi/ChangeLog7
-rw-r--r--sys-cluster/nullmpi/Manifest18
-rw-r--r--sys-cluster/nullmpi/metadata.xml2
-rw-r--r--sys-cluster/nullmpi/nullmpi-0.7.ebuild7
-rw-r--r--sys-cluster/nullmpi/nullmpi-9999.ebuild17
-rw-r--r--sys-cluster/openmpi/ChangeLog3
-rw-r--r--sys-cluster/openmpi/Manifest10
-rw-r--r--sys-cluster/openmpi/openmpi-1.5.3.ebuild7
-rw-r--r--sys-cluster/scalasca/ChangeLog3
-rw-r--r--sys-cluster/scalasca/Manifest14
-rw-r--r--sys-cluster/scalasca/scalasca-1.3.3.ebuild2
-rw-r--r--sys-devel/spl/Manifest22
-rw-r--r--sys-devel/spl/spl-0.6.0_rc4.ebuild2
-rw-r--r--sys-devel/spl/spl-9999.ebuild2
-rw-r--r--sys-devel/ucpp/Manifest10
-rw-r--r--sys-devel/ucpp/ucpp-1.3.ebuild2
-rw-r--r--sys-fs/ocfs2-tools/ChangeLog11
-rw-r--r--sys-fs/ocfs2-tools/Manifest18
-rw-r--r--sys-fs/ocfs2-tools/files/INSTALL.GENTOO103
-rw-r--r--sys-fs/ocfs2-tools/files/gcc45-ftbfs.patch21
-rw-r--r--sys-fs/ocfs2-tools/files/ocfs2.conf20
-rw-r--r--sys-fs/ocfs2-tools/files/ocfs2.init7
-rw-r--r--sys-fs/ocfs2-tools/metadata.xml3
-rw-r--r--sys-fs/ocfs2-tools/ocfs2-tools-1.4.4.ebuild73
-rw-r--r--sys-fs/ocfs2-tools/ocfs2-tools-1.6.4.ebuild60
-rw-r--r--sys-fs/zfs/Manifest20
-rw-r--r--sys-fs/zfs/zfs-0.6.0_rc4.ebuild2
-rw-r--r--sys-infiniband/libsdp/ChangeLog6
-rw-r--r--sys-infiniband/libsdp/Manifest18
-rw-r--r--sys-infiniband/libsdp/libsdp-1.1.99-r1.ebuild14
-rw-r--r--sys-infiniband/libsdp/libsdp-1.1.99.ebuild15
-rw-r--r--sys-infiniband/libsdp/metadata.xml4
-rw-r--r--sys-infiniband/openib-diags/ChangeLog7
-rw-r--r--sys-infiniband/openib-diags/Manifest18
-rw-r--r--sys-infiniband/openib-diags/metadata.xml4
-rw-r--r--sys-infiniband/openib-diags/openib-diags-1.4.4_p20081207.ebuild20
-rw-r--r--sys-infiniband/openib-diags/openib-diags-1.4.4_p20090314.ebuild19
-rw-r--r--sys-infiniband/openib-drivers/Manifest16
-rw-r--r--sys-infiniband/openib-drivers/metadata.xml19
-rw-r--r--sys-infiniband/openib-drivers/openib-drivers-1.2.5.1.ebuild4
-rw-r--r--sys-infiniband/openib-drivers/openib-drivers-1.2.5.5.ebuild4
-rw-r--r--sys-infiniband/openib-files/Manifest16
-rw-r--r--sys-infiniband/openib-files/metadata.xml13
-rw-r--r--sys-infiniband/openib-files/openib-files-1.2.5.5.ebuild2
-rw-r--r--sys-infiniband/openib-files/openib-files-1.4.1.ebuild2
-rw-r--r--sys-infiniband/openib-files/openib-files-1.4.ebuild2
-rw-r--r--sys-infiniband/openib-mvapich2/ChangeLog12
-rw-r--r--sys-infiniband/openib-mvapich2/Manifest22
-rw-r--r--sys-infiniband/openib-mvapich2/metadata.xml10
-rw-r--r--sys-infiniband/openib-mvapich2/openib-mvapich2-0.9.5.ebuild31
-rw-r--r--sys-infiniband/openib-mvapich2/openib-mvapich2-0.9.6.ebuild31
-rw-r--r--sys-infiniband/openib-mvapich2/openib-mvapich2-1.0.1-r1.ebuild30
-rw-r--r--sys-infiniband/openib-mvapich2/openib-mvapich2-1.0.1.ebuild35
-rw-r--r--sys-infiniband/openib-mvapich2/openib-mvapich2-1.0.ebuild35
-rw-r--r--sys-infiniband/openib-osm/ChangeLog7
-rw-r--r--sys-infiniband/openib-osm/Manifest18
-rw-r--r--sys-infiniband/openib-osm/metadata.xml4
-rw-r--r--sys-infiniband/openib-osm/openib-osm-3.2.5_p20081207.ebuild17
-rw-r--r--sys-infiniband/openib-osm/openib-osm-3.2.6_p20090317.ebuild16
-rw-r--r--sys-infiniband/openib-perf/ChangeLog8
-rw-r--r--sys-infiniband/openib-perf/Manifest16
-rw-r--r--sys-infiniband/openib-perf/metadata.xml4
-rw-r--r--sys-infiniband/openib-perf/openib-perf-1.2.ebuild16
-rw-r--r--sys-infiniband/openib-srptools/ChangeLog6
-rw-r--r--sys-infiniband/openib-srptools/Manifest26
-rw-r--r--sys-infiniband/openib-srptools/metadata.xml4
-rw-r--r--sys-infiniband/openib-srptools/openib-srptools-1.1.ebuild26
-rw-r--r--sys-infiniband/openib-userspace/Manifest18
-rw-r--r--sys-infiniband/openib-userspace/metadata.xml15
-rw-r--r--sys-infiniband/openib-userspace/openib-userspace-1.2.5.1-r1.ebuild71
-rw-r--r--sys-infiniband/openib-userspace/openib-userspace-1.2.5.5.ebuild67
-rw-r--r--sys-infiniband/openib-userspace/openib-userspace-1.2.ebuild69
-rw-r--r--sys-infiniband/openib/Manifest16
-rw-r--r--sys-infiniband/openib/metadata.xml14
-rw-r--r--sys-infiniband/openib/openib-1.4.1.ebuild7
-rw-r--r--sys-infiniband/openib/openib-1.4.ebuild7
-rw-r--r--sys-kernel/cluster-sources/ChangeLog7
-rw-r--r--sys-kernel/cluster-sources/Manifest17
-rw-r--r--sys-kernel/cluster-sources/cluster-sources-2.6.39.ebuild35
-rw-r--r--sys-kernel/cluster-sources/metadata.xml9
-rw-r--r--x11-libs/xview/ChangeLog5
-rw-r--r--x11-libs/xview/Manifest12
-rw-r--r--x11-libs/xview/metadata.xml11
752 files changed, 10230 insertions, 18551 deletions
diff --git a/app-doc/gromacs-manual/ChangeLog b/app-doc/gromacs-manual/ChangeLog
index db0912d58..b9f148f17 100644
--- a/app-doc/gromacs-manual/ChangeLog
+++ b/app-doc/gromacs-manual/ChangeLog
@@ -1,7 +1,17 @@
# ChangeLog for app-doc/gromacs-manual
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 25 Jun 2011; Justin Lecher <jlec@gentoo.org> gromacs-manual-9999.ebuild:
+ Merged
+
+ 25 Jun 2011; Justin Lecher <jlec@gentoo.org> gromacs-manual-9999.ebuild:
+ Merged
+
+ 25 Jun 2011; Christoph Junghans <ottxor@gentoo.org>
+ gromacs-manual-9999.ebuild:
+ migrate to git-2
+
*gromacs-manual-9999 (26 Aug 2010)
26 Aug 2010; Christoph Junghans <kleiner_otti@gmx.de>
diff --git a/app-doc/gromacs-manual/Manifest b/app-doc/gromacs-manual/Manifest
index b36644647..768d401b7 100644
--- a/app-doc/gromacs-manual/Manifest
+++ b/app-doc/gromacs-manual/Manifest
@@ -1,17 +1,13 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
-EBUILD gromacs-manual-9999.ebuild 1164 RMD160 bf367bed939f5fee109781dee5db6642ddbc27db SHA1 b83ab80c568bc5bb7232bd21fa22e69602015aa5 SHA256 35ed9d0966a4273fdabf0ccb1a01fa0002aefca924a35ea54af795bb9ce9fec0
-MISC ChangeLog 279 RMD160 b790db407a33641064eeac7d30894f3398f31ed2 SHA1 85ff23743c7ea190900db5bd44b585507664c6cf SHA256 f977bc1ead52fce5bdf1c76fdd1dc965051d4e32eb6999ee3ed514550bbed043
-MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
+EBUILD gromacs-manual-9999.ebuild 1169 RMD160 0b3754c292104c1de63026d3a3aa74499f412adb SHA1 6f43ff72060eed4ef41f60df49e754abb912d86d SHA256 6f4b4761334a43297e7afb11510be82f6c4de37338a6ebe648354053c573e59a
+MISC ChangeLog 553 RMD160 9e7e760c4f49b2b1d4a68cd9278e7c43dd087948 SHA1 e8b60767a7483e3da163e003ee34a42cdd379e9f SHA256 23aa1d6f8f1179dd732b537645778b21214f8fbcd79fcd8964b42286062e6854
+MISC metadata.xml 167 RMD160 ea4003a55d6e2079381a540c441fc59cde29025a SHA1 3bc6dc4dd68f7de22828138e62aa117387b1765d SHA256 f313eeec4ebffac500b57a98a225e32c77489fc826a50494749b6cdeec28e3e8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQEcBAEBAgAGBQJNohTDAAoJEOeBhlrCAAWGTzoH/0EMOOmaVVqXT0mI4hTG6dKk
-Tz9Vh7rNsHPChbLF5OlXXNrXkM92HwvAOTl7iTnp1hevLDm/D7bzaEYQ4zJEAAue
-YxbD/5Do1JIrZ+WCbcgWSjMH9EX0uWtwi4eebXgkiT2l6U3D7UlwpOnVYhE1MT2c
-AeXVFs4igX+1iW/nda/4yLsh3UeyBVy8zKQe04+16JCO9QaUT8c1l6kdkXxGwnch
-n+5XW4Tt0OQ7JFy4IDQ41+V4JhoR+G+Ciu/48z/dqc4bOm85EL1cSNVb+DehUd+Y
-v9XG0t99BbCQJolC0t7GBSJb2WcTnCgh4oLJiqVejNLTLpz8YrDWixmj5bnwqZI=
-=lKq0
+iEYEAREIAAYFAk4GGJsACgkQgAnW8HDreRZkTwCfVhcxHDDiioFE1FlflkacpsNn
+fvkAnRWvGIShj784zIcWRkicjZ2mwPmS
+=3WPL
-----END PGP SIGNATURE-----
diff --git a/app-doc/gromacs-manual/gromacs-manual-9999.ebuild b/app-doc/gromacs-manual/gromacs-manual-9999.ebuild
index c5a593a8a..c9f988336 100644
--- a/app-doc/gromacs-manual/gromacs-manual-9999.ebuild
+++ b/app-doc/gromacs-manual/gromacs-manual-9999.ebuild
@@ -2,12 +2,12 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="4"
+EAPI=4
EGIT_REPO_URI="git://git.gromacs.org/manual"
EGIT_BRANCH="master"
-inherit cmake-utils git
+inherit cmake-utils git-2
DESCRIPTION="Manual for gromacs"
HOMEPAGE="http://www.gromacs.org/"
@@ -18,11 +18,11 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE=""
-DEPEND="=sci-chemistry/gromacs-${PV}
+DEPEND="
+ ~sci-chemistry/gromacs-${PV}
dev-texlive/texlive-latex
sys-apps/coreutils
app-shells/tcsh"
-
RDEPEND=""
src_prepare() {
@@ -30,7 +30,8 @@ src_prepare() {
progs=$(tr '\n' ' ' <${EROOT}usr/share/gromacs/programs.list) || die
sed -i "s/^\(PROGRAMS\).*/\1='${progs}'/" mkman || die
sed -i "s@^\(INSTALLED.*=\).*@\1${EROOT}usr/bin/g_options@" mkoptions || die
- sed -e "s!\${GMXSRC}/admin/\(programs.txt\)!${EROOT}usr/share/gromacs/\1!" \
+ sed \
+ -e "s!\${GMXSRC}/admin/\(programs.txt\)!${EROOT}usr/share/gromacs/\1!" \
-e "s!\${GMXSRC}/share/html!${EROOT}usr/share/doc/gromacs-${PV}/html!" \
-e "s!\${GMXBIN}!${EROOT}usr/bin!" \
-e '/FATAL_ERROR.*GMX\(SRC\|BIN\)/s/^/#/' \
diff --git a/app-doc/gromacs-manual/metadata.xml b/app-doc/gromacs-manual/metadata.xml
index 9ac9ffdb3..e42d0af60 100644
--- a/app-doc/gromacs-manual/metadata.xml
+++ b/app-doc/gromacs-manual/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sci-chemistry</herd>
+ <herd>sci-chemistry</herd>
</pkgmetadata>
diff --git a/app-portage/g-cran/ChangeLog b/app-portage/g-cran/ChangeLog
index c89825fb3..f3e33ea1d 100644
--- a/app-portage/g-cran/ChangeLog
+++ b/app-portage/g-cran/ChangeLog
@@ -1,7 +1,11 @@
# ChangeLog for app-portage/g-cran
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 25 Jun 2011; Justin Lecher <jlec@gentoo.org> g-cran-9999.ebuild,
+ metadata.xml:
+ migrate from 'git' to 'git-2'
+
15 Jul 2010; <auke@gentoo.org> g-cran-9999.ebuild:
Keyword g-cran-9999 to ~x86 and ~amd64
diff --git a/app-portage/g-cran/Manifest b/app-portage/g-cran/Manifest
index 2211405e1..fa8ecfb3a 100644
--- a/app-portage/g-cran/Manifest
+++ b/app-portage/g-cran/Manifest
@@ -1,3 +1,13 @@
-EBUILD g-cran-9999.ebuild 564 RMD160 f6c1ac3f4887bda5ff5fd38cacdcb01d019229a2 SHA1 6b80bf1c2763d0fda4a34d12111f879328ffe123 SHA256 988d569620ea51cee50010d59b46315e7e954ccb8ef03d5f832f325d4cfda4cc
-MISC ChangeLog 514 RMD160 597a213848bb9047118233051b757a3d54b3f56f SHA1 033598ca1f0dbcd6ab0ea362055fa8a2fadd70ef SHA256 f6780a08f7e346b384348a75ec7b234cb743c9ad77ecf478a23c733782c97875
-MISC metadata.xml 356 RMD160 9c435d833896f82b17f06b65017865182401d0b0 SHA1 5681e4a19a82e7a48a465db1977b4735dddf799d SHA256 eec0c880a0450c381ca309a460da3cb7ed51b1887e06fb03e4f0bd73f9212f9d
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+EBUILD g-cran-9999.ebuild 566 RMD160 858168a0046ae0677e949d84bd2e63e775d31f5b SHA1 3c14d8239cb3edd53eca2511c11abb310f08fa58 SHA256 a26ab20d3e0090cd420d69ed3eb214804ad09f841bd63a48e23d138810b10ca3
+MISC ChangeLog 630 RMD160 3d05b6b8a31c955484313002aed5083999568e23 SHA1 e6fc33b2b498e26fbdde99108f31e992f59c7663 SHA256 e008568b75ce4b30ddd846eaf3985d0fb7c86c6ac5ea521c43991ec780dfc76b
+MISC metadata.xml 358 RMD160 9c986cc6131f90cb348544c1cd32e867cc4d8247 SHA1 3be0736a7e1a470bf4970f691e7b9a8480f431dc SHA256 ec78fefe41faacca551b0f47a88f6639e66a8737921e39a2b28943536d51403e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREIAAYFAk4F6JcACgkQgAnW8HDreRYjYgCgnDvhovvm62hA4VcoQrF2jKjc
+1FUAn3lJpN2qjKlgB+SkfK/lfkpdMDK4
+=wi4I
+-----END PGP SIGNATURE-----
diff --git a/app-portage/g-cran/g-cran-9999.ebuild b/app-portage/g-cran/g-cran-9999.ebuild
index ca2395aa2..6635f0f57 100644
--- a/app-portage/g-cran/g-cran-9999.ebuild
+++ b/app-portage/g-cran/g-cran-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -8,7 +8,7 @@ PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="3.*"
-inherit distutils git
+inherit distutils git-2
DESCRIPTION="CRAN-style packages installer helper for package managers"
HOMEPAGE="http://git.overlays.gentoo.org/gitweb/?p=proj/g-cran.git;a=summary"
diff --git a/app-portage/g-cran/metadata.xml b/app-portage/g-cran/metadata.xml
index e79a1a6d3..4dd000045 100644
--- a/app-portage/g-cran/metadata.xml
+++ b/app-portage/g-cran/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+ <herd>sci</herd>
+ <longdescription lang="en">
G-CRAN helps package managers install R packages. It reads CRAN-style
repositories and translates it into something most package managers
can work with.
diff --git a/app-text/dgs/ChangeLog b/app-text/dgs/ChangeLog
index 45623d1fd..8c121ba2f 100644
--- a/app-text/dgs/ChangeLog
+++ b/app-text/dgs/ChangeLog
@@ -1,7 +1,10 @@
# ChangeLog for app-text/dgs
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/app-text/dgs/ChangeLog,v 1.30 2008/03/18 13:24:47 flameeyes Exp $
+ 24 Jun 2011; Justin Lecher <jlec@gentoo.org> dgs-0.5.10-r2.ebuild:
+ Sort inherit and/or USE
+
23 Jun 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
dgs-0.5.10-r2.ebuild:
Added note: upstream is dead
diff --git a/app-text/dgs/Manifest b/app-text/dgs/Manifest
index fb3ba9e04..e53116436 100644
--- a/app-text/dgs/Manifest
+++ b/app-text/dgs/Manifest
@@ -7,23 +7,13 @@ AUX dgs-0.5.10-gs-time_.h-gentoo.diff 415 RMD160 42b4b923d1ddc5bc301d7df0a5c75e0
AUX dgs-0.5.10-tcpd-gentoo.diff 939 RMD160 739b5d1954b5f95c8c38d0be3acf0f24a0d4bbd7 SHA1 4e528983004d09da387b17e607630b18d2868977 SHA256 82ef1fff0d799f398965047ff5556af7cac651317ede40e493fbd382aaf65185
AUX dgs-fix-as-needed.patch 519 RMD160 6b4d0d2b567b823580317ba582a8a5c7c6438401 SHA1 bdd91fe03f48a5840ea5d0794c6c37cf187b1665 SHA256 db0a15aa1a92e9b8f53072a480f42d7b6a366b73977314344f3f6246eb4b3516
DIST dgs-0.5.10.tar.gz 3572504 RMD160 4538e098ad4fab1ff4e1f483838fd3dd9515cd5c SHA1 94c35dbbf596dd35d47205cdde628457d95df084 SHA256 b01f21609241414fe92d8838e63150bfd7359d74ce05dfa38d2798e9d0f8a0ff
-EBUILD dgs-0.5.10-r2.ebuild 1453 RMD160 5b8effc51723e933392775b5e3465e8dd6af6a90 SHA1 68b71604d724402dc8ba04ed5f4732cbca105d98 SHA256 91eaeaf246a06f909f8305d5019973c1c5dfcfc88f9229d9614a22644f8667f5
-MISC ChangeLog 2682 RMD160 b178b0caa53e11e24399b2540203063d84a0d1d6 SHA1 dd53592ccbc96a4e0a14dd37b90ee5c6d1a1132f SHA256 7836f41289bcff914905f8052fe7543456cf1ad99bb92583fb55d3faac94a9d1
+EBUILD dgs-0.5.10-r2.ebuild 1453 RMD160 7ebbdd9654c4d3b13be8a9be50aa8314fa3d3eca SHA1 db8a39efea46cb064a7e524af326a50c68a028d3 SHA256 b1f59fc2111bff17a1adeac0ec4a21fd078bb460aea7f0cc97c313683c871c87
+MISC ChangeLog 2778 RMD160 e69f3feb70adaae0c28a101f188a88f3b7cf1f16 SHA1 e27ffb6b00d65396d33f6688e6edc1500b7cc284 SHA256 4d3e1d48206ca57ee2082262bdb8f9f83f061e3fdd3d4566274665bdf856704a
MISC metadata.xml 215 RMD160 bc9c07aa91f2f175542244e4e4522a73558210a1 SHA1 facb283386de1c0b6b938cdcd4dde04d1694298b SHA256 13f32353652adbd3d934d41381cfc2cacc9e1127c508cebc73806cc1026ee80c
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBAgAGBQJMIkzPAAoJENwGBM22xffegq8P/Rcb/2DCXVztfrTC+4tr+ULC
-K4/jqg5NaCB1FrE3RIxdq4u004PKmCpc7o2FeyMC95io7CCLVaFn6Ci91oKwt4w7
-wLJgp9LrF30G3L1UdcEcYV0OUbeOxAn9Ld1HFWd15ZecxvjJWHVRao/ctmN+0L4K
-SHheT18erNJ9SmICFQS4ZD+MLg/rosoMbwrZN6uYxOsjNJR1OJL9eLYwlKmAJvhd
-GRcNq+F+mlg1xCiUPDla5HOwXdYvzdLCkpcA3ZUJSwFexdIkVFAFuUhF8lvaWgQa
-mRLa3NB1X8uzrGJvrmjaoz4OiHofLc+rIMnMcGAFp+x6abzXDVpBx19W7UdbrIHn
-Irc/G5pSyzKuYM1AhAAn/PcjL3eJKDMHslli4+VRUwFtvXjuFDn5fuyaEQZcB+SR
-MmEMwUBBK3kzbOpi9YZOVhgB7p+0vStMJ8/sVpGh1N22Bm2d2Co0W1VAIThJasNl
-8Q6miL2gh/DkRCvc9hsTF3e5YS89hEThCR7PLJxgHG01ixO1adezdU/RF2PCEGnb
-LS56JuClJsijLeUYoYCWv5DzQ0ISZBQMyMbJp8njzlpA0FAoXWCj9HQztqp7sPoR
-CDzo6+hs3Fe/mFcBWKzlewhiYvvdFgh+/P1VPZ98NaXtMR5UIYXSVj53bz0XU7C9
-yRw0507EKXxaz/EmBtkQ
-=znet
+iEYEARECAAYFAk4Efc8ACgkQgAnW8HDreRZPawCglxcy//i7QLxv/QszT1yOutj+
+fBoAn2RfVeLVkuJA4ivkVTv7OnsKWAD/
+=PmKw
-----END PGP SIGNATURE-----
diff --git a/app-text/dgs/dgs-0.5.10-r2.ebuild b/app-text/dgs/dgs-0.5.10-r2.ebuild
index c9d923e88..f079fc4d9 100644
--- a/app-text/dgs/dgs-0.5.10-r2.ebuild
+++ b/app-text/dgs/dgs-0.5.10-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/dgs/dgs-0.5.10-r1.ebuild,v 1.38 2008/03/18 13:24:47 flameeyes Exp $
@@ -8,7 +8,7 @@ EAPI=2
WANT_AUTOCONF="2.1"
-inherit eutils autotools
+inherit autotools eutils
DESCRIPTION="A Ghostscript based Display Postscript (DPS) server"
HOMEPAGE="http://www.gnustep.org/developers/DGS.html"
diff --git a/app-vim/freefem++-syntax/ChangeLog b/app-vim/freefem++-syntax/ChangeLog
index 5e30ba21f..03150fbc0 100644
--- a/app-vim/freefem++-syntax/ChangeLog
+++ b/app-vim/freefem++-syntax/ChangeLog
@@ -1,7 +1,10 @@
# ChangeLog for app-vim/freefem++-syntax
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 25 Jun 2011; Justin Lecher <jlec@gentoo.org> metadata.xml:
+ Fixed herd entry in metadata.xml
+
23 Jun 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
freefem++-syntax-20081108-r1.ebuild:
QA fixes
diff --git a/app-vim/freefem++-syntax/Manifest b/app-vim/freefem++-syntax/Manifest
index 1ac39e8a4..c6c44cbaa 100644
--- a/app-vim/freefem++-syntax/Manifest
+++ b/app-vim/freefem++-syntax/Manifest
@@ -3,22 +3,12 @@ Hash: SHA1
DIST freefem++-syntax-20081108.tar.gz 1108 RMD160 02c947dae0495de4b2ad1a49d7bdee8d2f4f21c0 SHA1 d0c718a41623d5b5897e97deed2acb5fa35b06a9 SHA256 1bad9e9150ca754695669dbc892c14a678062353a59ce648cc9a35650f014eff
EBUILD freefem++-syntax-20081108-r1.ebuild 547 RMD160 43f1d75e2801de6d6557a4e25961f642a26e1dab SHA1 d1b68487f6dcd01abdb57dd4c7604d65d6e6656f SHA256 b7fde0b1f507bb1a0d1c50561b285a10ea5bcecdb5b8499a34909833f9912a16
-MISC ChangeLog 839 RMD160 85bd12f154d267569cb91851cbe7834964637977 SHA1 20cca2574d273723d8231a300f719c20d47c15b2 SHA256 f89747e9ccca306524982f07cd5cf4849cae9453cafdf19df5c02546c9662fd9
-MISC metadata.xml 294 RMD160 f0861f754064bfe5d6c1cb33cda3ec243bfa9770 SHA1 8d1e56c9fd1873f3800a816c320746bdc40d93d4 SHA256 9ae00119576875f3047da60f0502a37671d41a155bd152a204949836db51ef27
+MISC ChangeLog 936 RMD160 90b993746fbce21b6464f54c782a4cb338ce268a SHA1 da53232d619e77cfdf0edc342bfd2562bdf3f82a SHA256 c7d0eab694e73909717a425fe7a98649ab23de2b0221f914953b2b50a16252ca
+MISC metadata.xml 298 RMD160 82724d2d1b72298c83a8f71bdba84914a90d378c SHA1 963ef7a56a9e3d304d4e617ce3b3d42095c0e677 SHA256 4218c0e1fc03bd83faa7347bb81d9c0501d0872376a457c80e1216b2a37ba7e7
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBAgAGBQJMIk13AAoJENwGBM22xffeIoEQAJ000WfJgStb+Q7GJEobHnDs
-cNZu7tGR4ebd3vBYEv8oD5IQFUjoH59qgirkBwt7jjePjf4lCm6mNjUl1lt1lJJX
-GvW83bhFzC+qltvPm7J/CQ19QKG3XPUG0Gv1MAQYlYs1PSRExcKFebWaU5h65+aj
-Jzv1hv92NJ7pkf6vDRJ0eXM9mKaqrQBIXAlp75kQrBjEcIKEPY0vY+3evy/arh5x
-hfUXK1bB+/ihaAe7pBSBH4Xb4w813ahBkWd8VbYtc/oRNTVZAKTl7Zm7r+vXQQz7
-432ZfKm/1NON+odg/4Z3fQ6zo103ts1u5MWNt28XB0neg/tGgW8D+6770cb8nLgO
-uw64EPoWa0xcYKfI1lsFKTHkiK6czkSVXTgqjyRW0d9GA5ckfVJHjqJdfw1l8fbT
-BVSYpk+IbP/8tEpho6Kpvz2hlsM6m5nJt46gZnqu49rJPD34P9nQ83TWEiOQ5oT0
-NU+CeTLmsQt2hn3lFZosvMhUXbdA0Ixi1S9CMFeLH98VUs4JRpaN9qtRkXvLpwuI
-ZjGNY+bleX2J5L9QYK6w1P+L0JPlk9aeru1fOSbCyLE3YP1T5TD1Jb6gsqdFl6Bi
-Y8zR/K/ogxQ1WcFWOUwrMobw5uBrpz87nWbk7HQdOMrlzueNhAI3j3twR0C7BRiM
-L+f7WKxOAwVoaQZY4Dht
-=MXHX
+iEYEARECAAYFAk4FjooACgkQgAnW8HDreRa7eACfUfRDqIJHhbASyn/IDWP4OubM
+DbEAn35gHjHaeQc6tga/Jho2YGxNnfJY
+=TFBs
-----END PGP SIGNATURE-----
diff --git a/app-vim/freefem++-syntax/metadata.xml b/app-vim/freefem++-syntax/metadata.xml
index af9a10c4e..2dbae84da 100644
--- a/app-vim/freefem++-syntax/metadata.xml
+++ b/app-vim/freefem++-syntax/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>app-vim</herd>
-<longdescription lang="en">
+ <herd>no-herd</herd>
+ <longdescription lang="en">
VIM syntax plugin which provides syntax highlighting for the freefem++
script files.
</longdescription>
diff --git a/dev-cpp/growler-link/ChangeLog b/dev-cpp/growler-link/ChangeLog
index c719e0bc9..a9c6f4299 100644
--- a/dev-cpp/growler-link/ChangeLog
+++ b/dev-cpp/growler-link/ChangeLog
@@ -1,7 +1,16 @@
# ChangeLog for dev-cpp/growler-link
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 24 Jun 2011; Justin Lecher <jlec@gentoo.org> growler-link-0.3.7.ebuild:
+ Sort inherit and/or USE
+
+ 23 Jun 2011; Justin Lecher <jlec@gentoo.org> growler-link-0.3.7.ebuild:
+ Streamlined fortran-2 eclass usage
+
+ 21 Jun 2011; Justin Lecher <jlec@gentoo.org> growler-link-0.3.7.ebuild:
+ Added fortran-2.eclass support
+
23 Jun 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
growler-link-0.3.7.ebuild:
QA fixes
diff --git a/dev-cpp/growler-link/Manifest b/dev-cpp/growler-link/Manifest
index 8084b27e8..ce153229e 100644
--- a/dev-cpp/growler-link/Manifest
+++ b/dev-cpp/growler-link/Manifest
@@ -3,23 +3,13 @@ Hash: SHA1
AUX 0.3.7-gcc4.patch 746 RMD160 45ddd21f4a258a0d8561a6a23686c39a294613c2 SHA1 c23af38c7d74fca88916e4661791a0e3530cb771 SHA256 bcd19b7855eb0da6eec9e468c6172ff82db419208508e24268d1408d40729c65
DIST growler-link-0.3.7.tar.gz 548768 RMD160 38153300e2ea8375116804ffe3823e0fabd3a831 SHA1 9384b97e7d9010d4a85c8cfbc26f71f312520943 SHA256 eec2e6f91146bc68004114adc7ee00617eab4b459649029cfcdcfc4db3d17719
-EBUILD growler-link-0.3.7.ebuild 818 RMD160 d1c7bcd60e3f9bbafb92b29c439ef5274a432ea3 SHA1 92518ac1d947973bffab2955f134cd86be0def3d SHA256 cd8aa907e52df76adfe836bfeb5ac68576d961efa11c11c31eb647ee1e9695b0
-MISC ChangeLog 601 RMD160 cc3619f6ec31c6fc39805e2a900700587d5f6b96 SHA1 ea9462b2bbdd72fe1d29b36b115d46bad3869688 SHA256 851380c82083d0cd6f3410dfd50ce3f085e282da8cd7fa90eb347376d50f4d8f
+EBUILD growler-link-0.3.7.ebuild 751 RMD160 c00d2e8fc74bba7a92b819effb953cc2d13dacff SHA1 bcd67a02123c736682eb6c4efaabb6dbcca41e9a SHA256 c503b16442f83f6779fb3a00f6592aea5a01db84bd5a12a16674e374c428783c
+MISC ChangeLog 922 RMD160 5f48e661d05f2d66ab1e147380ae28c034e58081 SHA1 a2eba5c6cc9dbac05ce86451a1d837d48fd56db1 SHA256 2bc63bb17acc61f500123e0e078e8e112119db6b1b314dee869944038aa2de23
MISC metadata.xml 481 RMD160 be4b7a9b4472d0c3861813d9f8f3097a00e9577e SHA1 ea067e55e4948b6015acc9c08e3df412ea2c0b12 SHA256 79b99b68b79b06620061d066e89197fff4f24f8b6c8a559bca2d0b6c20752e24
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBAgAGBQJMIk6jAAoJENwGBM22xffeZR4P/iBdHm3aecLb7YYZTJqSysMJ
-84KvjbP2dlkTI5mTOnrFQWmc8+ftKIg6Vk+k0vSgJ+nNEqFQZeLdNIQFRkLM2xkY
-/Oaqk9WWGGOu68PH4o0jGCF+Pr46rAu9CU/DIXE7vOw97arGIw999x/a5wcnvoYf
-ZxIbQRQPyE6D/7rTbEtUYgD5LPNAwrN5sqxjzm58BrKcPShkUaipYyCdKd6xwcjF
-07p8ZbwKmufmLUmHUstdR6ezTW+OpGhjOgjoSdtaPwAX3O3GZjaZj0w2iibSRRB6
-Ey0eJWEq4s2pK8KddAsBTRHKk1F+NzMyL/ZXl7gGdiQRTUY4HMXy39/DMRTSDe7g
-e8PoDSQ41gOJudTr4EIba4JtGnIMHxwTAVT/h6bTmCDpMRwN21gt6FDVVidcCo8S
-BdzcJMF9+i2LCI6PT8Mi7+Upjtqc+EfI2O3UhLjZbFssfZG98vWF97cMrSfOl8BR
-NB1KN0AaQvGs7mRbxvLZWUPJWsjhmb+QfgWWiCqAN3zG0LA/S34p6oFXSvrh2GMm
-+fefF5nPWBHDY7uzFm9r26XBy4CeA6Rmi96bSGl7iMg8zpUMwdi3VqUw/PuNuNfJ
-rluuRp/CRtydwS+8zjtU8HLPzhiW27KSr27m3c0k4bBFUHXWse/ah4dLhlSALnK9
-jZHOvzLexceRTtBMRq9b
-=Ef4P
+iEYEARECAAYFAk4EfjcACgkQgAnW8HDreRbhFQCeOS9DWr29E7PA/laS3gMZ31zr
+GS0An3p3Gi4cMQ3Afbk3U5T5hFHKL2xZ
+=1Kd2
-----END PGP SIGNATURE-----
diff --git a/dev-cpp/growler-link/growler-link-0.3.7.ebuild b/dev-cpp/growler-link/growler-link-0.3.7.ebuild
index aba9ccccd..fcca83ffb 100644
--- a/dev-cpp/growler-link/growler-link-0.3.7.ebuild
+++ b/dev-cpp/growler-link/growler-link-0.3.7.ebuild
@@ -1,25 +1,31 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="3"
+EAPI=4
-inherit eutils
+inherit eutils fortran-2
-DESCRIPTION="Growler-Link: the lowest-level Growler library."
+DESCRIPTION="The lowest-level Growler library"
HOMEPAGE="http://www.nas.nasa.gov/~bgreen/growler/"
SRC_URI="${HOMEPAGE}/downloads/growler-link-${PV}.tar.gz"
SLOT="0"
LICENSE="NOSA"
KEYWORDS="~amd64 ~x86"
-IUSE="doc tcpd static fortran"
+IUSE="doc fortran static tcpd"
-RDEPEND=">=dev-libs/boost-1.33.1
- tcpd? ( sys-apps/tcp-wrappers )"
+RDEPEND="
+ virtual/fortran
+ dev-libs/boost
+ tcpd? ( sys-apps/tcp-wrappers )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )"
+pkg_setup() {
+ use fortran && fortran-2_pkg_setup
+}
+
src_prepare() {
epatch "${FILESDIR}"/${PV}-gcc4.patch
}
@@ -31,8 +37,3 @@ src_configure() {
$(use_enable static) \
$(use_enable fortran)
}
-
-src_install() {
- emake DESTDIR="${D}" install || die "install failed"
- dodoc README NEWS AUTHORS NOSA ChangeLog || die
-}
diff --git a/dev-java/jgraphx/ChangeLog b/dev-java/jgraphx/ChangeLog
index db63fbc87..6cc153d72 100644
--- a/dev-java/jgraphx/ChangeLog
+++ b/dev-java/jgraphx/ChangeLog
@@ -1,7 +1,13 @@
# ChangeLog for dev-java/jgraphx
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*jgraphx-1.4.1.0 (30 Jun 2011)
+
+ 30 Jun 2011; Guillaume Horel <guillaume.horel@gmail.com>
+ +jgraphx-1.4.1.0.ebuild:
+ Version 1.4.1.0 is specifically required by scilab
+
*jgraphx-1.4.1.2 (06 Oct 2010)
06 Oct 2010; Thomas Kahle <tom111@gmx.de> +jgraphx-1.4.1.2.ebuild:
diff --git a/dev-java/jgraphx/jgraphx-1.4.1.0.ebuild b/dev-java/jgraphx/jgraphx-1.4.1.0.ebuild
new file mode 100644
index 000000000..5813fb713
--- /dev/null
+++ b/dev-java/jgraphx/jgraphx-1.4.1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+JAVA_PKG_IUSE="doc source"
+EAPI=2
+inherit java-pkg-2 java-ant-2 versionator
+
+MY_PV=$(replace_all_version_separators '_')
+
+DESCRIPTION="Open-source graph component for Java"
+SRC_URI="http://www.jgraph.com/downloads/jgraphx/archive/${PN}-${MY_PV}.zip\
+ -> ${P}.zip"
+HOMEPAGE="http://www.jgraph.com"
+IUSE="doc examples source"
+DEPEND=">=virtual/jdk-1.5
+ app-arch/unzip"
+RDEPEND=">=virtual/jre-1.5"
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+ # don't do javadoc always
+ sed -i \
+ -e 's/depends="doc"/depends="compile"/' \
+ build.xml || die "sed failed"
+ rm -rf doc/api lib/jgraphx.jar || die
+}
+
+EANT_BUILD_TARGET="build"
+EANT_DOC_TARGET="doc"
+
+src_install() {
+ java-pkg_dojar lib/${PN}.jar
+
+ use doc && java-pkg_dojavadoc docs/api
+ use source && java-pkg_dosrc src/org
+ use examples && java-pkg_doexamples examples
+}
diff --git a/dev-lang/aldor/ChangeLog b/dev-lang/aldor/ChangeLog
deleted file mode 100644
index 5e3c7005c..000000000
--- a/dev-lang/aldor/ChangeLog
+++ /dev/null
@@ -1,22 +0,0 @@
-# ChangeLog for sci-mathematics/yorick
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*aldor-1.1.0 (09 Oct 2007)
-
- 09 Oct 2007; Andrey Grozin <A.G.Grozin@inp.nsk.su>
- +aldor-1.1.0.ebuild +files/aldor-1.1.0.patch
- -aldor-1.0.3.ebuild -aldor-1.1.0_rc.ebuild:
- The first opensource release!
-
-*aldor-1.1.0_rc (20 Apr 2007)
-
- 20 Apr 2007; Andrey Grozin <A.G.Grozin@inp.nsk.su>
- +aldor-1.1.0_rc.ebuild:
- Version bump
-
-*aldor-1.0.3 (15 Feb 2007)
-
- 15 Feb 2007; Andrey Grozin <A.G.Grozin@inp.nsk.su>
- +metadata.xml, +aldor-1.0.3.ebuild:
- Initial import, bug 131590
diff --git a/dev-lang/aldor/Manifest b/dev-lang/aldor/Manifest
deleted file mode 100644
index 30b3b1e69..000000000
--- a/dev-lang/aldor/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX aldor-1.1.0.patch 837 RMD160 e43ce6c6e17c43bc2a8223e85dcaed70c3a482fb SHA1 0daa89ff91aac843c95f864636534e9eb29f0014 SHA256 dee4048e8fc96d2a675bbedb17998210c4b1cb95035e0d4beaabd1af8038e7e0
-DIST aldor.el.nw 51482 RMD160 8b785abf23ea5cd1107d1a05b187723f81b04559 SHA1 628ff6f36d720e4a32d72125d3559e4da498f750 SHA256 c6c80e1fd32b36555fe3d90e9cadb48795907514129b6c23406f720db18bd43e
-DIST aldorug.pdf.gz 767850 RMD160 7b2f9496b303caee0642ea74e58524699b122f19 SHA1 02e89472a34fe974900a529c644c093c55452793 SHA256 dec98eed7c9065c9233d2eb3e30e5dc98a2128709d541f7b626d086979b80c3a
-DIST algebra.html.tar.gz 749742 RMD160 9b0d1d2a7d7cda047a911ee9d2f1a23d21ed6b76 SHA1 8cf0853897947b7f073ff62efda6b14ec8edf7f2 SHA256 b4e38a1d36e4f4661df0314da43aa09846e6c62156ac4243bcb051dcc829e33f
-DIST libaldor.pdf.gz 434487 RMD160 c7d7130eca8d820a291786f11288deefbe1a672e SHA1 e231e2171b5906ba0812508d548c759f235625b5 SHA256 57371d1bd6031c350783e063533ba9ba1d82e681dca54fa3b4de42a339c9a668
-DIST tutorial.pdf.gz 164786 RMD160 1ceea46bd6a7b22003ff06842d656b0d57d011bf SHA1 62a4d224a60b6abc1fc8d49ac0f2a41860f001da SHA256 a0339b7c59632c8825e26603330b5a4010aeeb843ddad06c6b54d029519c7e65
-EBUILD aldor-1.1.0.ebuild 2172 RMD160 739e225b613bb15c37fb8563a8be1f3f5c38024a SHA1 abca520ba78b3c3598a570699f362eee28cc864a SHA256 dc91e28b137a6fef5c52d62f17f48562d909f679f6580e5f84b4f64467876277
-MISC ChangeLog 604 RMD160 0e82b957c36f50bc4f1ea826dc11b9507f9e3fc3 SHA1 3f1237a0ad448efa3d3324eaa19f1f1567732074 SHA256 c1874a2da1126c705e8a31098c6c7c12bec8c2f101bd35a353fafe770bc3db15
-MISC metadata.xml 811 RMD160 f7b329f9abd26f80f54235f2ad214bd4d8fd6d92 SHA1 e95d400caa56b900562d16d943ab8da837c281ed SHA256 005c18ae92ac4022daa3da7381a2eb712c28b6444f853c1a889cbc4750d8f9ef
diff --git a/dev-lang/aldor/aldor-1.1.0.ebuild b/dev-lang/aldor/aldor-1.1.0.ebuild
deleted file mode 100644
index ecadbc975..000000000
--- a/dev-lang/aldor/aldor-1.1.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-inherit subversion elisp-common
-
-DESCRIPTION="Aldor - programming language with a two-level type system"
-HOMEPAGE="http://www.aldor.org/"
-LICENSE="aldor-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="doc emacs"
-RDEPEND="emacs? ( virtual/emacs )"
-DEPEND="${RDEPEND}
- dev-util/byacc
- emacs? ( app-text/noweb doc? ( virtual/tetex ) )"
-ESVN_REPO_URI="https://aquarium.aldor.csd.uwo.ca/svn/trunk"
-SRC_URI="doc? ( http://aldor.org/docs/aldorug.pdf.gz
- http://aldor.org/docs/libaldor.pdf.gz
- http://aldor.org/docs/tutorial.pdf.gz
- ftp://ftp-sop.inria.fr/cafe/software/algebra/algebra.html.tar.gz )
- emacs? ( http://www.risc.uni-linz.ac.at/people/hemmecke/aldor/aldor.el.nw )"
-
-src_compile() {
- if use emacs; then
- einfo "The aldor emacs mode"
- notangle "${DISTDIR}/aldor.el.nw" > aldor.el
- notangle -Rinit.el "${DISTDIR}/aldor.el.nw" | \
- sed -e '1s/^.*$/;; aldor mode/' > 64aldor-gentoo.el
- if use doc; then
- einfo "Documentation for the aldor emacs mode"
- noweave "${DISTDIR}/aldor.el.nw" > aldor-mode.tex
- pdflatex aldor-mode.tex
- pdflatex aldor-mode.tex
- fi
- fi
- if use doc; then
- einfo "Documentation"
- cp "${DISTDIR}/aldorug.pdf.gz" .
- cp "${DISTDIR}/libaldor.pdf.gz" .
- cp "${DISTDIR}/tutorial.pdf.gz" .
- gunzip aldorug.pdf.gz libaldor.pdf.gz tutorial.pdf.gz
- tar xzf "${DISTDIR}/algebra.html.tar.gz"
- fi
- cd "${PN}"
- einfo "Compiling aldor and its libraries"
- epatch "${FILESDIR}/${P}.patch"
- emake distrib
-}
-
-src_install() {
- cat > 64aldor <<EOF
-ALDORROOT=/opt/${PN}/linux/${PV}
-PATH=/opt/${PN}/linux/${PV}/bin
-EOF
- doenvd 64aldor
- if use doc; then
- einfo "Installing the aldor documentation"
- insinto "/usr/share/doc/${P}"
- doins *.pdf
- doins -r algebra.html
- fi
- if use emacs; then
- einfo "Installing the aldor emacs mode"
- elisp-site-file-install aldor.el
- elisp-site-file-install 64aldor-gentoo.el
- fi
- einfo "Installing aldor and its libraries"
- cd "${PN}/install"
- dodir /opt
- cp -a "${PN}" "${D}opt/"
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_prerm() {
- [ -f "${SITELISP}/site-gentoo.el" ] && elisp-site-regen
-}
diff --git a/dev-lang/aldor/files/aldor-1.1.0.patch b/dev-lang/aldor/files/aldor-1.1.0.patch
deleted file mode 100644
index e1807e44e..000000000
--- a/dev-lang/aldor/files/aldor-1.1.0.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- Makefile.globals.orig 2007-09-30 22:59:31.000000000 +0700
-+++ Makefile.globals 2007-09-30 22:57:27.000000000 +0700
-@@ -21,5 +21,5 @@
- #
- SHELL=/bin/bash
--ALDOR_PROJECT=d:\projects\aldor\aldorsvn
-+ALDOR_PROJECT=$(S)/$(PN)
-
- # All these things under $(ALDOR_PROJECT) can actually be in unrelated places,
-@@ -33,5 +33,5 @@
- # MACHINE should be one of: linux, win32gcc, win32msvc, sun4os55g64
- # or the machines listed in: $(ALDOR_PROJECT)/aldor/tools/unix/docc.
--MACHINE=win32msvc
-+MACHINE=linux
-
- # This varible sets the name of the libraries to be built
-@@ -43,5 +43,5 @@
- # Note: the order in the list sets the order of building the libraries.
- #LIBS_TO_BUILD=aldor axllib debuglib algebra
--LIBS_TO_BUILD=aldor axllib
-+LIBS_TO_BUILD=aldor axllib algebra
-
- # This is used to form the name of the tarball archive used for binary
diff --git a/dev-lang/aldor/metadata.xml b/dev-lang/aldor/metadata.xml
deleted file mode 100644
index 7b8af4e8c..000000000
--- a/dev-lang/aldor/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>sci</herd>
-<maintainer>
-<email>A.G.Grozin@inp.nsk.su</email>
-<name>Andrey Grozin</name>
-</maintainer>
-<longdescription lang="en">
-From a technical point of perspective, Aldor is a type-complete,
-strongly-typed, imperative programming language with a two-level
-object model of categories and domains (similar to the concept of
-interfaces and classes in Java). Types and functions are first class
-entities allowing them to be constructed and manipulated within
-Aldor programs just like any other value. Pervasive use of dependent
-types allows static checking of dynamic objects and provides
-object-oriented features such as parametric polymorphism.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-libs/libunzip/ChangeLog b/dev-libs/libunzip/ChangeLog
index fe424aea6..486ff991d 100644
--- a/dev-libs/libunzip/ChangeLog
+++ b/dev-libs/libunzip/ChangeLog
@@ -1,7 +1,10 @@
# ChangeLog for dev-libs/libunzip
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 24 Jun 2011; Justin Lecher <jlec@gentoo.org> libunzip-5.52.ebuild:
+ Sort inherit and/or USE
+
23 Jun 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
libunzip-5.52.ebuild:
QA fixes
diff --git a/dev-libs/libunzip/Manifest b/dev-libs/libunzip/Manifest
index 1809672e5..dbf33beb5 100644
--- a/dev-libs/libunzip/Manifest
+++ b/dev-libs/libunzip/Manifest
@@ -5,23 +5,13 @@ AUX libunzip-5.52-CVE-2008-0888.patch 1075 RMD160 03d5ec7845ae9347a197c7d1484bb2
AUX libunzip-5.52-Makefile.patch 1296 RMD160 e4d0c3bd9e865ff6701f4500725d69c43bab4de3 SHA1 bb7a4fe61c89ae6214e7d4bae495a52bc5ad2526 SHA256 17d857b746d4d699e7d816d240c2b211710ede7a8fac242b1574821ec5928fd5
AUX libunzip-5.52-no-exec-stack.patch 334 RMD160 81d73b5bb66fb54f8f71252c1fe6e2036d488de9 SHA1 0f318fecebd548e9feb2e93a32c56258d5c552b1 SHA256 8e165db2c138f9729020f3e60e9d8be58d504f4cf8eb7aae18b9432d2d751d4f
DIST unzip552.tar.gz 1140291 RMD160 b749b0923bc4cceaa6f937aef688e9713a84328c SHA1 1831bd59b9e607a69052f83b263384895e2d4a19 SHA256 145d95e2ef1ef9add2e3c97d1340907e33ab8749eb1235372e7f0b7af600a8e9
-EBUILD libunzip-5.52.ebuild 1299 RMD160 6977af724484f9f60ca3fd421968e095ef936b5c SHA1 bad9ada0df6ed9442c61a0da08dadd52d7046cd9 SHA256 fb3e78c0c9db10b241efb53b61a2e46efa508d0f197624f10fd362ae8312e2ca
-MISC ChangeLog 500 RMD160 1dec57e77dab11fcd79f067fc3aeaf3ac9d3ea3b SHA1 b367438425b5c884fcec3bacf503241d86ba6eb2 SHA256 f24c8abdcaaec1d392720187d8c4d7a631e4911ba5cd5ea5a9cd51b1119008da
+EBUILD libunzip-5.52.ebuild 1299 RMD160 cd97810ad9536b647ffd19c0a9ba7af7fd07cfa8 SHA1 d4e3d89df0d3f8fb09fc1d68226bfbdf4126b0e1 SHA256 89bc89e68013fda4ce76c3f900290b5a430e06cee376d5a92229c3419ed7745d
+MISC ChangeLog 596 RMD160 f53222765daa90812752fed5eaf9a16ae13b19ee SHA1 fcfae48192f71ceb5df05ce7f1ffc3abf39ad026 SHA256 51f2795473418b9f268f7061fbc7e8ad12004ac2ed131aaf2fdc02faa04b9555
MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBAgAGBQJMIlJUAAoJENwGBM22xffe8MUP/1ckR8ieBLHDotG6RyRc0A8y
-AJ9sNjZ8NLjvsTO1MDEV2IfL6lSMqhOxeUCSmAI19qFTfyXWmPqAViVcpPXEtdmm
-JULvcUAIGveFnVGiQHHV/gWNTZyNCc5iS3X4B2yH+dun8FH7+Bhg8UMAOBPPjW05
-ilXPfacFlCprHsGvK4R4vjstLShWktW/lk1OK31UDNla+jkJOXQ2P0cfrayIcagO
-lqK8Kvly0uyMEYjKq5n/dCbZjdUUkaJlP6BsAvnckAIhSu56AJNgzLNF5HPeicmq
-4KAgsnowPyx+UeWwp1ipRxAnnP75eClKRRXa2a582+6iEv6KH9eDIa+MA4ZnobLj
-OV/VEX4KvbtgpcZr7Tp4gZfo8R+DSYcQPM1eK+sLsb5TNzTHv4VyP61cHtvpRgOF
-dO6jeECGGv49fVicpBPSjQPX1BAnwWHGEzBwSwGUAQXHGqbET2ekqnFgXwCQiEkH
-woNJdfoHUtvRbS2HShCVopdOuv4NndpPEoXkX17YmFAkEJDGUXVMBi7vooElN/5u
-WLNBS9DnZALExFKqrG1dRQpr5nd+3CZUWQWpCGK3vUHUhyzyipTYKCrKu7U4gOrx
-X5bcFZ+JP3vhloxfbLm5QhHAgW9kHUmIwQdSzSi1viBZcki2Jejv6WB/xXcrVWuk
-zroPB/2njO/ZGSob0yM7
-=AKqQ
+iEYEARECAAYFAk4EfwUACgkQgAnW8HDreRbsAQCeMJtbvbP1SwH5QNQhEm9Iqprj
+EpgAn1nMuZztuEMSoAY4b+75mUq33lsN
+=X6ad
-----END PGP SIGNATURE-----
diff --git a/dev-libs/libunzip/libunzip-5.52.ebuild b/dev-libs/libunzip/libunzip-5.52.ebuild
index 7aa8d11e5..d34950ff5 100644
--- a/dev-libs/libunzip/libunzip-5.52.ebuild
+++ b/dev-libs/libunzip/libunzip-5.52.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
-inherit eutils toolchain-funcs flag-o-matic
+inherit eutils flag-o-matic toolchain-funcs
MY_PN="${PN#lib}"
diff --git a/dev-ml/ocamlgraph/ChangeLog b/dev-ml/ocamlgraph/ChangeLog
index 614ac4897..666d4fd4d 100644
--- a/dev-ml/ocamlgraph/ChangeLog
+++ b/dev-ml/ocamlgraph/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 24 Jun 2011; Justin Lecher <jlec@gentoo.org> ocamlgraph-1.7.ebuild:
+ Sort inherit and/or USE
+
06 May 2011; J.-C. Demay <jcdemay@gmail.com>
-ocamlgraph-1.6.ebuild, +ocamlgraph-1.7.ebuild:
version bump
diff --git a/dev-ml/ocamlgraph/Manifest b/dev-ml/ocamlgraph/Manifest
index f65add3f5..838fb41ab 100644
--- a/dev-ml/ocamlgraph/Manifest
+++ b/dev-ml/ocamlgraph/Manifest
@@ -1,5 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX ocamlgraph-makefile.patch 1564 RMD160 f1a4949963658165492b67d456ff57b40af1608e SHA1 963e31c341579f9417eb46dd61a6851d7c27d3dd SHA256 c36612f740033a3d158f5d2a458697b1a41dacf2d1964484c1fd0c0f39fd276b
DIST ocamlgraph-1.7.tar.gz 236906 RMD160 5006095e66f5f552b187a1b37b760dbaae88bd0e SHA1 fb15adbcdc5d258b733eec32a69f9db0c2f7581d SHA256 ec5e79a441ea575b50c9301824917e82738ed712a9e5bcf4aa6bea018eff60c6
-EBUILD ocamlgraph-1.7.ebuild 946 RMD160 ffc6d09472a06a1cd865774f76f7f2d12f91447d SHA1 8b24849145a9992fe2b01e7de4cb82b1bbe71a65 SHA256 3104cc843432da702894afbf1442365be3ab7da6893e4e35e64076474f17b37d
-MISC ChangeLog 723 RMD160 b8622b05f277d617a8e9aa2d971c368afe5a4ae8 SHA1 81d2a7debf92a70fdd26521d8b33fb70c0f3da7d SHA256 d9fbce1b2d7dfb07e40f8fee0ad3ab9262e86c763b17b77e81e50363fc115106
+EBUILD ocamlgraph-1.7.ebuild 946 RMD160 9099cbe28ec43ac93867284cc0f41b626371e729 SHA1 4e2c003202aca2d63771e295a0723980c41d8d5f SHA256 c9b4f1f9bb65817d9e946ae1c5c2c5d129d87a14ed73d7743bfd9d829ec6631f
+MISC ChangeLog 820 RMD160 4a3a571fcaa89d18eb07427ba30c339c60168771 SHA1 b395e312ae1bd1c0385d09d2396aee235937ebf0 SHA256 a900532779edacd3ef37637fd0922e677c7827cec5a28fec2b068fd97da98c2d
MISC metadata.xml 1387 RMD160 8fc86d9fb0b1ae585c9ed9c8cca5a47416ea1a2c SHA1 654c9811c01e785f5a6c3ea31a5a15c0f90f3634 SHA256 2a242778c24a7fb97cce396194c7e5813d1cb9f9a12f3d00a1fc8bdfad988cbf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4EfxwACgkQgAnW8HDreRYgJACguE7X9LjDF29Y3MyOq2mnlLJ6
+TOYAn3AjEcO3ToZ5koukm+cSTVPj4y8w
+=OqPu
+-----END PGP SIGNATURE-----
diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.7.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.7.ebuild
index 344e23a92..b880e944d 100644
--- a/dev-ml/ocamlgraph/ocamlgraph-1.7.ebuild
+++ b/dev-ml/ocamlgraph/ocamlgraph-1.7.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
-inherit eutils autotools
+inherit autotools eutils
DESCRIPTION="A graph library for Objective Caml"
HOMEPAGE="http://ocamlgraph.lri.fr/"
diff --git a/dev-perl/Lab-Tools/ChangeLog b/dev-perl/Lab-Tools/ChangeLog
index 4fbc2544f..c7aabe19b 100644
--- a/dev-perl/Lab-Tools/ChangeLog
+++ b/dev-perl/Lab-Tools/ChangeLog
@@ -1,7 +1,10 @@
# ChangeLog for dev-perl/Lab-Tools
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 25 Jun 2011; Justin Lecher <jlec@gentoo.org> metadata.xml:
+ Fixed herd entry in metadata.xml
+
*Lab-Tools-1.4 (22 Jun 2010)
22 Jun 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
diff --git a/dev-perl/Lab-Tools/Manifest b/dev-perl/Lab-Tools/Manifest
index ad112e203..d4cde36fe 100644
--- a/dev-perl/Lab-Tools/Manifest
+++ b/dev-perl/Lab-Tools/Manifest
@@ -1,14 +1,14 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
DIST Lab-Tools-1.4.tar.gz 23609 RMD160 6da9f8c136f8201bdc02e79b4b6812662bb76ab1 SHA1 0818f60c346b0662fe2f357533a2d127eed65677 SHA256 eeff55177c951dc9805fcdef467bd5c35ed6b56ea1fae3e9493aee5c4ae7b290
EBUILD Lab-Tools-1.4.ebuild 582 RMD160 05f1c983ec8723c8699bf5b4de5ad3dcf1a3cc5e SHA1 bfbef4ec7c181bc2aae4f15765134dfd36935281 SHA256 4964fe6b6e54f3e213be4cfa32026b371e44480a3c813e60c263ac8bff13325d
-MISC ChangeLog 270 RMD160 831ded807993e998d4b8f3e8a2b764a25a9c4d7a SHA1 d806c2bde5efd365d2ca5d6b55c04b44d0a9bbbb SHA256 bae6d6c82240df76fbf667f82bbb05fb7b03f7d984b0cc548e117dc63cacc933
-MISC metadata.xml 171 RMD160 ed284df01c230fc7990a6b5888b39166d23f29ba SHA1 f3d64a69044b710e23fb874b3ee4cd338858c8b4 SHA256 a7b30fbacd0e4c312c07a3efac112a3794c81d134442d8104325734d03425adf
+MISC ChangeLog 367 RMD160 91f531194a3c02e3e9a30b212b0a93d10c305e20 SHA1 9ee88fececf6ef31732af5f95fe0bb4f6eb79773 SHA256 f84348b75b8e9d9d40a55d80eeb92d0d837e8a01ce1baa4a76ff7ab5eac183a4
+MISC metadata.xml 162 RMD160 5c824235f1e4a7c8ef787db43136f0285955ae3b SHA1 cf1542a31296264abe609cf1d52a803902a73dd1 SHA256 dd95a1972c8af554246b7010b2f0097c60c60b2152034bf74ccf842a48c7670f
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEAREKAAYFAkwg6KYACgkQL+gLs3iH94eUfgCfef6Z/pdAf1RYl4zctNOrNJgO
-mpcAniUNMrT55HYuoH6QI1ul+h+Omhcb
-=pRTq
+iEYEARECAAYFAk4FkTYACgkQgAnW8HDreRYJJwCgwNz7sk/219k12ymdOgerzk7J
+1hYAniXoXZdbbV3cc/LOsWCEi/EmSqIg
+=G6Av
-----END PGP SIGNATURE-----
diff --git a/dev-perl/Lab-Tools/metadata.xml b/dev-perl/Lab-Tools/metadata.xml
index 6f1d493c5..97577520b 100644
--- a/dev-perl/Lab-Tools/metadata.xml
+++ b/dev-perl/Lab-Tools/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>maintainer-wanted</herd>
+ <herd>no-herd</herd>
</pkgmetadata>
diff --git a/dev-python/coords/ChangeLog b/dev-python/coords/ChangeLog
index 407b4fcf5..d75b7cef3 100644
--- a/dev-python/coords/ChangeLog
+++ b/dev-python/coords/ChangeLog
@@ -1,7 +1,11 @@
# ChangeLog for dev-python/coords
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 25 Jun 2011; Justin Lecher <jlec@gentoo.org> coords-0.37.ebuild,
+ metadata.xml:
+ Fixed malformat CVS line in header
+
17 Aug 2010; Kacper Kowalik <xarthisius@gentoo.org> coords-0.37.ebuild:
Update HOMEPAGE
diff --git a/dev-python/coords/Manifest b/dev-python/coords/Manifest
index d3311e41c..ce65b9bef 100644
--- a/dev-python/coords/Manifest
+++ b/dev-python/coords/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
DIST coords-0.37.tar.gz 736179 RMD160 bb273716fd4bd3f5df7558f5cdb19dde732ee5c3 SHA1 8de4563e2d2b43d9c1b308f6dad0dd702e795a1a SHA256 67ce4316e37a75b83a459e1103b497149d4fec9388ac042f756338fff1fc22b3
-EBUILD coords-0.37.ebuild 732 RMD160 47ed82801c1e54e345569f91527cbe0c4bba64c8 SHA1 990ea06892abc56288bafa10bb52b06ff5fc4342 SHA256 dec8506cae9475b7c6a5da1a212c565236b32d16c86345e96aa5819bb9f9595f
-MISC ChangeLog 452 RMD160 feb9c139f994b5f5d2c7316ba608fa0f534c69cc SHA1 a4b5581598bde4379ad11bc9cf35da7bf08a1dfe SHA256 2ef0866cdd059917470fb2594869853831a7c27b435b656e69cb6053281fd418
-MISC metadata.xml 312 RMD160 7e25d9a79b5ac6608509dd864444389325afb97c SHA1 354d91501ec2dbe63d85231f0863133697a0d752 SHA256 2e5632eaa0d493cbfaa1b36feea250483ae9ea51eb4607a89c50feb134e7a1e3
+EBUILD coords-0.37.ebuild 736 RMD160 6b013f0857597eba71c9e8f5a96549321d472e89 SHA1 57fc05af48e7787ee5470b69ff8ba455310bc6a0 SHA256 ecc134f372dfe23dd7ec8e0738a6e5a5ed4764064f4274ccce72935f866aac8d
+MISC ChangeLog 573 RMD160 d76c93db183b59073ccd84ec73abf9bc80cf7605 SHA1 aebd16cdd6527c4d465aa500b7b575832f5a1719 SHA256 1917a3261622a39a0706a0013569ca5fc69bde77c1a3fbd5fdde9b3c0a4d9543
+MISC metadata.xml 314 RMD160 e5366240b8eecf07bbcbaaa0e3102a70a439ae6d SHA1 ecdd6ca0f44aee7f6df2102639692c8b6e61fb1e SHA256 b5eecff4fb2537a471c6aebc9a9a30f5abfa0c9e2a8b8f59e234331e183e00ee
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREIAAYFAk4F6V0ACgkQgAnW8HDreRbTKQCgz1iCMZ57UDT1xQLK+xubDjLv
+PZAAn3TlUTKlMvG1DY9kVCrumPmRuuOC
+=WYdz
+-----END PGP SIGNATURE-----
diff --git a/dev-python/coords/coords-0.37.ebuild b/dev-python/coords/coords-0.37.ebuild
index c1dd7fcbb..c9be8c7c8 100644
--- a/dev-python/coords/coords-0.37.ebuild
+++ b/dev-python/coords/coords-0.37.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header$
+# $Header: $
EAPI=3
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
inherit distutils
-DESCRIPTION="managing astronomical coordinate systems"
-HOMEPAGE="https://trac6.assembla.com/astrolib/wiki http://www.scipy.org/AstroLib"
+DESCRIPTION="Managing astronomical coordinate systems"
+HOMEPAGE="https://trac6.assembla.com/astrolib/wiki/ http://www.scipy.org/AstroLib/"
SRC_URI="http://stsdas.stsci.edu/astrolib/${P}.tar.gz"
LICENSE="AURA"
@@ -20,7 +21,6 @@ IUSE=""
DEPEND=""
RDEPEND="dev-python/numpy"
-RESTRICT_PYTHON_ABIS="3.*"
src_test() {
testing() {
diff --git a/dev-python/coords/metadata.xml b/dev-python/coords/metadata.xml
index d5b2c7915..0cc1b5f15 100644
--- a/dev-python/coords/metadata.xml
+++ b/dev-python/coords/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+ <herd>sci</herd>
+ <longdescription lang="en">
coords is a part of Astrolib and provide a set of routines for managing
astronomical coordinate systems
</longdescription>
diff --git a/dev-python/cvxopt/ChangeLog b/dev-python/cvxopt/ChangeLog
index 21370e049..2d4bb92bc 100644
--- a/dev-python/cvxopt/ChangeLog
+++ b/dev-python/cvxopt/ChangeLog
@@ -2,6 +2,17 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 24 Jun 2011; Justin Lecher <jlec@gentoo.org> cvxopt-1.1.3.ebuild:
+ Sort inherit and/or USE
+
+ 20 Jun 2011; François Bissey <francois.bissey@canterbury.ac.nz>
+ cvxopt-1.1.3.ebuild, +files/cvxopt-1.1.3-blas.patch, metadata.xml:
+ Add useflag description in metadata
+
+ 20 Jun 2011; François Bissey <francois.bissey@canterbury.ac.nz>
+ cvxopt-1.1.3.ebuild, +files/cvxopt-1.1.3-blas.patch:
+ Make cvxopt use pkg-config for BLAS/LAPACK
+
03 May 2011; Justin Lecher <jlec@gentoo.org> cvxopt-1.1.3.ebuild:
Smaller reorganization of the ebuild
diff --git a/dev-python/cvxopt/Manifest b/dev-python/cvxopt/Manifest
index a931b4c5b..8044a7b2f 100644
--- a/dev-python/cvxopt/Manifest
+++ b/dev-python/cvxopt/Manifest
@@ -1,14 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
+AUX cvxopt-1.1.3-blas.patch 2833 RMD160 5c247a60c42a2b0507eed17410f7f9cff9b79464 SHA1 628b178c5f617217fcdac2f0e3f49cb5ab5a652b SHA256 4794ef677e984bcd564f7c426bdaa6361aa2bfe3cce83bbd1a88647551bca698
DIST cvxopt-1.1.3.tar.gz 2927536 RMD160 cd0fdf51db957b388803b305f43ff323415b2252 SHA1 fe048bd21bb33eb99adb2759eda6f06d7520aa31 SHA256 c9563f04a31516e7b042d9e25344ae24bf6bc3e905c53ed077f9974c0efd9a7a
-EBUILD cvxopt-1.1.3.ebuild 988 RMD160 e9df1b914aafaecd26b2adc31a44809d9332a263 SHA1 46e8ee5f96758f617ddb49554a2d571dcd548751 SHA256 e4bf5ddae25eb74d6c52b12d94544ee88af8e69daab3aec59adba25d4dc3d4b6
-MISC ChangeLog 416 RMD160 346711378b73c764ead2af3e1fad3bc34082138f SHA1 ee21b8f97824ece336d3a68e9d9bbe7fee9d00a1 SHA256 ec73bd52a0eebeeacf03e198d80da24245ea08a934e64c837afee98cfa63acd3
-MISC metadata.xml 700 RMD160 0f7133c6997bcc9f6628892cd14df58396b2e964 SHA1 eaff2b19a0158437ebfa252de4b0dddc9cbe38ca SHA256 964ca6fb3e432ca9769b37fd063ce2268749334db92bde64fb4ea373790a6a50
+EBUILD cvxopt-1.1.3.ebuild 1398 RMD160 f1889166a77437d26c23e2c6dd31980d89c8f2f9 SHA1 c2fcfa76df27134976b7d62e9852d66a3f8c2a3b SHA256 9d1ca6849bc2d14fcb5e4502a1c727057eb1472e82daeef4e6cb6c6f3a8d2371
+MISC ChangeLog 854 RMD160 38714bb41cf4e7476c72e811aa07ebdf737bdb94 SHA1 246c56f28f6324fbbdad9b099338253e33e091b3 SHA256 a6ddba47f963efd6e556a59dde9f840bedbd77d97912ec5ee24acc429d7dedd3
+MISC metadata.xml 773 RMD160 0896f77a40bd838a9543fae42d240d7e47fbdaf2 SHA1 5ca51919cac1aabbaafe560fc4689fa83202ae1b SHA256 6e7d1cf0e53dcfb136d3cdc183671ecf3d9fb121eb6e28651e48325dc2b4c40c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk3H13YACgkQgAnW8HDreRZXegCeNfdmESZDT6m88P/q+v3wN3QJ
-nLcAmgJy+l70/ylpiw+4EbSsxAkfRevr
-=k38k
+iEYEARECAAYFAk4Efy8ACgkQgAnW8HDreRYiXACgjGvWiQFDWTIl6ZvOXHj3yZbt
+WD0AoKryiOU0zArNbqsEPjFkYZ6IT7un
+=l34+
-----END PGP SIGNATURE-----
diff --git a/dev-python/cvxopt/cvxopt-1.1.3.ebuild b/dev-python/cvxopt/cvxopt-1.1.3.ebuild
index 93571221b..3539f0777 100644
--- a/dev-python/cvxopt/cvxopt-1.1.3.ebuild
+++ b/dev-python/cvxopt/cvxopt-1.1.3.ebuild
@@ -3,13 +3,12 @@
# $Header: $
EAPI=3
-
PYTHON_DEPEND=2:2.5
SUPPORT_PYTHON_ABIS=1
RESTRICT_PYTHON_ABIS="2.4 3.*"
DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES=1
-inherit distutils
+inherit distutils eutils python
DESCRIPTION="A Python Package for Convex Optimization"
HOMEPAGE="http://abel.ee.ucla.edu/cvxopt"
@@ -22,20 +21,35 @@ SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="fftw glpk gsl"
-DEPEND="
- virtual/blas
- virtual/cblas
+DEPEND="virtual/blas
virtual/lapack
-
+ virtual/cblas
fftw? ( sci-libs/fftw )
glpk? ( sci-mathematics/glpk )
gsl? ( sci-libs/gsl )"
-
RDEPEND="${DEPEND}"
S=${WORKDIR}/${P}/src
src_prepare(){
+ epatch "${FILESDIR}/${PN}"-1.1.3-blas.patch
+
+ BLAS=\'$(pkg-config --libs-only-l blas | sed \
+ -e 's/^-l//' \
+ -e "s/ -l/\',\'/g" \
+ -e 's/,.pthread//g' \
+ -e "s: ::")\'
+ LAPACK=\'$(pkg-config --libs-only-l lapack | sed \
+ -e 's/^-l//' \
+ -e "s/ -l/\',\'/g" \
+ -e 's/,.pthread//g' \
+ -e "s: ::")\'
+
+ sed -i \
+ -e "s:@GENTOO_BLAS:${BLAS}:" \
+ -e "s:@GENTOO_LAPACK:${LAPACK}:" \
+ setup.py
+
distutils_src_prepare
prepare_builddir() {
diff --git a/dev-python/cvxopt/files/cvxopt-1.1.3-blas.patch b/dev-python/cvxopt/files/cvxopt-1.1.3-blas.patch
new file mode 100644
index 000000000..12c434990
--- /dev/null
+++ b/dev-python/cvxopt/files/cvxopt-1.1.3-blas.patch
@@ -0,0 +1,76 @@
+--- setup.py.orig 2011-06-20 15:32:19.584436452 +1200
++++ setup.py 2011-06-20 15:35:14.962030823 +1200
+@@ -46,14 +48,14 @@
+ # optional modules
+
+ if BUILD_GSL:
+- gsl = Extension('gsl', libraries = ['m', 'gsl', 'blas'],
++ gsl = Extension('gsl', libraries = ['m', 'gsl', @GENTOO_BLAS],
+ include_dirs = [ GSL_INC_DIR ],
+ library_dirs = [ GSL_LIB_DIR ],
+ sources = ['C/gsl.c'] )
+ extmods += [gsl];
+
+ if BUILD_FFTW:
+- fftw = Extension('fftw', libraries = ['fftw3', 'blas'],
++ fftw = Extension('fftw', libraries = ['fftw3', @GENTOO_BLAS],
+ include_dirs = [ FFTW_INC_DIR ],
+ library_dirs = [ FFTW_LIB_DIR, ATLAS_LIB_DIR ],
+ sources = ['C/fftw.c'] )
+@@ -67,7 +69,7 @@
+ extmods += [glpk];
+
+ if BUILD_DSDP:
+- dsdp = Extension('dsdp', libraries = ['dsdp', 'blas', 'lapack'],
++ dsdp = Extension('dsdp', libraries = ['dsdp', @GENTOO_LAPACK],
+ include_dirs = [ DSDP_INC_DIR ],
+ library_dirs = [ DSDP_LIB_DIR, ATLAS_LIB_DIR ],
+ sources = ['C/dsdp.c'] )
+@@ -85,17 +87,17 @@
+ else:
+ MACROS = []
+
+-base = Extension('base', libraries = ['m','lapack','blas'],
++base = Extension('base', libraries = ['m', @GENTOO_LAPACK],
+ library_dirs = [ ATLAS_LIB_DIR ],
+ define_macros = MACROS,
+ sources = ['C/base.c','C/dense.c','C/sparse.c'])
+
+-blas = Extension('blas', libraries = ['blas'],
++blas = Extension('blas', libraries = [@GENTOO_BLAS],
+ library_dirs = [ ATLAS_LIB_DIR ],
+ define_macros = MACROS,
+ sources = ['C/blas.c'] )
+
+-lapack = Extension('lapack', libraries = ['lapack','blas'],
++lapack = Extension('lapack', libraries = [@GENTOO_LAPACK],
+ library_dirs = [ ATLAS_LIB_DIR ],
+ define_macros = MACROS,
+ sources = ['C/lapack.c'] )
+@@ -106,7 +108,7 @@
+ 'C/SuiteSparse/UFconfig' ],
+ library_dirs = [ ATLAS_LIB_DIR ],
+ define_macros = MACROS,
+- libraries = [ 'blas', 'lapack'],
++ libraries = [@GENTOO_LAPACK],
+ sources = [ 'C/umfpack.c',
+ 'C/SuiteSparse/UMFPACK/Source/umfpack_global.c',
+ 'C/SuiteSparse/UMFPACK/Source/umfpack_tictoc.c' ] +
+@@ -118,7 +120,7 @@
+
+ cholmod = Extension('cholmod',
+ library_dirs = [ ATLAS_LIB_DIR ],
+- libraries = ['lapack', 'blas'],
++ libraries = [@GENTOO_LAPACK],
+ include_dirs = [ 'C/SuiteSparse/CHOLMOD/Include',
+ 'C/SuiteSparse/COLAMD', 'C/SuiteSparse/AMD/Include',
+ 'C/SuiteSparse/UFconfig', 'C/SuiteSparse/COLAMD/Include' ],
+@@ -139,7 +141,7 @@
+ define_macros = MACROS,
+ sources = [ 'C/amd.c' ] + glob('C/SuiteSparse/AMD/Source/*.c') )
+
+-misc_solvers = Extension('misc_solvers', libraries = ['lapack', 'blas'],
++misc_solvers = Extension('misc_solvers', libraries = [@GENTOO_LAPACK],
+ library_dirs = [ ATLAS_LIB_DIR ],
+ define_macros = MACROS,
+ sources = ['C/misc_solvers.c'] )
diff --git a/dev-python/cvxopt/metadata.xml b/dev-python/cvxopt/metadata.xml
index 3bd706c66..9381d9019 100644
--- a/dev-python/cvxopt/metadata.xml
+++ b/dev-python/cvxopt/metadata.xml
@@ -5,5 +5,8 @@
<longdescription lang="en">
CVXOPT is a free software package for convex optimization based on the Python programming language. It can be used with the interactive Python interpreter, on the command line by executing Python scripts, or integrated in other software via Python extension modules. Its main purpose is to make the development of software for convex optimization applications straightforward by building on Python's extensive standard library and on the strengths of Python as a high-level programming language.
</longdescription>
+ <use>
+ <flag name='glpk'>Use GNU Linear Programming Kit</flag>
+ </use>
</pkgmetadata>
diff --git a/dev-python/ffc/Manifest b/dev-python/ffc/Manifest
index 85c4d51f2..c37889054 100644
--- a/dev-python/ffc/Manifest
+++ b/dev-python/ffc/Manifest
@@ -1,3 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
DIST ffc-0.9.4.tar.gz 2655088 RMD160 582aa1522480fe5a446aa582395b03f39704d838 SHA1 7773963845dcb18e94c28ac088da2a366597661d SHA256 e942ce177c442c032e3b51d864bd9d12ba4f85ca160fc029fd2152d65d81cc1a
EBUILD ffc-0.9.4.ebuild 499 RMD160 287bb021fbb90e069115ba6b7641f7d7341f5a37 SHA1 bc77175dda0d6479c21846d6deddb3ea3ce86d82 SHA256 7fe2d7174bdc97291184ace2f4695ea4f2229b97a168d0de3ffd80dab3d9d4a5
+MISC ChangeLog 253 RMD160 a0e8fc7083b2f39738bc61b0473533ec8e800c43 SHA1 5a03aa64a018d77afb430d7e2cd2604e1269820a SHA256 b6ec291c1ab1295c42c3055d849cdff11264bd9e612be2e860cd5bf9134f2e37
MISC metadata.xml 554 RMD160 28d22aeea5715a34d255447f8ce0ee0fe8783445 SHA1 55e0f53f9c409347acfb2281f30e92c968439acc SHA256 cda782ed828357bc70586c7ac42c0aa9babf8bd0539b44c56f6a519f30add7ed
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4Ev8QACgkQgAnW8HDreRbM3wCgn2DpnUTm62r7hZbe62hgCZZN
+UCwAn2hEknGX8A3Rl+13kDR3GUrolFty
+=bCd0
+-----END PGP SIGNATURE-----
diff --git a/dev-python/ffnet/ChangeLog b/dev-python/ffnet/ChangeLog
index 8ed1c9d95..e5febd30c 100644
--- a/dev-python/ffnet/ChangeLog
+++ b/dev-python/ffnet/ChangeLog
@@ -1,7 +1,13 @@
# ChangeLog for dev-python/ffnet
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 23 Jun 2011; Justin Lecher <jlec@gentoo.org> ffnet-0.6.2.ebuild:
+ Streamlined fortran-2 eclass usage
+
+ 21 Jun 2011; Justin Lecher <jlec@gentoo.org> ffnet-0.6.2.ebuild:
+ Added fortran-2.eclass support
+
26 Jun 2010; Justin Lecher <jlec@gentoo.org> ffnet-0.6.2.ebuild:
Python ABI fixes
diff --git a/dev-python/ffnet/Manifest b/dev-python/ffnet/Manifest
index 083887523..455ab0c33 100644
--- a/dev-python/ffnet/Manifest
+++ b/dev-python/ffnet/Manifest
@@ -2,13 +2,13 @@
Hash: SHA1
DIST ffnet-0.6.2.tar.gz 59596 RMD160 756f9287b03d765fa92dfc4a5375876f7fd7de31 SHA1 2858848b5ab04660a824c9e9278fa44fb2c3b75a SHA256 8f75e92b18e8c963876c9112d8ed321b85a5371544aae9facd5c01fffd7cc51a
-EBUILD ffnet-0.6.2.ebuild 1117 RMD160 272ce219686811b7d9f681c168f3649bea76d6d0 SHA1 a2f3e3917119583f112c232efd78b38fcbb6e753 SHA256 7a9d94464d1302a94a3d95c85f4fda5bfd4ccf98ea376282be98f09591da08bb
-MISC ChangeLog 482 RMD160 2e44463ff08e9190ff2ee7eee5897e27fd5216d3 SHA1 6d3db73fd75cac44879bd37a630969142bcdcbb2 SHA256 ea1253aae02f63328a37b9dd859fce014ad7b893966147bd77ad7b3030cfd857
+EBUILD ffnet-0.6.2.ebuild 993 RMD160 690af17a6253f9a0873081f3f60f43c87e5cbfd7 SHA1 e6b003871a6f159721e7450a47b4b7ab70affee9 SHA256 cb0d7b70f997a9de5c008d6340948bc49cca4e32c0fb875012ecc3e46f027c5b
+MISC ChangeLog 688 RMD160 9734fce0092583b6449568132e360a96c6adece1 SHA1 854a9f60079be39a90606d5fbcd8d41850bf70c8 SHA256 ad1837a431d689d548edea0c4f2775a461a4856c2014ae193e3965cedf55dcfa
MISC metadata.xml 368 RMD160 147d6b3476a5a4b1fa383def51d0ca28f5c6d596 SHA1 a53c0a8551114670bcabdc8a24630e0bcc7c8984 SHA256 f39f4e999a7bbc60dfce5804cc6913cec1928987a1608baaa2c8b46d913b249d
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAkwlt5YACgkQgAnW8HDreRYZogCgv75K2OxCQuRsM9M8RzU/Fc0y
-rtgAn1zIr/fxZlPuu4KctI5ujP7ZkyWl
-=Q5aC
+iEYEARECAAYFAk4C/PgACgkQgAnW8HDreRYj6wCgl+N+SOPI6awZAKXNCOOLcCI0
+utAAoJm+IaULzn24hVZO7v8oD6jd1aPj
+=2PSs
-----END PGP SIGNATURE-----
diff --git a/dev-python/ffnet/ffnet-0.6.2.ebuild b/dev-python/ffnet/ffnet-0.6.2.ebuild
index a4c5bd2a5..7795b2109 100644
--- a/dev-python/ffnet/ffnet-0.6.2.ebuild
+++ b/dev-python/ffnet/ffnet-0.6.2.ebuild
@@ -1,43 +1,41 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="3"
+EAPI=3
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
-inherit distutils flag-o-matic toolchain-funcs
+inherit distutils flag-o-matic fortran-2 toolchain-funcs
DESCRIPTION="Feed-forward neural network for python"
HOMEPAGE="http://ffnet.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
SLOT="0"
-KEYWORDS="~x86 ~amd64"
LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64"
IUSE="examples graphviz matplotlib"
DEPEND="
dev-python/networkx
dev-python/numpy
sci-libs/scipy
+ virtual/fortran
matplotlib? ( dev-python/matplotlib )
graphviz? ( dev-python/pygraphviz )"
RDEPEND="${DEPEND}"
-RESTRICT_PYTHON_ABIS="3.*"
-
pkg_setup() {
- [[ -z ${FC} ]] && export FC=$(tc-getFC)
- # hack to force F77 to be FC until bug #278772 is fixed
- [[ -z ${F77} ]] && export F77=$(tc-getFC)
+ fortran-2_pkg_setup
export FCONFIG="config_fc --noopt --noarch"
+ append-ldflags -shared
+ append-fflags -fPIC
}
src_compile() {
- append-ldflags -shared
- [[ -n ${FFLAGS} ]] && FFLAGS="${FFLAGS} -fPIC"
distutils_src_compile ${FCONFIG}
}
diff --git a/dev-python/fiat/Manifest b/dev-python/fiat/Manifest
index f8dbdedc4..9440268ab 100644
--- a/dev-python/fiat/Manifest
+++ b/dev-python/fiat/Manifest
@@ -1,3 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
DIST fiat-0.9.2.tar.gz 2770810 RMD160 6d3f8f91484bf736b3d6b7d9b337f227cb8c43d1 SHA1 1da72dd1fce44a02bd6a0768a5770a1dda73333f SHA256 e35f4d13274581847b20e64a2a16c3e83eadee70818b1edccc87d5d463e402be
EBUILD fiat-0.9.2.ebuild 530 RMD160 3bb2aa6313ab11476be31bf7a19a20a7d740eccc SHA1 57bf6a509bc6fc84dda9950920d49d46f196fbd5 SHA256 4fa90ac8b20bc25129dfe5fd789dbf8ac5585c19b68c877147b300f5d2a0ddbe
+MISC ChangeLog 256 RMD160 b9ea2b39147c6d0eb99d42f5ec20fa40f74f5400 SHA1 62c7e9cf062765e0e7183079bf70c60eb26bd1d4 SHA256 49fb8ff53eba646a47d384a4031ae121bb14803ed5e38ff6ea02c41c2bf3af33
MISC metadata.xml 725 RMD160 72ae2fd86d8932d4318b59299f76e1601a65aa3d SHA1 8ec9f77332d3c4346533b022ab9e5a0569f16ad3 SHA256 8bbf23365efd5f2eb3c7e5ca903d5d015e713dba65f7e99e272a157f232fcdaa
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4Ev+kACgkQgAnW8HDreRYV5gCgusErlvEnNefX3qLkU0AsP9sl
+EwsAn15GZcjXnR+2rIK2t37Ql0HcA25S
+=VDJ2
+-----END PGP SIGNATURE-----
diff --git a/dev-python/inference/ChangeLog b/dev-python/inference/ChangeLog
index a720355da..a1dad065f 100644
--- a/dev-python/inference/ChangeLog
+++ b/dev-python/inference/ChangeLog
@@ -1,7 +1,16 @@
# ChangeLog for dev-python/inference
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 23 Jun 2011; Justin Lecher <jlec@gentoo.org> inference-0.4.ebuild:
+ Streamlined fortran-2 eclass usage
+
+ 21 Jun 2011; Justin Lecher <jlec@gentoo.org> inference-0.4.ebuild:
+ Added fortran-2.eclass support
+
+ 21 Jun 2011; Justin Lecher <jlec@gentoo.org> inference-0.4.ebuild:
+ Added fortran-2.eclass support
+
*inference-0.4 (19 Jul 2010)
19 Jul 2010; Sébastien Fabbro <bicatali@gentoo.org>
diff --git a/dev-python/inference/Manifest b/dev-python/inference/Manifest
index 94c8de41c..603725650 100644
--- a/dev-python/inference/Manifest
+++ b/dev-python/inference/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
DIST inference-0.4.tar.gz 132739 RMD160 f92c5fff70b99cb6d5a884ceb27456eaa2af9b81 SHA1 f5aae52f4d6c3510ee6dca4db46559cc03da0ad1 SHA256 78e14c4848bb7ab8bf139957de9c6579c8213bb9d449ec2bf61b168023adcfaf
-EBUILD inference-0.4.ebuild 969 RMD160 e2498e1e0517100f382898dabecec37b8618ecfb SHA1 0cb2ccd2f0ab6e2d6cd2cd6e911107b172bd8276 SHA256 0ae582e25c9d1891eb0899ffe1021f88c45877dd46ab76abc5b8c7cf085f8a8e
-MISC ChangeLog 264 RMD160 82103ceedfc141de613b347adab511daa0e3a5c2 SHA1 39c50e1d80020892fef86f8a7f3daa72365e1e91 SHA256 a38ab379d459c907bab9165d1552eee01b7eeb82fc7e6aee9eef9977625c8290
+EBUILD inference-0.4.ebuild 920 RMD160 0647c06efc0d0f774d2adcc0937582cd873458d9 SHA1 5a75d18654fc04b604de736be111fb0333edb5cc SHA256 6ad459c5fed4ce882b34904515c91a8000242c10f18729e6a0b74f74e3dcf321
+MISC ChangeLog 577 RMD160 8548ac2fa0add74ed088c98f9d7ccdd3e7ae1de9 SHA1 3c0f0794c7ff0782ec1012fd94ac85b799a17b84 SHA256 697df7333357104d65b5a641d7fccca0e8ed5350ad0a7abcd704d3721bb9f77d
MISC metadata.xml 603 RMD160 90e47dd93ea08bc37e091a179d5b390a63568af4 SHA1 20dea5a1f433380a33310aefc0c4bc5b758e4024 SHA256 f1992098c195490aebbcd781742741cc1b44d5075a756ecda9a90f76da82f7ed
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4C/W0ACgkQgAnW8HDreRbdJwCdERtFr8BratDN0OtnpHTWOdPf
+lioAoLqaMBdYlYd8NQ44GxnUQfaP4I9/
+=Yc/a
+-----END PGP SIGNATURE-----
diff --git a/dev-python/inference/inference-0.4.ebuild b/dev-python/inference/inference-0.4.ebuild
index c2d30b793..1c4917f2b 100644
--- a/dev-python/inference/inference-0.4.ebuild
+++ b/dev-python/inference/inference-0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -6,34 +6,34 @@ EAPI=3
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
DISTUTILS_SRC_TEST="nosetests"
-inherit distutils toolchain-funcs flag-o-matic
+inherit distutils flag-o-matic fortran-2 toolchain-funcs
DESCRIPTION="Collection of Python modules for statistical inference"
HOMEPAGE="http://inference.astro.cornell.edu/"
SRC_URI="${HOMEPAGE}/${P}.tar.gz"
-IUSE=""
SLOT="0"
+LICENSE="as-is"
KEYWORDS="~amd64 ~x86"
-LICENSE="mixed"
+IUSE=""
-DEPEND="dev-python/scipy"
+DEPEND="
+ sci-libs/scipy
+ virtual/fortran"
RDEPEND="${DEPEND}
dev-python/matplotlib"
-RESTRICT_PYTHON_ABIS="3.*"
-
# buggy tests
RESTRICT="test"
pkg_setup() {
+ fortran-2_pkg_setup
# The usual numpy.distutils hacks when fortran is used
append-ldflags -shared
- [[ -z ${FC} ]] && export FC=$(tc-getFC)
- [[ -z ${F77} ]] && export F77=$(tc-getFC)
- export FFLAGS="${FFLAGS} -fPIC"
+ append-fflags -fPIC
export NUMPY_FCONFIG="config_fc --noopt --noarch"
}
diff --git a/dev-python/instant/Manifest b/dev-python/instant/Manifest
index 33f88b4e1..7a3dee100 100644
--- a/dev-python/instant/Manifest
+++ b/dev-python/instant/Manifest
@@ -1,3 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
DIST instant-0.9.8.tar.gz 112271 RMD160 e01817f836ff2c4d4eabad3c9286463f82337b79 SHA1 7604620103253e6fd035514c8bb86be7ac277828 SHA256 99286b1147f3eebf0e8a56501cfebbbd335bf0cd98cfba7f60f8d5c17005d896
EBUILD instant-0.9.8.ebuild 447 RMD160 5a9474218e5976d88522d303a927dd195997bc52 SHA1 1692e775e0bcd1eabb693d463ff84191cbd12af3 SHA256 392898f00eb8b9f892d3534b00a4cd9eba60b611e06b77820feec47c632b73b8
+MISC ChangeLog 265 RMD160 dc42bc69598d6a87308860a2a9d38a5e226bcd42 SHA1 c54a195d886576af6e5d0f80bd18eb47dc8a81e9 SHA256 3df1d44bc9f9ffdab4a4aa9a1e9ef526a630e26b705d588f1294fdabbca615d5
MISC metadata.xml 412 RMD160 18f3a82b9e70137231c56529bf1c04cae459551e SHA1 76dfafb931a39988d121f17b389264507e4673fd SHA256 5c71c5edc4a301d061fcdc587769ecb5ef0a23b1402bd72a8e2b9eeefe1b3a01
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4Ev/cACgkQgAnW8HDreRaxQACeJIv6ryoxPRQg+EaWsMkn3x+I
+twwAoLmCq8oybaqYJmyPjRHotJHRo+WL
+=Lp4E
+-----END PGP SIGNATURE-----
diff --git a/dev-python/numpydoc/ChangeLog b/dev-python/numpydoc/ChangeLog
index c40c72565..0f35d94db 100644
--- a/dev-python/numpydoc/ChangeLog
+++ b/dev-python/numpydoc/ChangeLog
@@ -1,7 +1,11 @@
# ChangeLog for dev-python/numpydoc
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 25 Jun 2011; Justin Lecher <jlec@gentoo.org> numpydoc-0.4.ebuild,
+ metadata.xml:
+ 'http://pypi.python.org/packages/source' found in thirdpartymirrors
+
03 Nov 2010; Kacper Kowalik <xarthisius@gentoo.org> numpydoc-0.4.ebuild:
Add ~x86, restrict python-3.*. Thanks to W. Trevor King <wking@drexel.edu>
for the report.
diff --git a/dev-python/numpydoc/Manifest b/dev-python/numpydoc/Manifest
index bb861c10b..0313ca61d 100644
--- a/dev-python/numpydoc/Manifest
+++ b/dev-python/numpydoc/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
DIST numpydoc-0.4.tar.gz 28972 RMD160 0eeec5a3570f1d0ea0a2f0090b85e79a96f0cfb9 SHA1 543c78a049a3ee6ab5fe8f85a178c257b20dd0d4 SHA256 20e07c60766a7a044f228de5bdcc0d10b84a9f0b460e0c09422a4f60ef21ff8f
-EBUILD numpydoc-0.4.ebuild 752 RMD160 6b846fe8e5308642bc7263ff4dd582b4af5ec9d7 SHA1 6dade749b282a9506a84f3a2cb9e532df5c7a104 SHA256 b0d7e74b835e306ef1a19bec3c893fcfcf6cdf79d0eae684a5841712f1bf7892
-MISC ChangeLog 575 RMD160 64db2e453a4f28ef30d77d0c80c3a8249b62161b SHA1 483922be5c966e39ddae0e7c47e00f2f5b1f10a0 SHA256 5fa0f8da7913c0d24bd62bbb21320514e99c7973eaa4dbf18227ea69b7da5573
-MISC metadata.xml 280 RMD160 441e4b2986b4938c691bafb0d91808a9877c0b21 SHA1 7bc98b170a45c1cb60a544b92bf9c25688c62b19 SHA256 9c43596df399ac2985e164abd28b8993c983d26ba3d1fc0e96f1f2b6f4a99c33
+EBUILD numpydoc-0.4.ebuild 731 RMD160 23c9967ab980922ab128c17be4d8cb01455ea51e SHA1 e9cf7a1482fcad46918be212ac726d001cb985db SHA256 cd34f6b44501743a36b590580d06e14780c1ff35377d5be307929ea141e3ebfc
+MISC ChangeLog 730 RMD160 bcff863ba5319a63fb7b650aba0f1b3b50beba8b SHA1 62c770f4be02c5c263d3f1b3ebe84573cfd63fda SHA256 58b26c8e3769b21b365978b3b222001b6af9896d6de1f71bb1f63908e63d5f56
+MISC metadata.xml 283 RMD160 83bacf0f98896f839d05061998440cb6a1ae0d2c SHA1 c176d8d425792226cbe239ee5a05ffba089d8d8f SHA256 e96b84a9959cf90bf941c20ca99da3d62faa683f50fbe2b933c6e99ea9830439
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREIAAYFAk4F7PQACgkQgAnW8HDreRZLSACgiyqpF78QM6EoTUJJV5T9Meej
+QYoAoMZps9IUt5ZIihuuHpL+Ma1hgGEy
+=8Sz/
+-----END PGP SIGNATURE-----
diff --git a/dev-python/numpydoc/metadata.xml b/dev-python/numpydoc/metadata.xml
index f1ab7ecf1..8f12a89dd 100644
--- a/dev-python/numpydoc/metadata.xml
+++ b/dev-python/numpydoc/metadata.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sci</herd>
-<herd>python</herd>
-<longdescription lang="en">
+ <herd>sci</herd>
+ <herd>python</herd>
+ <longdescription lang="en">
Sphinx extension to support docstrings in Numpy format.
</longdescription>
</pkgmetadata>
diff --git a/dev-python/numpydoc/numpydoc-0.4.ebuild b/dev-python/numpydoc/numpydoc-0.4.ebuild
index b8b530296..4e472c9e2 100644
--- a/dev-python/numpydoc/numpydoc-0.4.ebuild
+++ b/dev-python/numpydoc/numpydoc-0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -10,9 +10,10 @@ RESTRICT_PYTHON_ABIS="3.*"
inherit distutils
DESCRIPTION="Sphinx extension to support docstrings in Numpy format"
-HOMEPAGE="http://projects.scipy.org/numpy/browser/trunk/doc/sphinxext
- http://pypi.python.org/pypi/numpydoc"
-SRC_URI="http://pypi.python.org/packages/source/n/${PN}/${P}.tar.gz"
+HOMEPAGE="
+ http://projects.scipy.org/numpy/browser/trunk/doc/sphinxext/
+ http://pypi.python.org/pypi/numpydoc/"
+SRC_URI="mirror://pypi/n/${PN}/${P}.tar.gz"
LICENSE="PYTHON BSD"
SLOT="0"
diff --git a/dev-python/numscons/ChangeLog b/dev-python/numscons/ChangeLog
index eb85984a7..e25d3b8b2 100644
--- a/dev-python/numscons/ChangeLog
+++ b/dev-python/numscons/ChangeLog
@@ -1,7 +1,11 @@
# ChangeLog for dev-python/numscons
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 25 Jun 2011; Justin Lecher <jlec@gentoo.org> numscons-0.10.1.ebuild,
+ metadata.xml:
+ 'http://pypi.python.org/packages/source' found in thirdpartymirrors
+
26 Jun 2010; Justin Lecher <jlec@gentoo.org> numscons-0.10.1.ebuild:
Python ABI fixes
diff --git a/dev-python/numscons/Manifest b/dev-python/numscons/Manifest
index 271ad6a94..3cee7b675 100644
--- a/dev-python/numscons/Manifest
+++ b/dev-python/numscons/Manifest
@@ -1,14 +1,14 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
DIST numscons-0.10.1.tar.bz2 593630 RMD160 fa8d8d1fb01f8ebcced0c4d768d4d4d4ca9717ae SHA1 4c8baf7d714b02f132e242d5ef67a37a39e82b67 SHA256 5fbdb3cfb6ce098d28e6d3af37e424fd5c7e56fe7592265a5096ce20c9cea7da
-EBUILD numscons-0.10.1.ebuild 577 RMD160 3ecd91d44cede1304f55cab5d17158776d2f4ce7 SHA1 b805b72ed0d8b102417f7093f8ea56cf6cc693e8 SHA256 e6748ee2654b690c8a4d8a4b0f1875fa10474c896f98e9c65db35485be39a262
-MISC ChangeLog 358 RMD160 815b390f13ed96803dfcc6645481ea6664baa9fd SHA1 f75944da3a90af5ff10c64df06c883c812f8a49a SHA256 2d2d021d1cf5cadd858a091eafb423201585007e06f6fcc02be99734a9526ce6
-MISC metadata.xml 451 RMD160 91291610aa3eb8b5a10046a3545600a0193556cb SHA1 6d8bde1429f1568c2345ccac6b936fcde2fb1f6c SHA256 9d3a2139aa2f0580e7b4a72945a79bae53cf20275f8dda1719a841a826668947
+EBUILD numscons-0.10.1.ebuild 545 RMD160 80a6f8333c21c12bda565b6cdea23e6625195bcd SHA1 528269ac2987df3ac023226735a3b31961bc4f31 SHA256 5ddb13e832063040f28fb6698d4caab52913f5046d76d139325af3c48ace0647
+MISC ChangeLog 516 RMD160 9b2d04007435936f71b82e81ce30ba929bc0f872 SHA1 c7b13261476f1c0b22c93c7d8588a86cfa85e376 SHA256 1b1234e8bf9fdf5961cfd85c4f6155cf53fdc48ce433fb8ca2d0291444fbf657
+MISC metadata.xml 453 RMD160 d8f938d27f45328180b098846c6227ca59d5c1ad SHA1 b8662bb96bb87124292471488d4af8b0fc6abf76 SHA256 ea48eba2cd9ba1b5163c08168605f7acfc9133d723a922f0ddcf1b2e49e15458
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAkwlwn4ACgkQgAnW8HDreRZ9fACfTfO1TWJu755IuZpzjgOIDcYb
-lz8Anitc3LuaV5FvbpKodFCu0ADxxPEd
-=oeJA
+iEYEAREIAAYFAk4F7VIACgkQgAnW8HDreRZmOQCfRZ4uDogOinmPeMhwISG6Zzfj
+L3kAoIJzMI3Kny5n6/mPHMGW3vlcJwaJ
+=asQz
-----END PGP SIGNATURE-----
diff --git a/dev-python/numscons/metadata.xml b/dev-python/numscons/metadata.xml
index 4ee20d43a..34d18a4b3 100644
--- a/dev-python/numscons/metadata.xml
+++ b/dev-python/numscons/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>python</herd>
-<longdescription lang="en">
+ <herd>python</herd>
+ <longdescription lang="en">
The aim is to provide a library to support most needs for compiled
code building in numpy. Concretely, this means more advanced tools ala
autoconf, better fortran support, more tools, and support for
diff --git a/dev-python/numscons/numscons-0.10.1.ebuild b/dev-python/numscons/numscons-0.10.1.ebuild
index 2dd1c1c12..86a7c55ed 100644
--- a/dev-python/numscons/numscons-0.10.1.ebuild
+++ b/dev-python/numscons/numscons-0.10.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="3"
+EAPI=3
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
@@ -13,13 +13,13 @@ MP="$(get_version_component_range 1-2)"
DESCRIPTION="Support library for building numpy with scons"
HOMEPAGE="http://github.com/cournape/numscons/tree/master"
-SRC_URI="http://pypi.python.org/packages/source/${PN:0:1}/${PN}/${P}.tar.bz2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
IUSE=""
SLOT="0"
KEYWORDS="~amd64 ~x86"
LICENSE="BSD"
-DEPEND="dev-util/scons"
#yes, it needs scons to work
-RDEPEND="dev-util/scons"
+DEPEND="dev-util/scons"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/omniorbpy/ChangeLog b/dev-python/omniorbpy/ChangeLog
index f1d4e58ab..945098f50 100644
--- a/dev-python/omniorbpy/ChangeLog
+++ b/dev-python/omniorbpy/ChangeLog
@@ -1,7 +1,10 @@
# ChangeLog for dev-python/omniorbpy
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 24 Jun 2011; Justin Lecher <jlec@gentoo.org> omniorbpy-3.4.ebuild:
+ Sort inherit and/or USE
+
26 Jun 2010; Justin Lecher <jlec@gentoo.org> omniorbpy-3.4.ebuild:
Python ABI fixes
diff --git a/dev-python/omniorbpy/Manifest b/dev-python/omniorbpy/Manifest
index e88b50ded..0f8001a2e 100644
--- a/dev-python/omniorbpy/Manifest
+++ b/dev-python/omniorbpy/Manifest
@@ -2,13 +2,13 @@
Hash: SHA1
DIST omniORBpy-3.4.tar.gz 721891 RMD160 5b389a31907510800ef0913e2e3855038e6a4cf9 SHA1 e598bd25289d0a2a09da4c7241513202c8b9adb4 SHA256 c786676f5d76082bbe6a4031aed1a08b45345d75c0b5aacc4cdc26b69fb9c782
-EBUILD omniorbpy-3.4.ebuild 2761 RMD160 1eab58c3e0a76d4ddd5940bf911bd1fffcdbb057 SHA1 5bc27e80b8eb35fdfe8ee0eada6451d070bbc7eb SHA256 bbdfb8d67793d468029ce06cd844fec0f43e1b2199365be5f75b04235b5b1b60
-MISC ChangeLog 555 RMD160 a6892f538d24a1d49f91edd4f7b105a671161f3b SHA1 f16cf7b13186bc519258af22e1673aea6a85601a SHA256 cab0702222aed4cebdec2b64c8f89231fb577a7658f30f3b8de0f845042e3e96
+EBUILD omniorbpy-3.4.ebuild 2761 RMD160 927bf01bde7679dc6083e3db07ea928b8733e8ff SHA1 c9750dbc979148b13cb3f40ea184fc99d2b4c108 SHA256 0d64df60f61d7fca265c5a7787ba8ee70da976d03441fd5b764e0274dee0335f
+MISC ChangeLog 651 RMD160 179c5750ff7c2f6da64a94cc912e35f795c1609f SHA1 cc2ec30c64c315d945fe127c19455d52a9f863e3 SHA256 719a8e74d219825a3049019d6d7f84479dc260b2fca71981c1bbbd97de036989
MISC metadata.xml 157 RMD160 ed43b99e7bf8bbf62cf4e46152138ab42d3a88c5 SHA1 2182a6de0b10959aad51af2990f1a6c69e34dd97 SHA256 750cb9e46ac2b77e1adf73de43c186a8c2d2234a9c6a89d9358d0969dc5cf8ac
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAkwl0M0ACgkQgAnW8HDreRaVBACgrLhleVcJyUsi2Y5PEk6Q3Dyi
-9IAAn04SH3Pu28ZaVA/+xwK5dURJ2NdL
-=TipB
+iEYEARECAAYFAk4Ef1wACgkQgAnW8HDreRaZzQCfRcqIWky8+uxQmxcoSoqjMKQF
+bkMAoML/9XsgnRTQeJJasbrMQEI2tSw+
+=sWmm
-----END PGP SIGNATURE-----
diff --git a/dev-python/omniorbpy/omniorbpy-3.4.ebuild b/dev-python/omniorbpy/omniorbpy-3.4.ebuild
index f903ffd5a..d78ffc6bf 100644
--- a/dev-python/omniorbpy/omniorbpy-3.4.ebuild
+++ b/dev-python/omniorbpy/omniorbpy-3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -7,7 +7,7 @@ EAPI="3"
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
-inherit eutils python multilib
+inherit eutils multilib python
MY_P=${P/omniorb/omniORB}
S=${WORKDIR}/${MY_P}
diff --git a/dev-python/pymvpa/ChangeLog b/dev-python/pymvpa/ChangeLog
new file mode 100644
index 000000000..26f976663
--- /dev/null
+++ b/dev-python/pymvpa/ChangeLog
@@ -0,0 +1,8 @@
+# ChangeLog for dev-python/pymvpa
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 25 Jun 2011; Justin Lecher <jlec@gentoo.org> pymvpa-0.4.4.ebuild,
+ metadata.xml:
+ Dropped keywords because deps are missing
+
diff --git a/dev-python/pymvpa/Manifest b/dev-python/pymvpa/Manifest
index cf6cc99e4..dd6efd24c 100644
--- a/dev-python/pymvpa/Manifest
+++ b/dev-python/pymvpa/Manifest
@@ -1,12 +1,13 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
-EBUILD pymvpa-0.4.4.ebuild 877 RMD160 65b37f5b8b65a794c5c688bd9e99758750f126dd SHA1 414901debcbc980abd579c5c98bf6239f603db1e SHA256 366e32a76c78f0461ae57fc5ee5fa88c34a64ffc00cedfee0d1aab28ffcb2daa
-MISC metadata.xml 670 RMD160 fc2ddb7f9a2c7915959311611ce3cec5a83e1348 SHA1 5b36d5aa5e683147c7994d002787bb1db687072b SHA256 26ebc4000e94e560fd2b48522826b86095c5b2b555cfe314ad1801a1c4289d96
+EBUILD pymvpa-0.4.4.ebuild 891 RMD160 766c4ab2f0e3eb77eab99e840a7f457887f79717 SHA1 04855e4290ef1a73d5bfd0acf6631f2b8c8fc1ca SHA256 dce1147ed0f6fbd370155c8fd5f0d723e6019a1d4f9be3dc217fcb28a69178cd
+MISC ChangeLog 247 RMD160 523dae528f91cea2dd61f87c804b4c105f8ca524 SHA1 bc41c207b4af38fc9ac65abefacef27b6e383aff SHA256 39d177de0314e99b2af239df843c26820b62e7842f0a5cc261276eb81ad30aa5
+MISC metadata.xml 673 RMD160 14ecc222d5f5f7cdd602e9f7ce1baa66f336b9b5 SHA1 beb80cd5b15d20c6c24f7c49f409c663a38a2e51 SHA256 89ca1f0539cd89119d1818897091133593e67c67485ed4f8e8fcc445d79e0c97
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk0pyI8ACgkQy0OE/ans1/kiogCeM17RLZVsSCdWNDxEL/eCQrog
-ZhwAnR4AClmjgeIK8vA8LThbAuBz/0Pl
-=gdW3
+iEYEAREIAAYFAk4F6jkACgkQgAnW8HDreRY7zgCgqBg8QuP5/OjCC+aGGT68VAqC
+T0wAoKt0s+anj27SYY6Ju+BouSx9ziMq
+=IU5b
-----END PGP SIGNATURE-----
diff --git a/dev-python/pymvpa/metadata.xml b/dev-python/pymvpa/metadata.xml
index 6b37a236c..8473d3d60 100644
--- a/dev-python/pymvpa/metadata.xml
+++ b/dev-python/pymvpa/metadata.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sci-mathematics</herd>
-<herd>python</herd>
-<longdescription lang="en">
+ <herd>sci-mathematics</herd>
+ <herd>python</herd>
+ <longdescription lang="en">
Python module to ease pattern classification analyses of large
datasets. It provides high-level abstraction of typical processing
steps (e.g. data preparation, classification, feature selection,
diff --git a/dev-python/pymvpa/pymvpa-0.4.4.ebuild b/dev-python/pymvpa/pymvpa-0.4.4.ebuild
index 1eb116f07..88a45808b 100644
--- a/dev-python/pymvpa/pymvpa-0.4.4.ebuild
+++ b/dev-python/pymvpa/pymvpa-0.4.4.ebuild
@@ -1,20 +1,26 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/pywavelets/pywavelets-0.2.0.ebuild,v 1.1 2010/04/22 20:14:30 bicatali Exp $
EAPI=2
+
+PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
inherit distutils
DESCRIPTION="Multivariate pattern analysis with Python"
HOMEPAGE="http://www.pymvpa.org/"
SRC_URI=""
-LICENSE=""
+
+LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
IUSE="doc examples minimal test"
-DEPEND="dev-lang/swig
+DEPEND="
+ dev-lang/swig
dev-python/lxml
dev-python/numpy
sys-apps/help2man
@@ -33,5 +39,3 @@ RDEPEND="dev-python/numpy
sci-libs/libsvm
sci-libs/scipy
sci-libs/shogun[python] )"
-
-RESTRICT_PYTHON_ABIS="3.*"
diff --git a/dev-python/pythoncgns/ChangeLog b/dev-python/pythoncgns/ChangeLog
index 643e48b36..df25ae75c 100644
--- a/dev-python/pythoncgns/ChangeLog
+++ b/dev-python/pythoncgns/ChangeLog
@@ -1,7 +1,10 @@
# ChangeLog for dev-python/pythoncgns
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 25 Jun 2011; Justin Lecher <jlec@gentoo.org> pythoncgns-2009.10.30.ebuild:
+ 'http://pypi.python.org/packages/source' found in thirdpartymirrors
+
26 Jun 2010; Justin Lecher <jlec@gentoo.org> pythoncgns-2009.10.30.ebuild:
Python ABI fixes
diff --git a/dev-python/pythoncgns/Manifest b/dev-python/pythoncgns/Manifest
index 98f8f0ab3..9b7aa7e5c 100644
--- a/dev-python/pythoncgns/Manifest
+++ b/dev-python/pythoncgns/Manifest
@@ -1,14 +1,14 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
DIST CGNS-2009.10.30.tar.gz 24185 RMD160 aac9c77f620797b5658bde863105d43a8b22e8c3 SHA1 660a0097031474bb939254359b67b44f8bb93805 SHA256 915c57cfbcaceecf8c352de03e96945388c1bd1e10c4b011ea5ac5231814011a
-EBUILD pythoncgns-2009.10.30.ebuild 573 RMD160 13696109c9acee62c7f56e2c350696f8ce92cc6b SHA1 9f691ec16e3bda079c1fefc73447e157556ed70b SHA256 9058a47230bc89c3957721140d7c4cc48938b6435d0c532fa36fd906d54841aa
-MISC ChangeLog 393 RMD160 bf3f7544e8bce0701d152d16e4c043062834b9e4 SHA1 4a133f47b2dab655a3dd92cfe1aa0eb14d83d560 SHA256 64cf13bffbd79efdcb5c6d991acd13a56b70ea4e0dfe43ed9dad6d03404c9f71
+EBUILD pythoncgns-2009.10.30.ebuild 548 RMD160 96a92f98bced0c842a2c2382e0f9981b0df1ec54 SHA1 4fd6a182a39ed12326e5553cc13bc103958c61c7 SHA256 eebb70ca36f57c224cb15f78969f1a01a57eebf22a144f5e8b8f80042b71d75c
+MISC ChangeLog 541 RMD160 715f2d0197f1c82676b8c98317f6b6f22ed789c6 SHA1 f215cd2772ffa2d02a6e27583a6998d6996a12b7 SHA256 693f3e8d6e12fddc301d09f44aaf4f354d848e23970d81081e7a183099cd49ea
MISC metadata.xml 157 RMD160 ed43b99e7bf8bbf62cf4e46152138ab42d3a88c5 SHA1 2182a6de0b10959aad51af2990f1a6c69e34dd97 SHA256 750cb9e46ac2b77e1adf73de43c186a8c2d2234a9c6a89d9358d0969dc5cf8ac
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAkwl/QcACgkQgAnW8HDreRaMZACfcC+NZIRCV+hhhVqMzoccEpok
-enYAnjbnt0KQpW1hM9G8vca4wcjnqasG
-=3dDi
+iEYEAREIAAYFAk4F7X8ACgkQgAnW8HDreRZOGACfWpn6NP9zc6oO/UclIvkE1HdU
+K5gAn3792jcB5EnJcvF437PdfwA09+lD
+=a58v
-----END PGP SIGNATURE-----
diff --git a/dev-python/pythoncgns/pythoncgns-2009.10.30.ebuild b/dev-python/pythoncgns/pythoncgns-2009.10.30.ebuild
index 87a505192..adbb3339d 100644
--- a/dev-python/pythoncgns/pythoncgns-2009.10.30.ebuild
+++ b/dev-python/pythoncgns/pythoncgns-2009.10.30.ebuild
@@ -1,22 +1,21 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=2
+EAPI=3
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
+PYTHON_MODNAME="CGNS"
inherit distutils
-PYTHON_MODNAME="CGNS"
-
MY_PN="CGNS"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Python language bindings for the CGNS library"
-HOMEPAGE="http://pypi.python.org/pypi/CGNS"
-SRC_URI="http://pypi.python.org/packages/source/C/${MY_PN}/${MY_P}.tar.gz"
+HOMEPAGE="http://pypi.python.org/pypi/CGNS/"
+SRC_URI="mirror://pypi/C/${MY_PN}/${MY_P}.tar.gz"
LICENSE="GPL-3"
KEYWORDS="~amd64 ~x86"
diff --git a/dev-python/ufl/Manifest b/dev-python/ufl/Manifest
index 9f8a21477..2df9ff8c6 100644
--- a/dev-python/ufl/Manifest
+++ b/dev-python/ufl/Manifest
@@ -1,3 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
DIST ufl-0.5.4.tar.gz 204883 RMD160 7acd9b3883afb3d22a47cf2a4b913c24e9580328 SHA1 7a2f541f9f784014786e7b844aec3c92eb90b00a SHA256 fc032d7a011406764ca3c466d194cfcf7ba165292e1a9da471cde7519ce1a960
EBUILD ufl-0.5.4.ebuild 492 RMD160 87f6bfe90e389f43456c412d383f2c34a4d93200 SHA1 94999fe01e1fd42c9bac68099f107c04b955117a SHA256 c2b5a2ea5a5c96198c5141935853bd9b98a4cb06c22af66037c75bc445fe1493
+MISC ChangeLog 253 RMD160 1d79b4690bc6b2d82de2c37b5cc15f335f6b4547 SHA1 4c4c2c6bbf2c048558c8927c892799378597aec0 SHA256 517250bdaeecf88732d49d835f58ed58a0e9b96e271e65451971ef3611d3148c
MISC metadata.xml 504 RMD160 5c7a494cbbeb2be0b58ba7b2b099d59886fc571b SHA1 a415709423532fc7cb8eee3eb5270f03719cd9eb SHA256 82f312f9482ae938ff788d44dd4bff092f31fa4b516f1cfcbb1510cae9859f20
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4EwCUACgkQgAnW8HDreRY0wgCgxuKlThruJcGLxxLBvXRtD1Ev
+vSMAn3jmf8kygO8LgDFEvNWgTedH2zXS
+=4pzz
+-----END PGP SIGNATURE-----
diff --git a/dev-python/viper/Manifest b/dev-python/viper/Manifest
index 136793b4d..a60c88a33 100644
--- a/dev-python/viper/Manifest
+++ b/dev-python/viper/Manifest
@@ -1,3 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
DIST viper-0.4.6.tar.gz 185997 RMD160 548adcb94db3ab1a1cd12ca1fa6f43c8cb3283b7 SHA1 3618763387c803f4b732eff9f9b1fa3ec54d04e9 SHA256 11a21044f9fcd02e50153e5d9895c41f39ef0dd57b5b074e5fe12923db37cf44
EBUILD viper-0.4.6.ebuild 484 RMD160 27a2fb16e40f472bc509b4f9ce663f3ed20bf820 SHA1 bb26c5dee5f98d616a1f2df24ecb3bdbaf71fd97 SHA256 bfee9fde85465355ace006b547661e4a81fa32cbcc45844a22f5df505ace53d4
+MISC ChangeLog 259 RMD160 cae319e92e233e6868ad7e1f99bbf853f6d35250 SHA1 4e6c71e0ed92db2d6c53d3e9a437a9d1d2f14f85 SHA256 8c249808a83c6917c696ad4bdb05a358b09c41096a787859805e452f73221d84
MISC metadata.xml 345 RMD160 5bc97a9cb5bc6497da0268bccb3ac4eda90dacef SHA1 b6ec4ca8dc5ea51e379591ef478cd1bff3da5582 SHA256 99997559a34647b667fc4457f683615ceb68a03a84aa97879c231b5b8bdb02f3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4EwBEACgkQgAnW8HDreRZAMgCfYl5Ef3eD10VVLduAhD92VqAX
+Zk4AnRsK9E1hU83PVfhoWcTpPzsHrEi4
+=kNMh
+-----END PGP SIGNATURE-----
diff --git a/dev-util/smartgit/ChangeLog b/dev-util/smartgit/ChangeLog
index 46567e0c2..9a64eb821 100644
--- a/dev-util/smartgit/ChangeLog
+++ b/dev-util/smartgit/ChangeLog
@@ -1,7 +1,10 @@
# ChangeLog for dev-util/smartgit
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 25 Jun 2011; Justin Lecher <jlec@gentoo.org> metadata.xml:
+ Fixed herd entry in metadata.xml
+
*smartgit-1.0.2 (10 Jan 2010)
10 Jan 2010; Justin Lecher (jlec) <jlec@j-schmitz.net>
diff --git a/dev-util/smartgit/Manifest b/dev-util/smartgit/Manifest
index 355a24219..2bcfb3f36 100644
--- a/dev-util/smartgit/Manifest
+++ b/dev-util/smartgit/Manifest
@@ -3,12 +3,12 @@ Hash: SHA1
DIST smartgit-generic-1_0_2.tar.gz 5641079 RMD160 01eaa9ffeea3c316618f6fe44e76a0e1e1f10a14 SHA1 ab7e822d867b7e28e5092ad56965ab76d1ccef5c SHA256 ec2fad2c9dc798cb29d5070e10bb4e369c6ff2f8a54ef1f181cc9258eaac0d6a
EBUILD smartgit-1.0.2.ebuild 1092 RMD160 1b773ef75435bdaf4c7a8d8cdb7d21d55a7568d5 SHA1 24a4150dbef05b6cdb6ff201ac53747134a2e50a SHA256 7bff97c0afbddc844c0ffe6bf1bd98661fabe0c49d1db05fcf2c80468b55ff26
-MISC ChangeLog 1944 RMD160 26b0d84b0e78110d5c0e18f736cf7c1b68ef49f4 SHA1 b8e51b1a05fbaa1cee77a8ef24a60ef4c59f8b5e SHA256 3c4701bcea077f53b661d7d60bb9945ad8d096450798b11699af4a3c304d4470
-MISC metadata.xml 263 RMD160 29af7f646812a941362d89c0ee9566150df25b5b SHA1 8d5988faa6a2e1b34ca739895d1b425ddafcb32e SHA256 1a4b794f9b03c548e77abf998b34c58b16e852d255bf0322f34b48554c003c30
+MISC ChangeLog 2041 RMD160 f383fc1ecfcb674c5c66e7a6133a3edbbbacfa4d SHA1 8cf686bf8d381d2a36909ee0da2067fa8c73658e SHA256 e2c12b110fecdc0a3482314f7a0e3d3f3cd7a3b0517edeccedff4a0fa59c6c95
+MISC metadata.xml 253 RMD160 b3738dd03dc120c9a1a32d708aa149103a0d7b1b SHA1 6300563e9ab32e6b910d2d16fcfd78bcb1ace5b0 SHA256 7063247dbeb973b818df14c75931ab1a18682bc0c480e11703dc6178155691e8
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
-iEUEARECAAYFAktJnFsACgkQgAnW8HDreRYe0ACgwNbZfxQKvVX/tFGRzcKL1UnP
-zDYAmMjOHI4HEtuYbOGTCbralTc8bpk=
-=nP4d
+iEYEARECAAYFAk4FkXMACgkQgAnW8HDreRYKvQCeLG8m6EKqGyq5nZRx8PhET1zp
+0dsAoKuEdLKmSir1Tf5ymx2/QFhnDVs3
+=RpBp
-----END PGP SIGNATURE-----
diff --git a/dev-util/smartgit/metadata.xml b/dev-util/smartgit/metadata.xml
index ede0c5e35..bb9c2dc3f 100644
--- a/dev-util/smartgit/metadata.xml
+++ b/dev-util/smartgit/metadata.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>maintainer-wanted</herd>
+ <herd>no-herd</herd>
<longdescription>SmartSVN is a powerful GUI SVN client written in Java</longdescription>
</pkgmetadata>
diff --git a/eclass/fortran-2.eclass b/eclass/fortran-2.eclass
deleted file mode 100644
index b812f507c..000000000
--- a/eclass/fortran-2.eclass
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# Author Justin Lecher <jlec@gentoo.org>
-# Test functions provided by Sebastien Fabbro and Kacper Kowalik
-
-# @ECLASS: fortran-2.eclass
-# @MAINTAINER:
-# jlec@gentoo.org
-# sci@gentoo.org
-# @BLURB: Packages, which need a fortran compiler should inherit this eclass.
-# @DESCRIPTION:
-# If you need a fortran compiler, inherit this eclass. This eclass tests for
-# working fortran compilers and exports the variables FC and F77.
-# Optional, it checks for openmp capability of the
-# current fortran compiler through FORTRAN_NEED_OPENMP=1.
-# Only phase function exported is pkg_pretend and pkg_setup.
-# Need help? Ask the sci team.
-
-# @ECLASS-VARIABLE: FORTRAN_NEED_OPENMP
-# @DESCRIPTION:
-# Set FORTRAN_NEED_OPENMP=1 in order to test FC for openmp capabilities
-#
-# Default is 0
-
-# @ECLASS-VARIABLE: FORTRAN_STANDARD
-# @DESCRIPTION:
-# Set this, if a special dialect needs to be support. Generally not needed.
-#
-# Valid settings are any combination of
-#
-# FORTRAN_STANDARD="77 90 95 2003"
-#
-# Defaults to FORTRAN_STANDARD="77" which is sufficient for most cases.
-
-inherit toolchain-funcs
-
-DEPEND="virtual/fortran"
-RDEPEND="${DEPEND}"
-
-# internal function
-#
-# FUNCTION: _write_testsuite
-# DESCRIPTION: writes fortran test code
-_write_testsuite() {
- local filebase=${T}/test-fortran
-
- # f77 code
- cat <<- EOF > "${filebase}.f"
- end
- EOF
-
- # f90/95 code
- cat <<- EOF > "${filebase}.f90"
- end
- EOF
-
- # f2003 code
- cat <<- EOF > "${filebase}.f03"
- procedure(), pointer :: p
- end
- EOF
-}
-
-# internal function
-#
-# FUNCTION: _compile_test
-# DESCRIPTION:
-# Takes fortran compiler as first argument and dialect as second.
-# Checks whether the passed fortran compiler speaks the fortran dialect
-_compile_test() {
- local filebase=${T}/test-fortran
- local fcomp=${1}
- local fdia=${2}
-
- [[ -z ${fcomp} ]] && die "_compile_test() needs at least one argument"
-
- [[ -f "${filebase}.f${fdia}" ]] || _write_testsuite
-
- ${fcomp} "${filebase}.f${fdia}" -o "${filebase}-f${fdia}" >&/dev/null
- local ret=$?
-
- rm -f "${filebase}-f${fdia}"
- return ${ret}
-}
-
-# internal function
-#
-# FUNCTION: _fortran-has-openmp
-# DESCRIPTION:
-# See if the fortran supports OpenMP.
-_fortran-has-openmp() {
- local flag
- local filebase=${T}/test-fc-openmp
-
- cat <<- EOF > "${filebase}.f"
- call omp_get_num_threads
- end
- EOF
-
- for flag in -fopenmp -xopenmp -openmp -mp -omp -qsmp=omp; do
- $(tc-getFC "$@") ${flag} "${filebase}.f" -o "${filebase}" >&/dev/null
- local ret=$?
- (( ${ret} )) || break
- done
-
- rm -f "${filebase}"*
- return ${ret}
-}
-
-# internal
-#
-# FUNCTION: _die_msg
-# DESCRIPTION: Detailed description how to handle fortran support
-_die_msg() {
- echo
- eerror "Please install currently selected gcc version with USE=fortran."
- eerror "If you intend to use a different compiler then gfortran, please"
- eerror "set FC variable accordingly and take care that the neccessary"
- eerror "fortran dialects are support."
- echo
- die "Currently no working fortran compiler is available"
-}
-
-# @FUNCTION: fortran-2_pkg_pretend
-# @DESCRIPTION:
-# Setup functionallity, checks for a valid fortran compiler and optionally for its openmp support.
-fortran-2_pkg_pretend() {
- local dialect
-
- [[ -n ${F77} ]] || F77=$(tc-getFC)
-
- : ${FORTRAN_STANDARD:=77}
- for dialect in ${FORTRAN_STANDARD}; do
- case ${dialect} in
- 77) _compile_test $(tc-getF77) || _die_msg ;;
- 90|95) _compile_test $(tc-getFC) 90 || _die_msg ;;
- 2003) _compile_test $(tc-getFC) 03 || _die_msg ;;
- 2008) die "Future" ;;
- *) die "${dialect} is not a Fortran dialect." ;;
- esac
- done
-
- if [[ ${FORTRAN_NEED_OPENMP} == 1 ]]; then
- _fortran-has-openmp || \
- die "Please install current gcc with USE=openmp or set the FC variable to a compiler that supports OpenMP"
- fi
-}
-
-# @FUNCTION: fortran-2_pkg_setup
-# @DESCRIPTION:
-# In EAPI < 4 it calls the compiler check. This behavior is deprecated
-# and will be removed at 01-Sep-2011. Please migrate to EAPI=4.
-#
-# Exports the FC and F77 variable according to the compiler checks.
-fortran-2_pkg_setup() {
- if has ${EAPI:-0} 0 1 2 3; then
- ewarn "The support for EAPI=${EAPI} by the fortran-2.eclass"
- ewarn "will be end at 01-Sep-2011"
- ewarn "Please migrate your package to EAPI=4"
- fortran-2_pkg_pretend
- fi
- [[ -n ${F77} ]] || export F77=$(tc-getFC)
- [[ -n ${FC} ]] || export FC=$(tc-getFC)
-}
-
-case "${EAPI:-0}" in
- 1|2|3) EXPORT_FUNCTIONS pkg_setup ;;
- 4) EXPORT_FUNCTIONS pkg_pretend pkg_setup ;;
- *) die "EAPI=${EAPI} is not supported" ;;
-esac
diff --git a/media-gfx/brlcad/ChangeLog b/media-gfx/brlcad/ChangeLog
deleted file mode 100644
index 7acefecd6..000000000
--- a/media-gfx/brlcad/ChangeLog
+++ /dev/null
@@ -1,89 +0,0 @@
-# ChangeLog for media-gfx/brlcad
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/brlcad/ChangeLog,v 1.2 2011/03/27 19:06:12 dilfridge Exp $
-
- 18 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- -brlcad-7.18.4.ebuild, metadata.xml:
- Moved to tree, updated metadata
-
-*brlcad-7.18.2 (27 Mar 2011)
-
- 15 Apr 2011; Dongxu Li <dongxuli2011@gmail.com> brlcad-7.18.4.ebuild:
- Added dev-tcltk/tkpng to RDEPENDS, #363251. Added itk3.4, itcl3.4 to LDPATH
-
- 12 Apr 2011; Dongxu Li <dongxuli2011@gmail.com> +brlcad-7.18.4.ebuild:
- Version bump to 7.18.4
-
- 27 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- +brlcad-7.18.2.ebuild:
- Version bump
-
- 27 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
- +brlcad-7.16.8.ebuild, +metadata.xml:
- Moved from sci-misc to media-gfx
-
- 18 Jun 2010; Sébastien Fabbro <bicatali@gentoo.org>
- -brlcad-7.16.6-r1.ebuild, -files/brlcad-7.16.6-as-needed.patch,
- -files/brlcad-7.16.6-stl-headers.patch, brlcad-7.16.8.ebuild:
- Now X is forced (does not build without), itcl/itk paths removed from
- ebuild. Switched to EAPI3.
-
-*brlcad-7.16.8 (26 May 2010)
-
- 26 May 2010; Sébastien Fabbro <bicatali@gentoo.org>
- +brlcad-7.16.8.ebuild:
- Version bump
-
- 09 Mar 2010; Sébastien Fabbro <bicatali@gentoo.org>
- brlcad-7.16.6-r1.ebuild:
- Get the LDPATH right, bug #307867
-
-*brlcad-7.16.6-r1 (03 Mar 2010)
-
- 03 Mar 2010; Sébastien Fabbro <bicatali@gentoo.org>
- -brlcad-7.16.6.ebuild, +brlcad-7.16.6-r1.ebuild, metadata.xml:
- Added benchmarks which can be run if the tests are enabled. Added a
- desktop entry, and itk/itcl library path to the LDPATH environment
-
- 28 Feb 2010; Sébastien Fabbro <bicatali@gentoo.org> brlcad-7.16.6.ebuild:
- Filtered -Werror, still creating problems (bug #307061)
-
- 26 Feb 2010; Sébastien Fabbro <bicatali@gentoo.org> brlcad-7.16.6.ebuild:
- Enabling debug by default, following bug #306841
-
-*brlcad-7.16.6 (25 Feb 2010)
-
- 25 Feb 2010; Sébastien Fabbro <bicatali@gentoo.org>
- +brlcad-7.16.6.ebuild, +files/brlcad-7.16.6-as-needed.patch,
- +files/brlcad-7.16.6-stl-headers.patch, +metadata.xml:
- Version bump and moved to the main tree
-
- 04 Feb 2010; Sébastien Fabbro <bicatali@gentoo.org> brlcad-7.16.4.ebuild:
- Changed man directory to avoid conflicts
-
-*brlcad-7.16.4 (02 Feb 2010)
-
- 02 Feb 2010; Sébastien Fabbro <bicatali@gentoo.org>
- -brlcad-7.10.4.ebuild, +brlcad-7.16.4.ebuild,
- +files/brlcad-7.16.4-as-needed.patch,
- -files/brlcad-tcltk-man_install.patch:
- Version bump. Rewrote from scratch
-
- 24 Aug 2008; Tim Cera <timcera@earthlink.net> brlcad-7.10.4.ebuild:
- * The BDL (BSD Documentation License) was for content on their wiki. Removed
- from software licenses. * Changed the copyright year to 2008.
-
- 19 Dec 2007; Sébastien Fabbro <bicatali@gentoo.org>
- -files/brlcad-7.6.6-gentoo.diff, +files/brlcad-tcltk-man_install.patch,
- -files/tcl.m4, -brlcad-7.6.6.ebuild, +brlcad-7.10.4.ebuild:
- Version bump
-
- 26 January 2006; Lucas Chiesa <lucas.chiesa@gmail.com> brlcad-7.6.6.ebuild:
- Added brlcad-7.6.6-gentoo.diff which replaces the entire test for
- tcl/tk/itcl/iwidgets in configure.ac. It needs some more work.
-
-*brlcad-7.6.6 (19 January 2006)
-
- 19 January 2006; Marcus D. Hanwell <cryos@gentoo.org>
- +brlcad-7.6.6.ebuild:
- Initial import into the science overlay, bug 77197.
diff --git a/media-gfx/brlcad/Manifest b/media-gfx/brlcad/Manifest
deleted file mode 100644
index d549db31e..000000000
--- a/media-gfx/brlcad/Manifest
+++ /dev/null
@@ -1,22 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-MISC ChangeLog 3362 RMD160 377e15a8be7cff8aef7f00aeeb415bb7da639b3a SHA1 03bdc48741f0f51f7036d9380d66d7c240c0ba35 SHA256 a20e27a70c94ab94db0c09a068bf3eeacbbdffba981ace961fa3c8a9aec27f57
-MISC metadata.xml 1379 RMD160 7407a87496226206896ad41f07cbf1b4900faf05 SHA1 6fb2b9de93b48435f93a968de325d1b483160a63 SHA256 0374773ad63ea0e195813d44eeca951b9b756a73ad1fe034499532aef7e6078d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJNrMC6AAoJENwGBM22xffefRgP+wTNMfchcBhF8sObJGzZ/Tu1
-Qbp0+whWgsIGu5qEt5SwUonCnYOWTu/72Ipv43UkWoRDNvTpIR4CagZEFON9rBYe
-mJ0NTLL3OWDAnSQx5w7mZqSjjqIqgQ1WonKGjrsf+3aRXuXsKyqDokH9ASyC/Nrd
-CWbUidn6Ufr0PbuozlDynlZo7rDCOw5W+lEh/VatW6BrNx4AIYIKVaM7f3/tTWws
-i4IZbXVLeOXTgyf/LgZFslmHPYxW30VyqlzOHF0w3aOVdXPh5wEkMFnYyUGEtBBT
-GJzGbNgNPTVITopw2SrAQPGPDWOGgJHQExQcvbGaol78u1oj8YYlngiMhL7Fo97Z
-RfnuRvPqOKcz1LFUhbcSn3910IURhHAbGnzgQYQjbvRb44STFW8iS3DxzWVzZUC0
-LAIgGO7mbW87vDaIhkCjhZOqs7fAli7TM2yPc+xwK62KMx7T6dbT8lko7gcS4Jbv
-THX2jp/NiH9AelpGdLhRnC2K5PpKIUj1lrmO6kveDEuQMIaIlXf5dQEUh70/IFqn
-kXfCX+KM2ZaaPeWEKjyZzwVvNuF57GGf/DRBt+bB5Heqh4aOnOGnrEwT18hB0L20
-PoPqtVgz5QHci5a+n9C67Yk8dntbtZrtZbhHXAwexCxJKaGqsSh/PF/KhzDEp2rE
-gAEYtuIJgpSs7xknBtbn
-=CDtq
------END PGP SIGNATURE-----
diff --git a/media-gfx/brlcad/metadata.xml b/media-gfx/brlcad/metadata.xml
deleted file mode 100644
index cd8783ffa..000000000
--- a/media-gfx/brlcad/metadata.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>sci</herd>
-<maintainer>
- <email>dongxuli2011@gmail.com</email>
- <description>please assign bugs</description>
-</maintainer>
-<maintainer>
- <email>dilfridge@gentoo.org</email>
- <description>proxy-maintainer, please cc on bugs</description>
-</maintainer>
-<longdescription lang="en">
- BRL-CAD is a Combinatorial/Constructive Solid Geometry (CSG)
- solid modeling system that includes an interactive geometry editor,
- ray-tracing support for rendering and geometric analysis,
- network-distributed framebuffer support, image and signal-processing
- tools, and an embedded scripting language.
-
- The package is a collection of over 400 tools and utilities. Included
- is support for various geometric data format conversions, image and
- signal processing capabilities, ray-tracing based lighting models,
- network distributed ray-tracing, parallel ray-tracing, animation
- capabilities, data compression, image handling, and interactive 3-D
- geometric editing, and also an implementation of Weiler's n-Manifold
- Geometry (NMG) data structures for surface-based solid models and
- photon mapping.
-</longdescription>
-<use>
- <flag name="benchmarks">
- Run benchmarks during test phase (need test option enabled)
- </flag>
-</use>
-</pkgmetadata>
diff --git a/media-gfx/librecad/ChangeLog b/media-gfx/librecad/ChangeLog
index dbaf87f6c..c9a2f7e6c 100644
--- a/media-gfx/librecad/ChangeLog
+++ b/media-gfx/librecad/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header$
+ 24 Jun 2011; Justin Lecher <jlec@gentoo.org> librecad-1.0.0_beta5.ebuild,
+ librecad-1.0.0_rc1.ebuild, librecad-9999.ebuild:
+ Sort inherit and/or USE
+
+ 19 Jun 2011; Dongxu Li <dongxuli2011@gmail.com> +librecad-1.0.0_rc1.ebuild:
+ Version bump to 1.0.0rc1
+
09 Jun 2011; Dongxu Li <dongxuli2011@gmail.com> +librecad-1.0.0_beta5.ebuild:
added tagged version 1.0.0beta5
diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index b28d89239..b288f2289 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -1,4 +1,15 @@
-EBUILD librecad-1.0.0_beta5.ebuild 1026 RMD160 51fcc8a3ea196ebecea814a02cc01eca466e4ed7 SHA1 cb8e1c7f825daacb19fcd40401f4c41690ca4df3 SHA256 dfa8d18c0e22447719eb425a4ae6387c0feb6773f53ad75bbb93813d4caf7f61
-EBUILD librecad-9999.ebuild 996 RMD160 d9ce7fa7f930871a46f7e0f59f6ea0743a6b4261 SHA1 65afe6bae17430931f2c36bd5f2c95eaaf62a2ff SHA256 9042a2a97a40b4ed23c4a9649c263600988a1f660e6a84854f0198ceb2f0de04
-MISC ChangeLog 478 RMD160 0b3a74f5b4bc5cba8bf6d8b5db0a4364c2ca3dbd SHA1 7c25225e00f2195724979643314874245757a6df SHA256 2eec70764f6409ef93c4efb58849f8248773c6fd40bd77313420e0628f02fd8b
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+EBUILD librecad-1.0.0_beta5.ebuild 1026 RMD160 6f3911c70fa4fb9d7c567c59461043703f6361a9 SHA1 ecf63cbc86357ad8d4aab725069c781c0aa4c5a8 SHA256 8bf33da124d924a17e2de727107ecc582efe75c4f09569d32e873effa360f2fa
+EBUILD librecad-1.0.0_rc1.ebuild 1022 RMD160 65a83ae087ec90c8737157cc3f94628e18a5f2b1 SHA1 65e9382cf7a3df13685a9c345f96c2f066d13344 SHA256 ebabd9d622e584ac3ce9921469cb233c4d2e222d9ef75db3b5c299f6153701da
+EBUILD librecad-9999.ebuild 996 RMD160 0c8e171707187f72a1a224a54649849860a74b06 SHA1 9e51d3ecf5b30329f2b819aef6c9cc98244f80b9 SHA256 dfdd97f8b96ff41a38295544ed7272e6fd93604a8c566ef481391e50f5a47808
+MISC ChangeLog 738 RMD160 8da5b642c518fbe646a1c47aff41d7d9dc463e62 SHA1 588c5f947c13ce5d85745775a97d27cb1a602f4e SHA256 bac2883e23376c1fe285f0bd031be01619000e0d5fccd32b1456727a7371f5c2
MISC metadata.xml 450 RMD160 62a6501cecfe47078279b48be9b1c658d40e59f9 SHA1 c4ea83204f0d636b89b362f43aa2f5f487b9d9c7 SHA256 891d496161866e9f329036a1a953bd667d7be70de7cb1da41eadbb4be21c7df8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4Ef3EACgkQgAnW8HDreRb+HgCgoFGcMZjQ5lhkiUrHOwzd1qgr
+1EIAn2XOqwdR11leoq6+YmCzzKDweMyC
+=21U1
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/librecad/librecad-1.0.0_beta5.ebuild b/media-gfx/librecad/librecad-1.0.0_beta5.ebuild
index 7e7e71d1d..2830384a5 100644
--- a/media-gfx/librecad/librecad-1.0.0_beta5.ebuild
+++ b/media-gfx/librecad/librecad-1.0.0_beta5.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI="3"
-inherit qt4-r2 git-2
+inherit git-2 qt4-r2
DESCRIPTION="An generic 2D CAD program"
HOMEPAGE="http://www.librecad.org/"
diff --git a/media-gfx/librecad/librecad-1.0.0_rc1.ebuild b/media-gfx/librecad/librecad-1.0.0_rc1.ebuild
new file mode 100644
index 000000000..19fe1248e
--- /dev/null
+++ b/media-gfx/librecad/librecad-1.0.0_rc1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+inherit git-2 qt4-r2
+
+DESCRIPTION="An generic 2D CAD program"
+HOMEPAGE="http://www.librecad.org/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc"
+
+EGIT_REPO_URI="https://github.com/LibreCAD/LibreCAD.git"
+EGIT_COMMIT="${PV/_rc/rc}"
+
+RDEPEND="x11-libs/qt-gui[qt3support]"
+DEPEND="${RDEPEND}
+ x11-libs/qt-assistant:4
+ x11-libs/qt-qt3support:4
+"
+
+src_prepare()
+{
+# patch to solve an issue caused by gcc-4.6, by mickele, archlinux
+ sed -e "s|LiteralMask<Value_t, n>::mask;|LiteralMask<Value_t, static_cast<unsigned int>(n)>::mask;|" \
+ -e "s|SimpleSpaceMask<n>::mask;|SimpleSpaceMask<static_cast<unsigned int>(n)>::mask;|" \
+ -i fparser/fparser.cc
+}
+
+src_install()
+{
+ dobin unix/librecad
+ insinto /usr/share/"${PN}"
+ doins -r unix/resources/*
+ if use doc ; then
+ dohtml -r support/doc/*
+ fi
+ doicon res/main/"${PN}".png
+ make_desktop_entry "${PN}" LibreCAD "${PN}.png" Graphics
+}
diff --git a/media-gfx/librecad/librecad-9999.ebuild b/media-gfx/librecad/librecad-9999.ebuild
index e0c605de1..1d3197adc 100644
--- a/media-gfx/librecad/librecad-9999.ebuild
+++ b/media-gfx/librecad/librecad-9999.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI="3"
-inherit qt4-r2 git-2
+inherit git-2 qt4-r2
DESCRIPTION="An generic 2D CAD program"
HOMEPAGE="http://www.librecad.org/"
diff --git a/net-firewall/gcb/ChangeLog b/net-firewall/gcb/ChangeLog
index fd9bfd2e6..bed3dabb1 100644
--- a/net-firewall/gcb/ChangeLog
+++ b/net-firewall/gcb/ChangeLog
@@ -1,7 +1,10 @@
# ChangeLog for net-firewall/gcb
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 24 Jun 2011; Justin Lecher <jlec@gentoo.org> gcb-1.5.6.ebuild:
+ Sort inherit and/or USE
+
*gcb-1.5.6 (23 Oct 2009)
23 Oct 2009; Sébastien Fabbro <bicatali@gentoo.org> +gcb-1.5.6.ebuild,
diff --git a/net-firewall/gcb/Manifest b/net-firewall/gcb/Manifest
index dd3512a33..198a48086 100644
--- a/net-firewall/gcb/Manifest
+++ b/net-firewall/gcb/Manifest
@@ -1,5 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+- -----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX gcb-1.5.6-shared.patch 4503 RMD160 9c7b263987e2c88d52f8776f87a2f32a6a67f4e0 SHA1 dc84e989ee01b6e98f9b06f7a0f09572d799a02c SHA256 538dcdba63a891137bef77a69c58208cf56e102c2c3e9185f99baf206029acf6
DIST gcb-1.5.6.tar.gz 1326341 RMD160 2cbdd3596ebb521d62e873a55c722c7c14165724 SHA1 229191a7924468ee453956f807b9d2b1ca26df35 SHA256 315ac4f325060d7df7ae03361d959151619cb308841207322cc2bd91193054bb
-EBUILD gcb-1.5.6.ebuild 702 RMD160 5a67e5e0a98569d93b4ca3244c40dbf5cf25c5de SHA1 4db56fe352b310a94dd47b80378249d2e6e56a16 SHA256 dde603e802913522936877f247bbe9e1ef941da8e2737d5423afe84c8a6822bf
-MISC ChangeLog 302 RMD160 08a5acbcc6c3642c3b5c371ae323d089d152fd88 SHA1 71e9f84f2bf3a1c156d6ec470a37d8489e1f47f4 SHA256 cda30df31ccec034b37143a26c690b18f8b1824ba87774680824e5e8aea1ccc0
-MISC metadata.xml 617 RMD160 38736667fdb338f050bdd626bca46ba439425f82 SHA1 97153fb49e53fbfa1e42dbe1a19066483d48bfc9 SHA256 975d6074d71c61a5c39c46ca6f180102bfbcea670ab86ef6a53bdcd0fd7e1450
+EBUILD gcb-1.5.6.ebuild 633 RMD160 c7571590606fa99303682ea4d51a6f8c4a192ac8 SHA1 3bfcb8b0ce67090bbd946d2ee7c2025aa6a8b597 SHA256 2ff9a5d213144ccc4fb2dc1e270caa2dbdb577057e24984b3183edfebf474d4a
+MISC ChangeLog 394 RMD160 67f7590a153d3ce5c3af3cb5fc7bbea811b48817 SHA1 7d3b11a41f3774f0188c7e00cdc2728197dcc771 SHA256 961413bbaddb149723fb51f69c330d3167a1f9d8ea2094eef959953f980bcb2c
+MISC metadata.xml 624 RMD160 9e0cbef58198611205cd4e7376dd2d476659522f SHA1 31a8ab7bcd92e11f28d04f57ca69153a9db848c2 SHA256 8de842f610526030ecf12c2b9b8574cd2aa2480d2fe92454c38775310b846d37
+- -----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4Ewa0ACgkQgAnW8HDreRYiGQCeM1c9FaVswjzbgObfWDchdGUY
+dCkAnA7WZNCL7AzLtLXwTykIY20IJQlo
+=+2rx
+- -----END PGP SIGNATURE-----
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4ExHsACgkQgAnW8HDreRZprACdHid6rRqlDVARgQ3a/M7sqAES
+D90AoNFQ60RDGF6hSrx0T8T7czZmAy23
+=54ym
+-----END PGP SIGNATURE-----
diff --git a/net-firewall/gcb/gcb-1.5.6.ebuild b/net-firewall/gcb/gcb-1.5.6.ebuild
index 50d3117d8..2f780fc2d 100644
--- a/net-firewall/gcb/gcb-1.5.6.ebuild
+++ b/net-firewall/gcb/gcb-1.5.6.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=2
+EAPI=4
-inherit eutils autotools
+inherit autotools eutils
DESCRIPTION="Generic Connection Brokering for communications over firewall/NAT"
HOMEPAGE="http://www.cs.wisc.edu/condor/gcb"
@@ -15,19 +15,16 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc"
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
src_prepare() {
epatch "${FILESDIR}"/${P}-shared.patch
eautoreconf
}
src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
+ emake DESTDIR="${D}" install
dodoc AUTHORS ChangeLog NOTICE.txt doc/protocol.txt
if use doc; then
insinto /usr/share/doc/${PF}
- doins doc/*.pdf || die
+ doins doc/*.pdf
fi
}
diff --git a/net-firewall/gcb/metadata.xml b/net-firewall/gcb/metadata.xml
index 0c28ccc79..ad33ad20b 100644
--- a/net-firewall/gcb/metadata.xml
+++ b/net-firewall/gcb/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>hp-cluster</herd>
-<maintainer>
- <email>bicatali@gentoo.org</email>
-</maintainer>
-<longdescription lang='en'>
+ <herd>cluster</herd>
+ <maintainer>
+ <email>bicatali@gentoo.org</email>
+ </maintainer>
+ <longdescription lang="en">
Generic Connection Brokering (GCB) is a firewall/NAT traversal
solution that enables communications over firewall/NAT. It consists
of daemon processes and a communication library that is supposed to
diff --git a/net-ftp/bbftp-server/ChangeLog b/net-ftp/bbftp-server/ChangeLog
index 2bef0fdf8..b73e12c55 100644
--- a/net-ftp/bbftp-server/ChangeLog
+++ b/net-ftp/bbftp-server/ChangeLog
@@ -1,7 +1,10 @@
# ChangeLog for net-ftp/bbftp-server
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 24 Jun 2011; Justin Lecher <jlec@gentoo.org> bbftp-server-3.2.0.ebuild:
+ Sort inherit and/or USE
+
23 Jun 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
bbftp-server-3.2.0.ebuild:
QA fixes
diff --git a/net-ftp/bbftp-server/Manifest b/net-ftp/bbftp-server/Manifest
index a0ce6b79e..506a5b6b1 100644
--- a/net-ftp/bbftp-server/Manifest
+++ b/net-ftp/bbftp-server/Manifest
@@ -4,23 +4,13 @@ Hash: SHA1
AUX 3.2.0-deffixes.patch 2028 RMD160 761794d87412845bb33bd5e595f2350f4aed4385 SHA1 5a0c0d867df6d2ab8778b1a134f8dcb26980a78f SHA256 39cd0800cae958708fa95b94cd30eaffaaeaa5d28c530d5c9c23e35f7d8e03ef
AUX bbftpd.init.d 698 RMD160 dc9f9976ff02e2de1e7c37eb0f2ffc21fc4ad65a SHA1 9793f3d17555508b0aa08b2e1e2b986f46b6ca5e SHA256 e7b81c6034f8298ea2fd232338c1f309d3554a76f1dff8d8c1658eefcebe5163
DIST bbftp-server-3.2.0.tar.gz 222600 RMD160 a6c8a79f8bf06dc7674331168a9bf705029edd12 SHA1 dc599051ed69093caaed029e1a0c28614f7f080d SHA256 04fbe472dc4c39f5b3e82520c08a084e8c4fd5301242c6bbb934d6984013b8ff
-EBUILD bbftp-server-3.2.0.ebuild 1215 RMD160 c1e253df025d07f2ce7d2b329a7f11f285f58a00 SHA1 41fbd9acc1ba5817257661205352c10b5ddeba5f SHA256 9ea52cfc79d639a2248599e407d68bff0ac51eb0653cf440cfab93c7980e25bc
-MISC ChangeLog 499 RMD160 641f3fc8ae7c16a848ad4ae46fb0ed939674e6f8 SHA1 28e55ad2d1eb88033a1eb34a377777c16bbc81ff SHA256 284ed64de2b6ef18f0676ee488707919086c0af67d0202df7e26aed74a31df12
+EBUILD bbftp-server-3.2.0.ebuild 1215 RMD160 cee41bf9efeec5917febc301ccd1df86891f4fad SHA1 ac941a5d23dbf57e6d6f45849331d1c6195a4c8b SHA256 f31e7b1d9945117577a384c6b0452df8dfd75b9d4fc0c4dcecd65abf67e3787f
+MISC ChangeLog 600 RMD160 1d4a0971a10887ec18865f2768a22550ab34fffb SHA1 39bc7068fbf8189bdecbf3e72c31b2c4081ed442 SHA256 048779ad4d73cd04408f909fee48624b57a909d9a18c00c9e1068bd4cd3c6f8b
MISC metadata.xml 417 RMD160 cee5a58bdcc8778dc746f29717bad69c6d6de8a3 SHA1 d846f619290fff9989b195e6f3a4a6b381b0a7d2 SHA256 7bd69c2ffa53bba43140b5019c71d571bc024d5abb1f9a3e5b638296333324df
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBAgAGBQJMIltaAAoJENwGBM22xffet3gP/1iVCjCv+f/jo7jWnj1B7OZD
-up4Y9v0YbBKm7o3UeEItVes3Vc/b7Jv/C6fGxzFZK684s4gqrLYm/BpiKXuuC7GP
-39oMkKPVqSGmXCefEByuPF/DDja1sN3fH1DIjDRghlRaQz8xHKshy2IrMGj4T4vr
-btYMTGUn057iGlgCh/w6VAoPiXe7zmzIBPzQdyoTHmr1qs8dwhUts67YTrlmqY89
-UWyUS/7BAMgs47QWf77bb7hmNFfP/IqAFuhGkR6xoFY6XWEVZlCaNjewwawlYdgf
-c6SB8/HpfrSx+i7ljmk/swdZM+h6gpmJSA6Lm4CqXuNinZtLDcPeyAdsYRIeqxmF
-MP7y/7bwdBX/VCnWzp9jgQVHUhrJJ5p8hqFFdYYdqNayPTA/RnqYCW3eWBDPgol3
-4jkU+ztUYLjjOK3kL4k3q2S1ab+tNvbHETGsvBEy2Mv0BHZ/X9POwdkbsDItE1rq
-THSDE2GzrozAvgXHzBGlB6Uu5+qqE3BGzenePItuCZBQyXEur47zXSkgoPaexcSs
-PMQ16MstbxBmGWaHd4I2VT0S+5RnBMZzugK0hcf8H4mG2Da1o3kYdvlVaJDelDxF
-+QZSUWlgnNa+fnDm2M4vLGpc5JP3KlTqoJV6fu27e2/PjWAdLNRqP2bNXR7jRyTR
-PKXKC3Gluzk+NmBTq0ul
-=Vn6P
+iEYEARECAAYFAk4EgN8ACgkQgAnW8HDreRbt2wCfT/vYe2dn7ALJPDFDQRC+RALY
+jxkAnAvuacZXueKW8dXYyWGtgn1iNnER
+=U9jk
-----END PGP SIGNATURE-----
diff --git a/net-ftp/bbftp-server/bbftp-server-3.2.0.ebuild b/net-ftp/bbftp-server/bbftp-server-3.2.0.ebuild
index 918134931..7035fa96c 100644
--- a/net-ftp/bbftp-server/bbftp-server-3.2.0.ebuild
+++ b/net-ftp/bbftp-server/bbftp-server-3.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -13,7 +13,7 @@ S="${WORKDIR}/${P}/bbftpd"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="ssl pam"
+IUSE="pam ssl"
DEPEND="ssl? ( dev-libs/openssl )"
RDEPEND="${DEPEND}"
diff --git a/net-misc/dhcp/ChangeLog b/net-misc/dhcp/ChangeLog
new file mode 100644
index 000000000..d743d0076
--- /dev/null
+++ b/net-misc/dhcp/ChangeLog
@@ -0,0 +1,11 @@
+# ChangeLog for net-misc/dhcp
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 25 Jun 2011; Justin Lecher <jlec@gentoo.org> dhcp-4.2.1_p1-r1.ebuild,
+ metadata.xml:
+ RDEPEND is not explicitly assigned -> fixed
+
+ 24 Jun 2011; Justin Lecher <jlec@gentoo.org> dhcp-4.2.1_p1-r1.ebuild:
+ Sort inherit and/or USE
+
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
new file mode 100644
index 000000000..84f8e2298
--- /dev/null
+++ b/net-misc/dhcp/Manifest
@@ -0,0 +1,45 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX dhcp-3.0-fix-perms.patch 485 RMD160 3857270dffed5feee95609aeb37d0c9ef8844945 SHA1 1217265a8a7f1416b781e9f79e8dfb8304268e6c SHA256 a805a60b36e148886887aebb797e80f642386b3e55ef4a0b5132f96a2877e018
+AUX dhcp-3.0-paranoia.patch 5366 RMD160 7c64e3dac5b07ff3859fcaa7a8b0e52a0c50446c SHA1 a30103c138e480766f84644fffb1d0897709c27d SHA256 a8db9eb98397a9c1b3a0de07fc107c39dc4f6a4a331d404fc6fcc4a8dbc7aeae
+AUX dhcp-3.0.2-gmake.patch 1872 RMD160 d2d41c0a7e002103d68605d2492bfe716bb2889e SHA1 f60c89233f06ca8554cd5cc9ed0301b597a724f7 SHA256 b2bbfc1d1f5b4d03ff3f53b3974ec32731e5f626de8f8d127328591e4c721215
+AUX dhcp-3.0.3-dhclient-dbus.patch 2774 RMD160 250582d89894a58a297786c4a6884b54219c4b6f SHA1 74760ca00712ff529e6b97457408515098563f88 SHA256 d70292c5b61648ba5970ab436429ced33e807bd6f68ba06dcd2b9d4073b02ea4
+AUX dhcp-3.0.3-dhclient-hostname.patch 523 RMD160 38c20bcc417822ae858626eb5d0eaf7e669c1ca0 SHA1 5d2c3a1da74a1d151c9fbf08e01e4545e989078c SHA256 57c09edd2bf48cd65745e3b14499f7f3c26d529f60fd2ab122887ae968e26bbd
+AUX dhcp-3.0.3-dhclient-metric.patch 7270 RMD160 04187868f66e03a62dafd31b4cdcdd2029283ce5 SHA1 1d726d1526ae97adbdf1b259bb55e05145060375 SHA256 7e5ace014ed55d7d4e90a6cdac7dec4842ea9d178bb19bf6cdccf295eba9da7d
+AUX dhcp-3.0.3-dhclient-mtu.patch 6413 RMD160 2517c7fe58d7dca95bdbdc80e96b6260cc205e56 SHA1 da342800bafee86726570aa0a5e4e3c8bd5f1371 SHA256 0a4bff3c4c44252125f66a3a4423f677465592b84a8f7f500bad9ba4e3b5cb06
+AUX dhcp-3.0.3-dhclient-no-down.patch 2332 RMD160 26d0c88534b71070e81c86c12b76a2b4ec7c9c2c SHA1 b2a00d46754414e937dc6c3d63a28b63b3b57ac9 SHA256 a5a67de79f6435d9bc4eeea416aff7a904ab567e5e8d75ecf34495bc9f2c5a44
+AUX dhcp-3.0.3-dhclient-ntp.patch 5862 RMD160 73d001b7b2df36cf84aba9db76a1753c8d423a7d SHA1 cc3db6430f07f956c2ad25ed00e47d468eef2600 SHA256 80ab30eee75fb03c099416c25f031d03744011a582e8940c73077d5ee587c1ee
+AUX dhcp-3.0.3-libdst.patch 322 RMD160 5216c754a912cfcfc65683afcf44dbe1a7871212 SHA1 804bab67ae06269336c51183d5ff1e8ba45c20b5 SHA256 68e9a081739736980c0ad834dfa6197f940982f53d4d16054715c0346b5b9eca
+AUX dhcp-3.0.3-no_isc_blurb.patch 3002 RMD160 d70f89e1763bfeb23ce8f09399426983df01f7c8 SHA1 99a9fe69988226d29ccc6c2dc745ffab9b66817c SHA256 09c451cd9667fc8effcecd640f4cbe8629d41f6abacf9d1f2f923aab1f6e0bbb
+AUX dhcp-3.0.4-dhclient-stdin-conf.patch 2176 RMD160 fae08899f6b57da3ec7ab0068e288bbdf2fbf2ae SHA1 c10c35dcf4a94f45f4bc98147a70e9dcf3f01dd5 SHA256 80141fe71e52774f1c7b1a02f2cbd49bc646f19753ceefc1c3605104df0cae5f
+AUX dhcp-3.0.5-bpf-nofallback.patch 1473 RMD160 1a5ece77cb481416935b0d2eea53e85dc4c4ee93 SHA1 d4cad638075a98606e07c633551c8a1d2f78f2e7 SHA256 b215c5ff4a282b475f28168250c05bbbc85e7c37e7af92616571d499b8c14da6
+AUX dhcp-3.1.0a1-dhclient-resolvconf.patch 10316 RMD160 183bedd1660bf5a5f9dc7d002199e76aec12341c SHA1 1e0332ea31cfdbe92f3053405587f08117de8f8b SHA256 112b2ed44aab92592eb3810c61ada7f30d9d01fe43b647667326972a37b412a1
+AUX dhcp-3.1.2_p1-CVE-2009-1892.patch 427 RMD160 fe7daa6834faa0f6078ef125525f6a2db0c05f37 SHA1 eb6dcedecef536f743e97e7d0b5eea0a08f5e55a SHA256 55bb136138b76d6fa9c9165b348fb2c6975b935b3bba72ea551fc8bcae4fcc9b
+AUX dhcp-3.1.3-dhclient-no-down.patch 2762 RMD160 bea58f58f745cbcee5d2d43f0dbabe54a1eaaafa SHA1 6ceb33afe42734b21b5ea91076b06c4fb4e9b81f SHA256 94c9dbe45063c6c600976ffab4c1fc9ac6f52f4e8077b5074f5142816ea626c4
+AUX dhcp-4.0-dhclient-ntp.patch 7966 RMD160 d6dd1c3363f06712a82231eae1eb559f5a45bbb5 SHA1 3c1b373c6649c1ccb44f205fbee116c134514f4e SHA256 e93bda7f2baae9163f96ab0408bfbe885caa96a8698f9e566b8a9dc04de9359b
+AUX dhcp-4.0.1-dhclient-stdin-conf.patch 2965 RMD160 2c3dd3994f0a7f15f3fe51972dd04a2e6055613a SHA1 f4a9d51126ea489f75fcf29053ab432b68e5055d SHA256 0b25bc74ae258656dd1f0e6f4ffd6b4ef8b4ad56956624c0b6070941a180e57c
+AUX dhcp-4.2.0-errwarn-message.patch 1508 RMD160 604c680c22b620ae11e4c1ab83902a0c3dacaa62 SHA1 8d645f2510dac8c68d6114cb3f3c0077d832f8c0 SHA256 e2baa7b6097a6ca20b66afcd7b0e399840a8b0f251b3750a49a03f0d5b714231
+AUX dhcp-4.2.0-improved-xid.patch 5135 RMD160 396725be4f0e179730652c516e3b926021370b72 SHA1 bad02db8b7d5eb316aee08c25b1bf231d919e26c SHA256 2b770ba1ec8108c6e6c6c89cab066307f3653d859f1563286ac8846f9d8efdff
+AUX dhcp-4.2.0-lpf-ib.patch 17023 RMD160 5ce926287739144a9ca3130e5b75fa91340d205c SHA1 ac73c6cfbd914f07b612a7874eb123526d1114b1 SHA256 39b6835dadd156f4070ef4c4b43a4fdcaf4f61c1d763a37211ad493ce9933bdc
+AUX dhcp-4.2.0-options.patch 14611 RMD160 456569e5228779869a5e823cb4b5eaa1de9d836c SHA1 376fbe71cb39481cefbe209a74ecc984434f690e SHA256 8555cc3ada3894de53c93127bfe15a8a161515137d8f0a9cc6844acca7637e2e
+AUX dhcp-4.2.0-xen-checksum.patch 8710 RMD160 1f16ae824b60c56c05063ad29196ca570b1eafca SHA1 6a6509a031bfb39cda38205c99609ac4c4b8924a SHA256 d6dfbea187e943c09b350d156c570be6f3cbb648ac96ba838ad707280a63b3e9
+AUX dhcp-4.2.1-dhclient-resolvconf.patch 13742 RMD160 e226e793ab4d1302dbaf288c3077f3f6c8758b97 SHA1 d4ea97c3383c7f7769ab36c8d36674a3297dc1f9 SHA256 ddc284623b421098702d3e0cc1849b37c015e78dc510aa7efdd2e5fc9b6a849c
+AUX dhcp-4.2.1-nogateway.patch 1648 RMD160 820956e072e4a84ffabdee6714377ae23827b7bf SHA1 5c6c8118ee6b4b8524451827756aab052766ca09 SHA256 694caca5fbcf900cef2223307a43fb21a66fd672728cebfd873313730029acc4
+AUX dhcpd.conf 1092 RMD160 936bb112c7cdf8e669b695599252d1f6626be2f3 SHA1 cbabbcea73a0cbc9692462683b983c96d6f18b0c SHA256 b86d27e0560689057b01a352474582fceb3a398eaf3b17f901378ec56284c4d5
+AUX dhcpd.init2 2421 RMD160 baa01ae97b227edba7653cd51735613be2dac652 SHA1 f2068ceb2d79d7992f46b31e6a6e3277a0167dce SHA256 fef93e5a7264780044a977ade27e9cc70de824063791bcd07d3db81c11c16df5
+AUX dhcpd.init3 2525 RMD160 d56c77e6f2e3981c78c3fefad04347615e9d9d60 SHA1 c04f470d0cc3b262cf87cc766ceee5a35aec8b43 SHA256 69f5e6bee391a9a03554bead07c9dd5775e1fbb2a0ae515b7930cec328a8959c
+AUX dhcrelay.conf 421 RMD160 456edbc9bcc8d3a44db5bb6dbf0c3003c3e7419c SHA1 78ecdb000382893fb49d0052ced063955b0ad9cf SHA256 409b895ed489e75c1a08f72961b45d641b93fd9357f528abc78b1fd036b7f730
+AUX dhcrelay.init 736 RMD160 04566b87bd6dbb8bb754b26409ca30b878ef3ca3 SHA1 72742b308314b2e1476b27e94212fbf4d179adc4 SHA256 cfdaff3a723be3935d06c14e171d4008f2ad3329bd05ac2e49c19bc0e14bc59c
+AUX dhcrelay.init2 712 RMD160 2baeaf7c0fb8a5796792b5721f32104907243798 SHA1 ced20da5625b6517fa6044ce179e1c5d9a17297e SHA256 6cca726147474c600662b0c2e49eb5aa148a7a9af1358dbc56f16b1d08255ae3
+DIST dhcp-4.2.1-P1.tar.gz 8797289 RMD160 e3607828ea12eb718c0877430f9607d336d78c36 SHA1 7767019313b4128357054a1eb053c66799831dd6 SHA256 6cd5e06512c53ad43d71400f39071ce0bd07f074e416c727d5bc7e5949ec55ec
+EBUILD dhcp-4.2.1_p1-r1.ebuild 6878 RMD160 c6b512021e9aaefc753437a99e410f6b32b7762b SHA1 bb749bc393eebf05ed2ec16e9b22401ea65b597f SHA256 7c93402e1a501f5ed2e53cf4d410a350ca6bee6c5499a80a4126522f18a560df
+MISC ChangeLog 348 RMD160 140574ebdec8c3293b81b76444f11f942e22bc65 SHA1 44c98802fab59d59eba55e44f4655e389ee85eee SHA256 962de6f2bba37062163d90bb1d0089ce617c9ee34781575d6487da91db95f53b
+MISC metadata.xml 554 RMD160 8dd1a37b5afc3652e3071f11ad13949b216a26f9 SHA1 7b971bf09188a332c9026c358193840d8a54bb49 SHA256 64f78ebffdcfdd9d8e39eb8fee99ed1799569561bc90383ded51ebdc8f9033b5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREIAAYFAk4F5VUACgkQgAnW8HDreRYltwCfdUBWXcVYo5gh3uU6MiAbiFnM
+ZUMAoJfETVuvUJhGYUU+CSS12LZ1DvAd
+=aEtu
+-----END PGP SIGNATURE-----
diff --git a/net-misc/dhcp/dhcp-4.2.1_p1-r1.ebuild b/net-misc/dhcp/dhcp-4.2.1_p1-r1.ebuild
new file mode 100644
index 000000000..c7966f92b
--- /dev/null
+++ b/net-misc/dhcp/dhcp-4.2.1_p1-r1.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/dhcp-4.2.1_p1.ebuild,v 1.2 2011/04/15 21:40:50 ulm Exp $
+
+EAPI="2"
+
+inherit eutils
+
+MY_PV="${PV//_alpha/a}"
+MY_PV="${MY_PV//_beta/b}"
+MY_PV="${MY_PV//_rc/rc}"
+MY_PV="${MY_PV//_p/-P}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="ISC Dynamic Host Configuration Protocol (DHCP) client/server"
+HOMEPAGE="http://www.isc.org/products/DHCP"
+SRC_URI="ftp://ftp.isc.org/isc/dhcp/${MY_P}.tar.gz"
+
+LICENSE="as-is BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="+client infiniband ipv6 kernel_linux ldap selinux +server ssl vim-syntax"
+
+DEPEND="selinux? ( sec-policy/selinux-dhcp )
+ kernel_linux? ( sys-apps/net-tools )
+ vim-syntax? ( app-vim/dhcpd-syntax )
+ ldap? (
+ net-nds/openldap
+ ssl? ( dev-libs/openssl )
+ )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ # Gentoo patches - these will probably never be accepted upstream
+ # Fix some permission issues
+ epatch "${FILESDIR}"/${PN}-3.0-fix-perms.patch
+ # Enable dhclient to equery NTP servers
+ epatch "${FILESDIR}"/${PN}-4.0-dhclient-ntp.patch
+ # resolvconf support in dhclient-script
+ epatch "${FILESDIR}"/${PN}-4.2.1-dhclient-resolvconf.patch
+ # Stop downing the interface on Linux as that breaks link daemons
+ # such as wpa_supplicant and netplug
+ epatch "${FILESDIR}"/${PN}-3.0.3-dhclient-no-down.patch
+ epatch "${FILESDIR}"/${PN}-4.2.0-errwarn-message.patch
+ # Enable dhclient to get extra configuration from stdin
+ epatch "${FILESDIR}"/${PN}-4.0.1-dhclient-stdin-conf.patch
+ epatch "${FILESDIR}"/${PN}-4.2.1-nogateway.patch #265531
+
+ # NetworkManager support patches
+ # If they fail to apply to future versions they will be dropped
+ # Add dbus support to dhclient
+ epatch "${FILESDIR}"/${PN}-3.0.3-dhclient-dbus.patch
+
+ # Infiniband stuff
+ if use infiniband; then
+ epatch "${FILESDIR}/${PN}-4.2.0-improved-xid.patch"
+ epatch "${FILESDIR}/${PN}-lpf-ib.patch"
+ epatch "${FILESDIR}/${PN}-options.patch"
+ epatch "${FILESDIR}/${PN}-xen-checksum.patch"
+ fi
+
+ # Brand the version with Gentoo
+ sed -i \
+ -e "/VERSION=/s:'$: Gentoo-${PR}':" \
+ configure || die
+
+ # Change the hook script locations of the scripts
+ sed -i \
+ -e 's,/etc/dhclient-exit-hooks,/etc/dhcp/dhclient-exit-hooks,g' \
+ -e 's,/etc/dhclient-enter-hooks,/etc/dhcp/dhclient-enter-hooks,g' \
+ client/scripts/* || die
+
+ # No need for the linux script to force bash, #158540.
+ sed -i -e 's,#!/bin/bash,#!/bin/sh,' client/scripts/linux || die
+
+ # Quiet the freebsd logger a little
+ sed -i -e '/LOGGER=/ s/-s -p user.notice //g' client/scripts/freebsd || die
+
+ # Remove these options from the sample config
+ sed -i \
+ -e "/\(script\|host-name\|domain-name\) / d" \
+ client/dhclient.conf || die
+
+ if use client && ! use server ; then
+ sed -i -r \
+ -e '/^SUBDIRS/s:\<(dhcpctl|relay|server)\>::g' \
+ Makefile.in || die
+ elif ! use client && use server ; then
+ sed -i -r \
+ -e '/^SUBDIRS/s:\<client\>::' \
+ Makefile.in || die
+ fi
+
+ # Only install different man pages if we don't have en
+ if [[ " ${LINGUAS} " != *" en "* ]]; then
+ # Install Japanese man pages
+ if [[ " ${LINGUAS} " == *" ja "* && -d doc/ja_JP.eucJP ]]; then
+ einfo "Installing Japanese documention"
+ cp doc/ja_JP.eucJP/dhclient* client
+ cp doc/ja_JP.eucJP/dhcp* common
+ fi
+ fi
+ # Now remove the non-english docs so there are no errors later
+ rm -rf doc/ja_JP.eucJP
+}
+
+src_configure() {
+ econf \
+ --enable-paranoia \
+ --sysconfdir=/etc/dhcp \
+ --with-cli-pid-file=/var/run/dhcp/dhclient.pid \
+ --with-cli-lease-file=/var/lib/dhcp/dhclient.leases \
+ --with-cli6-pid-file=/var/run/dhcp/dhclient6.pid \
+ --with-cli6-lease-file=/var/lib/dhcp/dhclient6.leases \
+ --with-srv-pid-file=/var/run/dhcp/dhcpd.pid \
+ --with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \
+ --with-srv6-pid-file=/var/run/dhcp/dhcpd6.pid \
+ --with-srv6-lease-file=/var/lib/dhcp/dhcpd6.leases \
+ --with-relay-pid-file=/var/run/dhcp/dhcrelay.pid \
+ $(use_enable ipv6 dhcpv6) \
+ $(use_with ldap) \
+ $(use ldap && use_with ssl ldapcrypto || echo --without-ldapcrypto)
+}
+
+src_install() {
+ emake install DESTDIR="${D}" || die
+
+ dodoc README RELNOTES doc/{api+protocol,IANA-arp-parameters}
+ dohtml doc/References.html
+
+ if [[ -e client/dhclient ]] ; then
+ # move the client to /
+ dodir /sbin
+ mv "${D}"/usr/sbin/dhclient "${D}"/sbin/ || die
+
+ exeinto /sbin
+ if use kernel_linux ; then
+ newexe "${S}"/client/scripts/linux dhclient-script || die
+ else
+ newexe "${S}"/client/scripts/freebsd dhclient-script || die
+ fi
+
+ insinto /etc/dhcp
+ doins client/dhclient.conf || die
+
+ keepdir /var/lib/dhclient
+ fi
+
+ if [[ -e server/dhcpd ]] ; then
+ if use ldap ; then
+ insinto /etc/openldap/schema
+ doins contrib/ldap/dhcp.* || die
+ dosbin contrib/ldap/dhcpd-conf-to-ldap || die
+ fi
+
+ newinitd "${FILESDIR}"/dhcpd.init3 dhcpd
+ newinitd "${FILESDIR}"/dhcrelay.init2 dhcrelay
+ newconfd "${FILESDIR}"/dhcpd.conf dhcpd
+ newconfd "${FILESDIR}"/dhcrelay.conf dhcrelay
+
+ insinto /etc/dhcp
+ doins server/dhcpd.conf || die
+
+ keepdir /var/{lib,run}/dhcp
+ fi
+}
+
+pkg_preinst() {
+ enewgroup dhcp
+ enewuser dhcp -1 -1 /var/lib/dhcp dhcp
+
+ # Keep the user files over the sample ones
+ local f
+ for f in dhclient dhcpd ; do
+ f="/etc/dhcp/${f}.conf"
+ if [ -e "${ROOT}"${f} ] ; then
+ cp -p "${ROOT}"${f} "${D}"${f}
+ fi
+ done
+}
+
+pkg_postinst() {
+ chown -R dhcp:dhcp "${ROOT}"/var/{lib,run}/dhcp
+
+ if [[ -e "${ROOT}"/etc/init.d/dhcp ]] ; then
+ ewarn
+ ewarn "WARNING: The dhcp init script has been renamed to dhcpd"
+ ewarn "/etc/init.d/dhcp and /etc/conf.d/dhcp need to be removed and"
+ ewarn "and dhcp should be removed from the default runlevel"
+ ewarn
+ fi
+
+ einfo "You can edit /etc/conf.d/dhcpd to customize dhcp settings."
+ einfo
+ einfo "If you would like to run dhcpd in a chroot, simply configure the"
+ einfo "DHCPD_CHROOT directory in /etc/conf.d/dhcpd and then run:"
+ einfo " emerge --config =${PF}"
+}
+
+pkg_config() {
+ local CHROOT="$(
+ sed -n -e 's/^[[:blank:]]\?DHCPD_CHROOT="*\([^#"]\+\)"*/\1/p' \
+ "${ROOT}"/etc/conf.d/dhcpd
+ )"
+
+ if [[ -z ${CHROOT} ]]; then
+ eerror "CHROOT not defined in /etc/conf.d/dhcpd"
+ return 1
+ fi
+
+ CHROOT="${ROOT}/${CHROOT}"
+
+ if [[ -d ${CHROOT} ]] ; then
+ ewarn "${CHROOT} already exists - aborting"
+ return 0
+ fi
+
+ ebegin "Setting up the chroot directory"
+ mkdir -m 0755 -p "${CHROOT}/"{dev,etc,var/lib,var/run/dhcp}
+ cp /etc/{localtime,resolv.conf} "${CHROOT}"/etc
+ cp -R /etc/dhcp "${CHROOT}"/etc
+ cp -R /var/lib/dhcp "${CHROOT}"/var/lib
+ ln -s ../../var/lib/dhcp "${CHROOT}"/etc/dhcp/lib
+ chown -R dhcp:dhcp "${CHROOT}"/var/{lib,run}/dhcp
+ eend 0
+
+ local logger="$(best_version virtual/logger)"
+ einfo "To enable logging from the dhcpd server, configure your"
+ einfo "logger (${logger}) to listen on ${CHROOT}/dev/log"
+}
diff --git a/net-misc/dhcp/files/dhcp-3.0-fix-perms.patch b/net-misc/dhcp/files/dhcp-3.0-fix-perms.patch
new file mode 100644
index 000000000..13debb20e
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-3.0-fix-perms.patch
@@ -0,0 +1,15 @@
+--- server/dhcpd.c 2003-11-05 14:08:09.000000000 -0800
++++ server/dhcpd.c 2003-11-05 14:15:32.000000000 -0800
+@@ -602,6 +602,12 @@
+ if (lftest)
+ exit (0);
+
++#if defined (PARANOIA)
++ /* Set proper permissions... */
++ if (lchown (path_dhcpd_db, set_uid, set_gid))
++ log_fatal ("lchown(%s, %d, %d): %m", path_dhcpd_db, (int) set_uid, (int) set_gid);
++#endif /* PARANOIA */
++
+ /* Discover all the network interfaces and initialize them. */
+ discover_interfaces (DISCOVER_SERVER);
+
diff --git a/net-misc/dhcp/files/dhcp-3.0-paranoia.patch b/net-misc/dhcp/files/dhcp-3.0-paranoia.patch
new file mode 100644
index 000000000..886f5cb5f
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-3.0-paranoia.patch
@@ -0,0 +1,207 @@
+
+paranoia (non-root/chroot) patch for ISC dhcp 3.0
+file to patch: dhcp-3.0/server/dhcpd.c
+
+update from paranoia patch for ISC dhcp 2.0
+
+Adds 3 options:
+
+ -user <user>
+ -group <group>
+ -chroot <chroot_dir>
+
+Notes:
+ -DPARANOIA must be passed as an argument to the --copts option
+ of configure. Otherwise, the paranoia code will not be compiled
+ in. Example: ./configure --copts -DPARANOIA
+
+ The chroot() call has been delayed in order to allow /dev/log to
+ be reopened after the configuration file has been read. This is
+ beneficial for systems on which /dev/log is a unix domain socket.
+ The main side effect is that dhcpd.conf should be placed in /etc,
+ instead of <chroot_dir>/etc.
+
+ If dhcpd is to be run on a sysV-style architecture (or, more
+ generally, if /dev/log is a character device), one may opt to
+ create the <chroot_dir>/dev/log character device and add
+ -DEARLY_CHROOT to the --copts option of configure (in addition to
+ -DPARANOIA). This will perform the chroot() call at the earliest
+ convenience (before reading the configuration file).
+
+ If the -user option is used, the lease and pid file directories
+ should be writable to the server process after it drops
+ privileges.
+
+
+ari edelkind (12/10/2001)
+last modified 12/10/2001
+
+
+--- dhcp-3.0/server/dhcpd.c Thu Jun 21 22:12:58 2001
++++ dhcp-3.0+paranoia/server/dhcpd.c Wed Oct 17 08:23:00 2001
+@@ -56,6 +56,16 @@
+ #include "version.h"
+ #include <omapip/omapip_p.h>
+
++#if defined (PARANOIA)
++# include <sys/types.h>
++# include <unistd.h>
++# include <pwd.h>
++/* get around the ISC declaration of group */
++# define group real_group
++# include <grp.h>
++# undef group
++#endif /* PARANOIA */
++
+ static void usage PROTO ((void));
+
+ TIME cur_time;
+@@ -204,6 +214,22 @@
+ omapi_object_dereference (&listener, MDL);
+ }
+
++#if defined (PARANOIA)
++/* to be used in one of two possible scenarios */
++static void setup_chroot (char *chroot_dir) {
++ if (geteuid())
++ log_fatal ("you must be root to use chroot");
++
++ if (chroot(chroot_dir)) {
++ log_fatal ("chroot(\"%s\"): %m", chroot_dir);
++ }
++ if (chdir ("/")) {
++ /* probably permission denied */
++ log_fatal ("chdir(\"/\"): %m");
++ }
++}
++#endif /* PARANOIA */
++
+ int main (argc, argv, envp)
+ int argc;
+ char **argv, **envp;
+@@ -236,6 +262,14 @@
+ char *traceinfile = (char *)0;
+ char *traceoutfile = (char *)0;
+ #endif
++#if defined (PARANOIA)
++ char *set_user = 0;
++ char *set_group = 0;
++ char *set_chroot = 0;
++
++ uid_t set_uid = 0;
++ gid_t set_gid = 0;
++#endif /* PARANOIA */
+
+ /* Make sure we have stdin, stdout and stderr. */
+ status = open ("/dev/null", O_RDWR);
+@@ -298,6 +332,20 @@
+ if (++i == argc)
+ usage ();
+ server = argv [i];
++#if defined (PARANOIA)
++ } else if (!strcmp (argv [i], "-user")) {
++ if (++i == argc)
++ usage ();
++ set_user = argv [i];
++ } else if (!strcmp (argv [i], "-group")) {
++ if (++i == argc)
++ usage ();
++ set_group = argv [i];
++ } else if (!strcmp (argv [i], "-chroot")) {
++ if (++i == argc)
++ usage ();
++ set_chroot = argv [i];
++#endif /* PARANOIA */
+ } else if (!strcmp (argv [i], "-cf")) {
+ if (++i == argc)
+ usage ();
+@@ -397,6 +445,44 @@
+ trace_seed_stop, MDL);
+ #endif
+
++#if defined (PARANOIA)
++ /* get user and group info if those options were given */
++ if (set_user) {
++ struct passwd *tmp_pwd;
++
++ if (geteuid())
++ log_fatal ("you must be root to set user");
++
++ if (!(tmp_pwd = getpwnam(set_user)))
++ log_fatal ("no such user: %s", set_user);
++
++ set_uid = tmp_pwd->pw_uid;
++
++ /* use the user's group as the default gid */
++ if (!set_group)
++ set_gid = tmp_pwd->pw_gid;
++ }
++
++ if (set_group) {
++/* get around the ISC declaration of group */
++#define group real_group
++ struct group *tmp_grp;
++
++ if (geteuid())
++ log_fatal ("you must be root to set group");
++
++ if (!(tmp_grp = getgrnam(set_group)))
++ log_fatal ("no such group: %s", set_group);
++
++ set_gid = tmp_grp->gr_gid;
++#undef group
++ }
++
++# if defined (EARLY_CHROOT)
++ if (set_chroot) setup_chroot (set_chroot);
++# endif /* EARLY_CHROOT */
++#endif /* PARANOIA */
++
+ /* Default to the DHCP/BOOTP port. */
+ if (!local_port)
+ {
+@@ -500,6 +586,10 @@
+
+ postconf_initialization (quiet);
+
++#if defined (PARANOIA) && !defined (EARLY_CHROOT)
++ if (set_chroot) setup_chroot (set_chroot);
++#endif /* PARANOIA && !EARLY_CHROOT */
++
+ /* test option should cause an early exit */
+ if (cftest && !lftest)
+ exit(0);
+@@ -543,6 +633,22 @@
+ exit (0);
+ }
+
++#if defined (PARANOIA)
++ /* change uid to the specified one */
++
++ if (set_gid) {
++ if (setgroups (0, (void *)0))
++ log_fatal ("setgroups: %m");
++ if (setgid (set_gid))
++ log_fatal ("setgid(%d): %m", (int) set_gid);
++ }
++
++ if (set_uid) {
++ if (setuid (set_uid))
++ log_fatal ("setuid(%d): %m", (int) set_uid);
++ }
++#endif /* PARANOIA */
++
+ /* Read previous pid file. */
+ if ((i = open (path_dhcpd_pid, O_RDONLY)) >= 0) {
+ status = read (i, pbuf, (sizeof pbuf) - 1);
+@@ -888,6 +994,10 @@
+
+ log_fatal ("Usage: dhcpd [-p <UDP port #>] [-d] [-f]%s%s%s%s",
+ "\n [-cf config-file] [-lf lease-file]",
++#if defined (PARANOIA)
++ /* meld into the following string */
++ "\n [-user user] [-group group] [-chroot dir]"
++#endif /* PARANOIA */
+ #if defined (TRACING)
+ "\n [-tf trace-output-file]",
+ "\n [-play trace-input-file]",
diff --git a/net-misc/dhcp/files/dhcp-3.0.2-gmake.patch b/net-misc/dhcp/files/dhcp-3.0.2-gmake.patch
new file mode 100644
index 000000000..4ab99a2b7
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-3.0.2-gmake.patch
@@ -0,0 +1,66 @@
+Index: dhcp-3.0.2/Makefile
+===================================================================
+--- dhcp-3.0.2.orig/Makefile
++++ dhcp-3.0.2/Makefile
+@@ -33,7 +33,7 @@ all:
+ if [ ! -d work.$$sysname ]; then \
+ echo No build directory for $$sysname - please run ./configure.; \
+ else \
+- (cd work.$$sysname; make all); \
++ (cd work.$$sysname; $(MAKE) all); \
+ fi
+
+ install:
+@@ -41,7 +41,7 @@ install:
+ if [ ! -d work.$$sysname ]; then \
+ echo No build directory for $$sysname - please run ./configure.; \
+ else \
+- (cd work.$$sysname; make install); \
++ (cd work.$$sysname; $(MAKE) install); \
+ fi
+
+ depend:
+@@ -49,7 +49,7 @@ depend:
+ if [ ! -d work.$$sysname ]; then \
+ echo No build directory for $$sysname - please run ./configure.; \
+ else \
+- (cd work.$$sysname; make depend); \
++ (cd work.$$sysname; $(MAKE) depend); \
+ fi
+
+ clean:
+@@ -57,7 +57,7 @@ clean:
+ if [ ! -d work.$$sysname ]; then \
+ echo No build directory for $$sysname - please run ./configure.; \
+ else \
+- (cd work.$$sysname; make clean); \
++ (cd work.$$sysname; $(MAKE) clean); \
+ fi
+
+ realclean:
+@@ -65,7 +65,7 @@ realclean:
+ if [ ! -d work.$$sysname ]; then \
+ echo No build directory for $$sysname - please run ./configure.; \
+ else \
+- (cd work.$$sysname; make realclean); \
++ (cd work.$$sysname; $(MAKE) realclean); \
+ fi
+
+ distclean:
+@@ -73,7 +73,7 @@ distclean:
+ if [ ! -d work.$$sysname ]; then \
+ echo No build directory for $$sysname - please run ./configure.; \
+ else \
+- (cd work.$$sysname; make distclean); \
++ (cd work.$$sysname; $(MAKE) distclean); \
+ fi
+
+ links:
+@@ -81,6 +81,6 @@ links:
+ if [ ! -d work.$$sysname ]; then \
+ echo No build directory for $$sysname - please run ./configure.; \
+ else \
+- (cd work.$$sysname; make links); \
++ (cd work.$$sysname; $(MAKE) links); \
+ fi
+
diff --git a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-dbus.patch b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-dbus.patch
new file mode 100644
index 000000000..579d72f48
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-dbus.patch
@@ -0,0 +1,84 @@
+--- client/scripts/bsdos
++++ client/scripts/bsdos
+@@ -47,6 +47,11 @@
+ . /etc/dhcp/dhclient-exit-hooks
+ fi
+ # probably should do something with exit status of the local script
++ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
++ dbus-send --system --dest=com.redhat.dhcp \
++ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
++ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
++ fi
+ exit $exit_status
+ }
+
+--- client/scripts/freebsd
++++ client/scripts/freebsd
+@@ -57,6 +57,11 @@
+ . /etc/dhcp/dhclient-exit-hooks
+ fi
+ # probably should do something with exit status of the local script
++ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
++ dbus-send --system --dest=com.redhat.dhcp \
++ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
++ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
++ fi
+ exit $exit_status
+ }
+
+--- client/scripts/linux
++++ client/scripts/linux
+@@ -69,6 +69,11 @@
+ . /etc/dhcp/dhclient-exit-hooks
+ fi
+ # probably should do something with exit status of the local script
++ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
++ dbus-send --system --dest=com.redhat.dhcp \
++ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
++ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
++ fi
+ exit $exit_status
+ }
+
+--- client/scripts/netbsd
++++ client/scripts/netbsd
+@@ -47,6 +47,11 @@
+ . /etc/dhcp/dhclient-exit-hooks
+ fi
+ # probably should do something with exit status of the local script
++ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
++ dbus-send --system --dest=com.redhat.dhcp \
++ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
++ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
++ fi
+ exit $exit_status
+ }
+
+--- client/scripts/openbsd
++++ client/scripts/openbsd
+@@ -47,6 +47,11 @@
+ . /etc/dhcp/dhclient-exit-hooks
+ fi
+ # probably should do something with exit status of the local script
++ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
++ dbus-send --system --dest=com.redhat.dhcp \
++ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
++ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
++ fi
+ exit $exit_status
+ }
+
+--- client/scripts/solaris
++++ client/scripts/solaris
+@@ -47,6 +47,11 @@
+ . /etc/dhcp/dhclient-exit-hooks
+ fi
+ # probably should do something with exit status of the local script
++ if [ x$dhc_dbus != x -a $exit_status -eq 0 ]; then
++ dbus-send --system --dest=com.redhat.dhcp \
++ --type=method_call /com/redhat/dhcp/$interface com.redhat.dhcp.set \
++ 'string:'"`env | grep -Ev '^(PATH|SHLVL|_|PWD|dhc_dbus)\='`"
++ fi
+ exit $exit_status
+ }
+
diff --git a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-hostname.patch b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-hostname.patch
new file mode 100644
index 000000000..9a6e7b969
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-hostname.patch
@@ -0,0 +1,16 @@
+--- client/scripts/linux
++++ client/scripts/linux
+@@ -138,10 +138,12 @@
+ [ x$reason = xREBIND ] || [ x$reason = xREBOOT ]; then
+ current_hostname=`hostname`
+ if [ x$current_hostname = x ] || \
++ [ x$current_hostname = "x(none)" ] || \
++ [ x$current_hostname = xlocalhost ] || \
+ [ x$current_hostname = x$old_host_name ]; then
+ if [ x$current_hostname = x ] || \
+ [ x$new_host_name != x$old_host_name ]; then
+- hostname $new_host_name
++ hostname "$new_host_name"
+ fi
+ fi
+
diff --git a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-metric.patch b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-metric.patch
new file mode 100644
index 000000000..040ef779d
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-metric.patch
@@ -0,0 +1,200 @@
+--- client/scripts/bsdos
++++ client/scripts/bsdos
+@@ -84,6 +84,9 @@
+ if [ x$new_interface_mtu != x ]; then
+ mtu_arg="mtu $new_interface_mtu"
+ fi
++if [ x$IF_METRIC != x ]; then
++ metric_arg="metric $IF_METRIC"
++fi
+
+ if [ x$reason = xMEDIUM ]; then
+ eval "ifconfig $interface $medium"
+@@ -141,7 +144,7 @@
+ if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
+ [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
+ eval "ifconfig $interface inet $new_ip_address $new_netmask_arg \
+- $new_broadcast_arg $mtu_arg $medium"
++ $new_broadcast_arg $mtu_arg $metric_arg $medium"
+ route add $new_ip_address 127.1 >/dev/null 2>&1
+ for router in $new_routers; do
+ route add default $router >/dev/null 2>&1
+@@ -198,7 +201,7 @@
+ route delete $alias_ip_address 127.0.0.1 > /dev/null 2>&1
+ fi
+ eval "ifconfig $interface inet $new_ip_address $new_netmask_arg \
+- $new_broadcast_arg $mtu_arg $medium"
++ $new_broadcast_arg $mtu_arg $metric_arg $medium"
+ sleep 1
+ if [ "$new_routers" != "" ]; then
+ set $new_routers
+--- client/scripts/freebsd
++++ client/scripts/freebsd
+@@ -94,6 +94,9 @@
+ if [ x$new_interface_mtu != x ]; then
+ mtu_arg="mtu $new_interface_mtu"
+ fi
++if [ x$IF_METRIC != x ]; then
++ metric_arg="metric $IF_METRIC"
++fi
+
+ if [ x$reason = xMEDIUM ]; then
+ eval "ifconfig $interface $medium"
+@@ -151,7 +154,7 @@
+ if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
+ [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
+ eval "ifconfig $interface inet $new_ip_address $new_netmask_arg \
+- $new_broadcast_arg $mtu_arg $medium"
++ $new_broadcast_arg $mtu_arg $metric_arg $medium"
+ $LOGGER "New IP Address ($interface): $new_ip_address"
+ $LOGGER "New Subnet Mask ($interface): $new_subnet_mask"
+ $LOGGER "New Broadcast Address ($interface): $new_broadcast_address"
+@@ -215,7 +218,7 @@
+ route delete $alias_ip_address 127.0.0.1 > /dev/null 2>&1
+ fi
+ eval "ifconfig $interface inet $new_ip_address $new_netmask_arg \
+- $new_broadcast_arg $mtu_arg $medium"
++ $new_broadcast_arg $mtu_arg $metric_arg $medium"
+ $LOGGER "New IP Address ($interface): $new_ip_address"
+ $LOGGER "New Subnet Mask ($interface): $new_subnet_mask"
+ $LOGGER "New Broadcast Address ($interface): $new_broadcast_address"
+--- client/scripts/linux
++++ client/scripts/linux
+@@ -83,11 +83,6 @@
+ fi
+ fi
+
+-release=`uname -r`
+-release=`expr $release : '\(.*\)\..*'`
+-relminor=`echo $release |sed -e 's/[0-9]*\.\([0-9][0-9]*\)\(\..*\)*$/\1/'`
+-relmajor=`echo $release |sed -e 's/\([0-9][0-9]*\)\..*$/\1/'`
+-
+ if [ x$new_broadcast_address != x ]; then
+ new_broadcast_arg="broadcast $new_broadcast_address"
+ fi
+@@ -106,6 +101,9 @@
+ if [ x$new_interface_mtu != x ]; then
+ mtu_arg="mtu $new_interface_mtu"
+ fi
++if [ x$IF_METRIC != x ]; then
++ metric_arg="metric $IF_METRIC"
++fi
+
+ if [ x$reason = xMEDIUM ]; then
+ # Linux doesn't do mediums (ok, ok, media).
+@@ -117,15 +115,7 @@
+ # Bring down alias interface. Its routes will disappear too.
+ ifconfig $interface:0- inet 0
+ fi
+- if [ $relmajor -lt 2 ] || ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] )
+- then
+- ifconfig $interface inet 0.0.0.0 netmask 0.0.0.0 \
+- broadcast 255.255.255.255 up
+- # Add route to make broadcast work. Do not omit netmask.
+- route add default dev $interface netmask 0.0.0.0
+- else
+- ifconfig $interface 0 up
+- fi
++ ifconfig $interface 0 up
+
+ # We need to give the kernel some time to get the interface up.
+ sleep 1
+@@ -164,12 +154,14 @@
+ ifconfig $interface inet $new_ip_address $new_subnet_arg \
+ $new_broadcast_arg $mtu_arg
+ # Add a network route to the computed network address.
+- if [ $relmajor -lt 2 ] || \
+- ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ); then
+- route add -net $new_network_number $new_subnet_arg dev $interface
++ if [ x$IF_METRIC != x ] && [ x$IF_METRIC != x0 ]; then
++ route del -net $new_network_number $new_subnet_arg \
++ dev $interface
++ route add -net $new_network_number $new_subnet_arg $metric_arg \
++ dev $interface
+ fi
+ for router in $new_routers; do
+- route add default gw $router
++ route add default gw $router $metric_arg dev $interface
+ done
+ fi
+ if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ];
+@@ -213,12 +205,15 @@
+ ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+ route add -host $alias_ip_address dev $interface:0
+ fi
+- if [ $relmajor -lt 2 ] || \
+- ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ); then
+- route add -net $new_network_number
++ # Add a network route to the computed network address.
++ if [ x$IF_METRIC != x ] && [ x$IF_METRIC != x0 ]; then
++ route del -net $new_network_number $new_subnet_arg \
++ dev $interface
++ route add -net $new_network_number $new_subnet_arg $metric_arg \
++ dev $interface
+ fi
+ for router in $new_routers; do
+- route add default gw $router
++ route add default gw $router $metric_arg dev $interface
+ done
+ make_resolv_conf
+ exit_with_hooks 0
+--- client/scripts/netbsd
++++ client/scripts/netbsd
+@@ -84,6 +84,9 @@
+ if [ x$new_interface_mtu != x ]; then
+ mtu_arg="mtu $new_interface_mtu"
+ fi
++if [ x$IF_METRIC != x ]; then
++ metric_arg="metric $IF_METRIC"
++fi
+
+ if [ x$reason = xMEDIUM ]; then
+ eval "ifconfig $interface $medium"
+@@ -141,7 +144,7 @@
+ if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
+ [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
+ eval "ifconfig $interface inet $new_ip_address $new_netmask_arg \
+- $new_broadcast_arg $mtu_arg $medium"
++ $new_broadcast_arg $mtu_arg $metric_arg $medium"
+ route add $new_ip_address 127.1 >/dev/null 2>&1
+ for router in $new_routers; do
+ route add default $router >/dev/null 2>&1
+@@ -198,7 +201,7 @@
+ route delete $alias_ip_address 127.0.0.1 > /dev/null 2>&1
+ fi
+ eval "ifconfig $interface inet $new_ip_address $new_netmask_arg \
+- $new_broadcast_arg $mtu_arg $medium"
++ $new_broadcast_arg $mtu_arg $metric_arg $medium"
+ sleep 1
+ if [ "$new_routers" != "" ]; then
+ set $new_routers
+--- client/scripts/solaris
++++ client/scripts/solaris
+@@ -79,6 +79,9 @@
+ if [ x$new_interface_mtu != x ]; then
+ mtu_arg="mtu $new_interface_mtu"
+ fi
++if [ x$IF_METRIC != x ]; then
++ metric_arg="metric $IF_METRIC"
++fi
+
+ ifconfig=/sbin/ifconfig
+
+@@ -141,7 +144,7 @@
+ if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
+ [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
+ eval "$ifconfig $interface inet $new_ip_address $new_netmask_arg \
+- $new_broadcast_arg $mtu_arg $medium"
++ $new_broadcast_arg $mtu_arg $metric_arg $medium"
+ route add $new_ip_address 127.1 1 >/dev/null 2>&1
+ for router in $new_routers; do
+ route add default $router 1 >/dev/null 2>&1
+@@ -182,7 +185,7 @@
+ route delete $alias_ip_address 127.0.0.1 > /dev/null 2>&1
+ fi
+ eval "$ifconfig $interface inet $new_ip_address $new_netmask_arg \
+- $new_broadcast_arg $mtu_arg $medium"
++ $new_broadcast_arg $mtu_arg $metric_arg $medium"
+ sleep 1
+ set $new_routers
+ if ping -s -n -I 1 $1 64 1; then
diff --git a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-mtu.patch b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-mtu.patch
new file mode 100644
index 000000000..5ef4442d8
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-mtu.patch
@@ -0,0 +1,180 @@
+--- client/scripts/bsdos
++++ client/scripts/bsdos
+@@ -81,6 +81,9 @@
+ if [ x$alias_subnet_mask != x ]; then
+ alias_subnet_arg="netmask $alias_subnet_mask"
+ fi
++if [ x$new_interface_mtu != x ]; then
++ mtu_arg="mtu $new_interface_mtu"
++fi
+
+ if [ x$reason = xMEDIUM ]; then
+ eval "ifconfig $interface $medium"
+@@ -138,7 +141,7 @@
+ if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
+ [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
+ eval "ifconfig $interface inet $new_ip_address $new_netmask_arg \
+- $new_broadcast_arg $medium"
++ $new_broadcast_arg $mtu_arg $medium"
+ route add $new_ip_address 127.1 >/dev/null 2>&1
+ for router in $new_routers; do
+ route add default $router >/dev/null 2>&1
+@@ -195,7 +198,7 @@
+ route delete $alias_ip_address 127.0.0.1 > /dev/null 2>&1
+ fi
+ eval "ifconfig $interface inet $new_ip_address $new_netmask_arg \
+- $new_broadcast_arg $medium"
++ $new_broadcast_arg $mtu_arg $medium"
+ sleep 1
+ if [ "$new_routers" != "" ]; then
+ set $new_routers
+--- client/scripts/freebsd
++++ client/scripts/freebsd
+@@ -91,6 +91,9 @@
+ if [ x$alias_subnet_mask != x ]; then
+ alias_subnet_arg="netmask $alias_subnet_mask"
+ fi
++if [ x$new_interface_mtu != x ]; then
++ mtu_arg="mtu $new_interface_mtu"
++fi
+
+ if [ x$reason = xMEDIUM ]; then
+ eval "ifconfig $interface $medium"
+@@ -148,7 +151,7 @@
+ if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
+ [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
+ eval "ifconfig $interface inet $new_ip_address $new_netmask_arg \
+- $new_broadcast_arg $medium"
++ $new_broadcast_arg $mtu_arg $medium"
+ $LOGGER "New IP Address ($interface): $new_ip_address"
+ $LOGGER "New Subnet Mask ($interface): $new_subnet_mask"
+ $LOGGER "New Broadcast Address ($interface): $new_broadcast_address"
+@@ -212,7 +215,7 @@
+ route delete $alias_ip_address 127.0.0.1 > /dev/null 2>&1
+ fi
+ eval "ifconfig $interface inet $new_ip_address $new_netmask_arg \
+- $new_broadcast_arg $medium"
++ $new_broadcast_arg $mtu_arg $medium"
+ $LOGGER "New IP Address ($interface): $new_ip_address"
+ $LOGGER "New Subnet Mask ($interface): $new_subnet_mask"
+ $LOGGER "New Broadcast Address ($interface): $new_broadcast_address"
+--- client/scripts/linux
++++ client/scripts/linux
+@@ -103,6 +103,9 @@
+ if [ x$alias_subnet_mask != x ]; then
+ alias_subnet_arg="netmask $alias_subnet_mask"
+ fi
++if [ x$new_interface_mtu != x ]; then
++ mtu_arg="mtu $new_interface_mtu"
++fi
+
+ if [ x$reason = xMEDIUM ]; then
+ # Linux doesn't do mediums (ok, ok, media).
+@@ -159,7 +162,7 @@
+ [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
+
+ ifconfig $interface inet $new_ip_address $new_subnet_arg \
+- $new_broadcast_arg
++ $new_broadcast_arg $mtu_arg
+ # Add a network route to the computed network address.
+ if [ $relmajor -lt 2 ] || \
+ ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] ); then
+@@ -201,7 +204,7 @@
+ ifconfig $interface:0- inet 0
+ fi
+ ifconfig $interface inet $new_ip_address $new_subnet_arg \
+- $new_broadcast_arg
++ $new_broadcast_arg $mtu_arg
+ set $new_routers
+ ############## what is -w in ping?
+ if ping -q -c 1 $1; then
+--- client/scripts/netbsd
++++ client/scripts/netbsd
+@@ -81,6 +81,9 @@
+ if [ x$alias_subnet_mask != x ]; then
+ alias_subnet_arg="netmask $alias_subnet_mask"
+ fi
++if [ x$new_interface_mtu != x ]; then
++ mtu_arg="mtu $new_interface_mtu"
++fi
+
+ if [ x$reason = xMEDIUM ]; then
+ eval "ifconfig $interface $medium"
+@@ -138,7 +141,7 @@
+ if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
+ [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
+ eval "ifconfig $interface inet $new_ip_address $new_netmask_arg \
+- $new_broadcast_arg $medium"
++ $new_broadcast_arg $mtu_arg $medium"
+ route add $new_ip_address 127.1 >/dev/null 2>&1
+ for router in $new_routers; do
+ route add default $router >/dev/null 2>&1
+@@ -195,7 +198,7 @@
+ route delete $alias_ip_address 127.0.0.1 > /dev/null 2>&1
+ fi
+ eval "ifconfig $interface inet $new_ip_address $new_netmask_arg \
+- $new_broadcast_arg $medium"
++ $new_broadcast_arg $mtu_arg $medium"
+ sleep 1
+ if [ "$new_routers" != "" ]; then
+ set $new_routers
+--- client/scripts/openbsd
++++ client/scripts/openbsd
+@@ -81,6 +81,9 @@
+ if [ x$alias_subnet_mask != x ]; then
+ alias_subnet_arg="netmask $alias_subnet_mask"
+ fi
++if [ x$new_interface_mtu != x ]; then
++ mtu_arg="mtu $new_interface_mtu"
++fi
+
+ if [ x$reason = xMEDIUM ]; then
+ eval "ifconfig $interface $medium"
+@@ -138,7 +141,7 @@
+ if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
+ [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
+ eval "ifconfig $interface inet $new_ip_address $new_netmask_arg \
+- $new_broadcast_arg $medium"
++ $new_broadcast_arg $mtu_arg $medium"
+ route add $new_ip_address 127.1 >/dev/null 2>&1
+ for router in $new_routers; do
+ route add default $router >/dev/null 2>&1
+@@ -195,7 +198,7 @@
+ route delete $alias_ip_address 127.0.0.1 > /dev/null 2>&1
+ fi
+ eval "ifconfig $interface inet $new_ip_address $new_netmask_arg \
+- $new_broadcast_arg $medium"
++ $new_broadcast_arg $mtu_arg $medium"
+ sleep 1
+ if [ "$new_routers" != "" ]; then
+ set $new_routers
+--- client/scripts/solaris
++++ client/scripts/solaris
+@@ -76,6 +76,9 @@
+ if [ x$alias_subnet_mask != x ]; then
+ alias_subnet_arg="netmask $alias_subnet_mask"
+ fi
++if [ x$new_interface_mtu != x ]; then
++ mtu_arg="mtu $new_interface_mtu"
++fi
+
+ ifconfig=/sbin/ifconfig
+
+@@ -138,7 +141,7 @@
+ if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
+ [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
+ eval "$ifconfig $interface inet $new_ip_address $new_netmask_arg \
+- $new_broadcast_arg $medium"
++ $new_broadcast_arg $mtu_arg $medium"
+ route add $new_ip_address 127.1 1 >/dev/null 2>&1
+ for router in $new_routers; do
+ route add default $router 1 >/dev/null 2>&1
+@@ -179,7 +182,7 @@
+ route delete $alias_ip_address 127.0.0.1 > /dev/null 2>&1
+ fi
+ eval "$ifconfig $interface inet $new_ip_address $new_netmask_arg \
+- $new_broadcast_arg $medium"
++ $new_broadcast_arg $mtu_arg $medium"
+ sleep 1
+ set $new_routers
+ if ping -s -n -I 1 $1 64 1; then
diff --git a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-no-down.patch b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-no-down.patch
new file mode 100644
index 000000000..518efec11
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-no-down.patch
@@ -0,0 +1,70 @@
+--- client/scripts/linux
++++ client/scripts/linux
+@@ -118,9 +118,9 @@
+ if [ x$reason = xPREINIT ]; then
+ if [ x$alias_ip_address != x ]; then
+ # Bring down alias interface. Its routes will disappear too.
+- ifconfig $interface:0- inet 0
++ ifconfig $interface:0- inet 0.0.0.0
+ fi
+- ifconfig $interface 0 up
++ ifconfig $interface 0.0.0.0 up
+
+ # We need to give the kernel some time to get the interface up.
+ sleep 1
+@@ -145,12 +145,12 @@
+ if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \
+ [ x$alias_ip_address != x$old_ip_address ]; then
+ # Possible new alias. Remove old alias.
+- ifconfig $interface:0- inet 0
++ ifconfig $interface:0- inet 0.0.0.0
+ fi
+ if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then
+ # IP address changed. Bringing down the interface will delete all routes,
+ # and clear the ARP cache.
+- ifconfig $interface inet 0 down
++ ifconfig $interface inet 0.0.0.0
+
+ fi
+ if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
+@@ -171,7 +171,7 @@
+ fi
+ if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ];
+ then
+- ifconfig $interface:0- inet 0
++ ifconfig $interface:0- inet 0.0.0.0
+ ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+ route add -host $alias_ip_address $interface:0
+ fi
+@@ -183,11 +183,11 @@
+ || [ x$reason = xSTOP ]; then
+ if [ x$alias_ip_address != x ]; then
+ # Turn off alias interface.
+- ifconfig $interface:0- inet 0
++ ifconfig $interface:0- inet 0.0.0.0
+ fi
+ if [ x$old_ip_address != x ]; then
+ # Shut down interface, which will delete routes and clear arp cache.
+- ifconfig $interface inet 0 down
++ ifconfig $interface inet 0.0.0.0
+ fi
+ if [ x$alias_ip_address != x ]; then
+ ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+@@ -198,7 +198,7 @@
+
+ if [ x$reason = xTIMEOUT ]; then
+ if [ x$alias_ip_address != x ]; then
+- ifconfig $interface:0- inet 0
++ ifconfig $interface:0- inet 0.0.0.0
+ fi
+ ifconfig $interface inet $new_ip_address $new_subnet_arg \
+ $new_broadcast_arg $mtu_arg
+@@ -223,7 +223,7 @@
+ make_resolv_conf
+ exit_with_hooks 0
+ fi
+- ifconfig $interface inet 0 down
++ ifconfig $interface inet 0.0.0.0
+ exit_with_hooks 1
+ fi
+
diff --git a/net-misc/dhcp/files/dhcp-3.0.3-dhclient-ntp.patch b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-ntp.patch
new file mode 100644
index 000000000..d84e6f613
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-3.0.3-dhclient-ntp.patch
@@ -0,0 +1,186 @@
+--- client/clparse.c
++++ client/clparse.c
+@@ -51,6 +51,7 @@
+ DHO_DOMAIN_NAME,
+ DHO_DOMAIN_NAME_SERVERS,
+ DHO_HOST_NAME,
++ DHO_NTP_SERVERS,
+ 0
+ };
+
+--- client/scripts/bsdos
++++ client/scripts/bsdos
+@@ -7,6 +7,26 @@
+ echo nameserver $nameserver >>/etc/resolv.conf
+ done
+ fi
++ # If we're making confs, may as well make an ntp.conf too
++ make_ntp_conf
++}
++
++make_ntp_conf() {
++ if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
++ if [ x$new_ntp_servers != x ]; then
++ conf="# Generated by dhclient for interface $interface\n"
++ conf="${conf}restrict default noquery notrust nomodify\n"
++ conf="${conf}restrict 127.0.0.1\n"
++ for ntpserver in $new_ntp_servers; do
++ conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
++ conf="${conf}server $ntpserver\n"
++ done
++ conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
++ conf="${conf}logfile /var/log/ntp.log\n"
++ printf "${conf}" > /etc/ntp.conf
++ chmod 644 /etc/ntp.conf
++ fi
++ fi
+ }
+
+ # Must be used on exit. Invokes the local dhcp client exit hooks, if any.
+--- client/scripts/freebsd
++++ client/scripts/freebsd
+@@ -32,8 +32,28 @@
+ done
+ fi
+ fi
++ # If we're making confs, may as well make an ntp.conf too
++ make_ntp_conf
+ }
+
++make_ntp_conf() {
++ if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
++ if [ "x$new_ntp_servers" != x ]; then
++ conf="# Generated by dhclient for interface $interface\n"
++ conf="${conf}restrict default noquery notrust nomodify\n"
++ conf="${conf}restrict 127.0.0.1\n"
++ for ntpserver in $new_ntp_servers; do
++ conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
++ conf="${conf}server $ntpserver\n"
++ done
++ conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
++ conf="${conf}logfile /var/log/ntp.log\n"
++ printf "${conf}" > /etc/ntp.conf
++ chmod 644 /etc/ntp.conf
++ fi
++ fi
++}
++
+ # Must be used on exit. Invokes the local dhcp client exit hooks, if any.
+ exit_with_hooks() {
+ exit_status=$1
+--- client/scripts/linux
++++ client/scripts/linux
+@@ -30,6 +30,26 @@
+ echo nameserver $nameserver >>/etc/resolv.conf
+ done
+ fi
++ # If we're making confs, may as well make an ntp.conf too
++ make_ntp_conf
++}
++
++make_ntp_conf() {
++ if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
++ if [ "x$new_ntp_servers" != x ]; then
++ conf="# Generated by dhclient for interface $interface\n"
++ conf="${conf}restrict default noquery notrust nomodify\n"
++ conf="${conf}restrict 127.0.0.1\n"
++ for ntpserver in $new_ntp_servers; do
++ conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
++ conf="${conf}server $ntpserver\n"
++ done
++ conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
++ conf="${conf}logfile /var/log/ntp.log\n"
++ printf "${conf}" > /etc/ntp.conf
++ chmod 644 /etc/ntp.conf
++ fi
++ fi
+ }
+
+ # Must be used on exit. Invokes the local dhcp client exit hooks, if any.
+--- client/scripts/netbsd
++++ client/scripts/netbsd
+@@ -7,6 +7,26 @@
+ echo nameserver $nameserver >>/etc/resolv.conf
+ done
+ fi
++ # If we're making confs, may as well make an ntp.conf too
++ make_ntp_conf
++}
++
++make_ntp_conf() {
++ if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
++ if [ "x$new_ntp_servers" != x ]; then
++ conf="# Generated by dhclient for interface $interface\n"
++ conf="${conf}restrict default noquery notrust nomodify\n"
++ conf="${conf}restrict 127.0.0.1\n"
++ for ntpserver in $new_ntp_servers; do
++ conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
++ conf="${conf}server $ntpserver\n"
++ done
++ conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
++ conf="${conf}logfile /var/log/ntp.log\n"
++ printf "${conf}" > /etc/ntp.conf
++ chmod 644 /etc/ntp.conf
++ fi
++ fi
+ }
+
+ # Must be used on exit. Invokes the local dhcp client exit hooks, if any.
+--- client/scripts/openbsd
++++ client/scripts/openbsd
+@@ -7,6 +7,26 @@
+ echo nameserver $nameserver >>/etc/resolv.conf
+ done
+ fi
++ # If we're making confs, may as well make an ntp.conf too
++ make_ntp_conf
++}
++
++make_ntp_conf() {
++ if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
++ if [ "x$new_ntp_servers" != x ]; then
++ conf="# Generated by dhclient for interface $interface\n"
++ conf="${conf}restrict default noquery notrust nomodify\n"
++ conf="${conf}restrict 127.0.0.1\n"
++ for ntpserver in $new_ntp_servers; do
++ conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
++ conf="${conf}server $ntpserver\n"
++ done
++ conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
++ conf="${conf}logfile /var/log/ntp.log\n"
++ printf "${conf}" > /etc/ntp.conf
++ chmod 644 /etc/ntp.conf
++ fi
++ fi
+ }
+
+ # Must be used on exit. Invokes the local dhcp client exit hooks, if any.
+--- client/scripts/solaris
++++ client/scripts/solaris
+@@ -7,6 +7,26 @@
+ echo nameserver $nameserver >>/etc/resolv.conf
+ done
+ fi
++ # If we're making confs, may as well make an ntp.conf too
++ make_ntp_conf
++}
++
++make_ntp_conf() {
++ if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
++ if [ "x$new_ntp_servers" != x ]; then
++ conf="# Generated by dhclient for interface $interface\n"
++ conf="${conf}restrict default noquery notrust nomodify\n"
++ conf="${conf}restrict 127.0.0.1\n"
++ for ntpserver in $new_ntp_servers; do
++ conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
++ conf="${conf}server $ntpserver\n"
++ done
++ conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
++ conf="${conf}logfile /var/log/ntp.log\n"
++ printf "${conf}" > /etc/ntp.conf
++ chmod 644 /etc/ntp.conf
++ fi
++ fi
+ }
+
+ # Must be used on exit. Invokes the local dhcp client exit hooks, if any.
diff --git a/net-misc/dhcp/files/dhcp-3.0.3-libdst.patch b/net-misc/dhcp/files/dhcp-3.0.3-libdst.patch
new file mode 100644
index 000000000..8e93ac95b
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-3.0.3-libdst.patch
@@ -0,0 +1,14 @@
+--- dst/Makefile.dist.old 2004-12-24 13:31:22.986061032 +0000
++++ dst/Makefile.dist 2004-12-24 13:47:19.036913364 +0000
+@@ -31,6 +31,10 @@
+ all: libdst.a
+
+ install:
++ mkdir -p $(DESTDIR)$(LIBDIR)
++ $(INSTALL) libdst.a $(DESTDIR)$(LIBDIR)
++ $(CHMOD) 644 $(DESTDIR)$(LIBDIR)/libdst.a
++
+
+ libdst.a: $(OBJ)
+ rm -f dst.a
+
diff --git a/net-misc/dhcp/files/dhcp-3.0.3-no_isc_blurb.patch b/net-misc/dhcp/files/dhcp-3.0.3-no_isc_blurb.patch
new file mode 100644
index 000000000..38f7713f5
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-3.0.3-no_isc_blurb.patch
@@ -0,0 +1,105 @@
+Patch nobbled from RedHat, and adapted to work with dhclient and dhrelay
+by Roy Marples <uberlord@gentoo.org>
+
+--- dhcp-3.0.3/omapip/errwarn.c.no_isc_blurb 2004-09-30 16:38:32.000000000 -0400
++++ dhcp-3.0.3/omapip/errwarn.c 2005-04-18 13:45:49.037158000 -0400
+@@ -45,6 +45,8 @@
+ int log_perror = 1;
+ #endif
+ int log_priority;
++int log_isc_blurb=1;
++
+ void (*log_cleanup) (void);
+
+ #define CVT_BUF_MAX 1023
+@@ -76,7 +78,9 @@
+ write (STDERR_FILENO, "\n", 1);
+ }
+
+-#if !defined (NOMINUM)
++#if !defined(NOMINUM)
++ if ( log_isc_blurb )
++ {
+ log_error ("%s", "");
+ log_error ("If you did not get this software from ftp.isc.org, please");
+ log_error ("get the latest from ftp.isc.org and install that before");
+@@ -94,7 +98,12 @@
+ log_error ("the README file.");
+ log_error ("%s", "");
+ log_error ("exiting.");
++ }else
++ {
++ log_error ("exiting.");
++ }
+ #endif
++
+ if (log_cleanup)
+ (*log_cleanup) ();
+ exit (1);
+--- dhcp-3.0.3/client/dhclient.c.no_isc_blurb 2005-04-18 13:21:08.509169000 -0400
++++ dhcp-3.0.3/client/dhclient.c 2005-04-18 13:49:27.574402000 -0400
+@@ -34,7 +34,7 @@
+ static char ocopyright[] =
+ "$Id: dhcp-3.0.3-no_isc_blurb.patch,v 1.1 2005/12/09 14:13:30 uberlord Exp $ Copyright (c) 2004 Internet Systems Consortium. All rights reserved.\n";
+ #endif /* not lint */
+-
++
+ #include "dhcpd.h"
+ #include "version.h"
+
+@@ -81,6 +81,8 @@
+
+ void do_release(struct client_state *);
+
++extern int log_isc_blurb;
++
+ int main (argc, argv, envp)
+ int argc;
+ char **argv, **envp;
+@@ -176,6 +178,7 @@
+ } else if (!strcmp (argv [i], "-q")) {
+ quiet = 1;
+ quiet_interface_discovery = 1;
++ log_isc_blurb = 0;
+ } else if (!strcmp (argv [i], "-s")) {
+ if (++i == argc)
+ usage ();
+--- dhcp-3.0.3/server/dhcpd.c.no_isc_blurb 2005-12-08 10:01:40.000000000 +0000
++++ dhcp-3.0.3/server/dhcpd.c 2005-12-08 10:05:55.000000000 +0000
+@@ -62,6 +62,9 @@
+ struct iaddr server_identifier;
+ int server_identifier_matched;
+
++
++extern int log_isc_blurb;
++
+ #if defined (NSUPDATE)
+
+ /* This stuff is always executed to figure the default values for certain
+@@ -368,6 +371,7 @@
+ } else if (!strcmp (argv [i], "-q")) {
+ quiet = 1;
+ quiet_interface_discovery = 1;
++ log_isc_blurb = 0;
+ } else if (!strcmp (argv [i], "--version")) {
+ log_info ("isc-dhcpd-%s", DHCP_VERSION);
+ exit (0);
+--- dhcp-3.0.3/relay/dhcrelay.c.no_isc_blurb 2005-12-08 10:21:00.000000000 +0000
++++ dhcp-3.0.3/relay/dhcrelay.c 2005-12-08 10:21:50.000000000 +0000
+@@ -102,6 +102,8 @@
+ static char message [] = "Internet Systems Consortium DHCP Relay Agent";
+ static char url [] = "For info, please visit http://www.isc.org/sw/dhcp/";
+
++extern int log_isc_blurb;
++
+ int main (argc, argv, envp)
+ int argc;
+ char **argv, **envp;
+@@ -170,6 +172,7 @@
+ } else if (!strcmp (argv [i], "-q")) {
+ quiet = 1;
+ quiet_interface_discovery = 1;
++ log_isc_blurb = 0;
+ } else if (!strcmp (argv [i], "-a")) {
+ add_agent_options = 1;
+ } else if (!strcmp (argv [i], "-c")) {
diff --git a/net-misc/dhcp/files/dhcp-3.0.4-dhclient-stdin-conf.patch b/net-misc/dhcp/files/dhcp-3.0.4-dhclient-stdin-conf.patch
new file mode 100644
index 000000000..3fedc7c0e
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-3.0.4-dhclient-stdin-conf.patch
@@ -0,0 +1,83 @@
+--- common/conflex.c.orig 2006-02-21 16:21:45.000000000 +0000
++++ common/conflex.c 2006-02-21 16:23:06.000000000 +0000
+@@ -90,7 +90,7 @@
+ struct parse **cfile;
+ {
+ /* "Memory" config files have no file. */
+- if ((*cfile)->file != -1)
++ if ((*cfile)->file != -1 && (*cfile)->file != fileno(stdin))
+ close((*cfile)->file);
+
+ if ((*cfile)->bufsiz)
+--- client/clparse.c.orig 2006-02-22 09:37:12.000000000 +0000
++++ client/clparse.c 2006-02-22 09:38:26.000000000 +0000
+@@ -97,6 +97,11 @@
+ status = read_client_conf_file (path_dhclient_conf,
+ (struct interface_info *)0,
+ &top_level_config);
++
++ /* Read any extra configuration from stdin */
++ read_client_conf_stdin ((struct interface_info *)0,
++ &top_level_config);
++
+ if (status != ISC_R_SUCCESS) {
+ ;
+ #ifdef LATER
+@@ -148,20 +153,17 @@
+ return status;
+ }
+
+-int read_client_conf_file (const char *name, struct interface_info *ip,
+- struct client_config *client)
++int read_client_conf_actual (int file, const char *name,
++ struct interface_info *ip,
++ struct client_config *client)
+ {
+- int file;
+ struct parse *cfile;
+ const char *val;
+ int token;
+ isc_result_t status;
+
+- if ((file = open (name, O_RDONLY)) < 0)
+- return uerr2isc (errno);
+-
+ cfile = (struct parse *)0;
+- new_parse (&cfile, file, (char *)0, 0, path_dhclient_conf, 0);
++ new_parse (&cfile, file, (char *)0, 0, name , 0);
+
+ do {
+ token = peek_token (&val, (unsigned *)0, cfile);
+@@ -177,6 +179,32 @@
+ return status;
+ }
+
++int read_client_conf_file (const char *name, struct interface_info *ip,
++ struct client_config *client)
++{
++ int file;
++ isc_result_t status;
++
++ if ((file = open (name, O_RDONLY)) < 0)
++ return uerr2isc (errno);
++
++ status = read_client_conf_actual(file, name, ip, client);
++
++ return status;
++}
++
++
++int read_client_conf_stdin (struct interface_info *ip,
++ struct client_config *client)
++{
++ int file = fileno(stdin);
++ isc_result_t status;
++
++ if (isatty(file)) return ISC_R_NOTFOUND;
++ status = read_client_conf_actual(file, "stdin", ip, client);
++
++ return status;
++}
+
+ /* lease-file :== client-lease-statements END_OF_FILE
+ client-lease-statements :== <nil>
diff --git a/net-misc/dhcp/files/dhcp-3.0.5-bpf-nofallback.patch b/net-misc/dhcp/files/dhcp-3.0.5-bpf-nofallback.patch
new file mode 100644
index 000000000..2fae6f220
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-3.0.5-bpf-nofallback.patch
@@ -0,0 +1,44 @@
+diff -ur common.orig/bpf.c common/bpf.c
+--- common.orig/bpf.c 2006-09-20 12:52:47 +0100
++++ common/bpf.c 2006-09-20 12:53:22 +0100
+@@ -354,10 +354,6 @@
+ int result;
+ int fudge;
+
+- if (!strcmp (interface -> name, "fallback"))
+- return send_fallback (interface, packet, raw,
+- len, from, to, hto);
+-
+ /* Assemble the headers... */
+ assemble_hw_header (interface, (unsigned char *)hw, &hbufp, hto);
+ assemble_udp_ip_header (interface,
+@@ -531,17 +527,5 @@
+
+ void maybe_setup_fallback ()
+ {
+- isc_result_t status;
+- struct interface_info *fbi = (struct interface_info *)0;
+- if (setup_fallback (&fbi, MDL)) {
+- if_register_fallback (fbi);
+- status = omapi_register_io_object ((omapi_object_t *)fbi,
+- if_readsocket, 0,
+- fallback_discard, 0, 0);
+- if (status != ISC_R_SUCCESS)
+- log_fatal ("Can't register I/O handle for %s: %s",
+- fbi -> name, isc_result_totext (status));
+- interface_dereference (&fbi, MDL);
+- }
+ }
+ #endif
+diff -ur includes.orig/osdep.h includes/osdep.h
+--- includes.orig/osdep.h 2006-09-20 12:54:52 +0100
++++ includes/osdep.h 2006-09-20 12:56:40 +0100
+@@ -190,7 +190,7 @@
+ Currently, all low-level packet interfaces use BSD sockets as a
+ fallback. */
+
+-#if defined (USE_BPF_SEND) || defined (USE_NIT_SEND) || \
++#if defined (USE_NIT_SEND) || \
+ defined (USE_DLPI_SEND) || defined (USE_UPF_SEND) || \
+ defined (USE_LPF_SEND) || \
+ (defined (USE_SOCKET_SEND) && defined (HAVE_SO_BINDTODEVICE))
diff --git a/net-misc/dhcp/files/dhcp-3.1.0a1-dhclient-resolvconf.patch b/net-misc/dhcp/files/dhcp-3.1.0a1-dhclient-resolvconf.patch
new file mode 100644
index 000000000..5c420ae6e
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-3.1.0a1-dhclient-resolvconf.patch
@@ -0,0 +1,254 @@
+diff -ur client.orig/scripts/bsdos client/scripts/bsdos
+--- client.orig/scripts/bsdos 2006-09-07 18:53:10.476329752 +0100
++++ client/scripts/bsdos 2006-09-07 19:19:53.000000000 +0100
+@@ -1,21 +1,22 @@
+ #!/bin/sh
+
+ make_resolv_conf() {
+- if [ x"$new_domain_name_servers" != x ]; then
+- cat /dev/null > /etc/resolv.conf.dhclient
+- if [ "x$new_domain_search" != x ]; then
+- echo search $new_domain_search >> /etc/resolv.conf.dhclient
+- elif [ "x$new_domain_name" != x ]; then
+- # Note that the DHCP 'Domain Name Option' is really just a domain
+- # name, and that this practice of using the domain name option as
+- # a search path is both nonstandard and deprecated.
+- echo search $new_domain_name >> /etc/resolv.conf.dhclient
++ if [ x$PEER_DNS = x ] || [ x$PEER_DNS = xyes ]; then
++ if [ "x$new_domain_name" != x ] || [ "x$new_domain_name_servers" != x ]; then
++ conf="# Generated by dhclient for interface $interface\n"
++ if [ "x$new_domain_name" != x ]; then
++ conf="${conf}search $new_domain_name\n"
++ fi
++ for nameserver in $new_domain_name_servers; do
++ conf="${conf}nameserver $nameserver\n"
++ done
++ if [ -x /sbin/resolvconf ]; then
++ printf "$conf" | resolvconf -a "$interface"
++ else
++ printf "$conf" > /etc/resolv.conf
++ chmod 644 /etc/resolv.conf
++ fi
+ fi
+- for nameserver in $new_domain_name_servers; do
+- echo nameserver $nameserver >> /etc/resolv.conf.dhclient
+- done
+-
+- mv /etc/resolv.conf.dhclient /etc/resolv.conf
+ fi
+ # If we're making confs, may as well make an ntp.conf too
+ make_ntp_conf
+diff -ur client.orig/scripts/freebsd client/scripts/freebsd
+--- client.orig/scripts/freebsd 2006-09-07 18:53:10.476329752 +0100
++++ client/scripts/freebsd 2006-09-07 19:19:32.000000000 +0100
+@@ -11,38 +11,20 @@
+ fi
+
+ make_resolv_conf() {
+- if [ x"$new_domain_name_servers" != x ]; then
+- ( cat /dev/null > /etc/resolv.conf.dhclient )
+- exit_status=$?
+- if [ $exit_status -ne 0 ]; then
+- $LOGGER "Unable to create /etc/resolv.conf.dhclient: Error $exit_status"
+- else
+- if [ "x$new_domain_search" != x ]; then
+- ( echo search $new_domain_search >> /etc/resolv.conf.dhclient )
+- exit_status=$?
+- elif [ "x$new_domain_name" != x ]; then
+- # Note that the DHCP 'Domain Name Option' is really just a domain
+- # name, and that this practice of using the domain name option as
+- # a search path is both nonstandard and deprecated.
+- ( echo search $new_domain_name >> /etc/resolv.conf.dhclient )
+- exit_status=$?
++ if [ x$PEER_DNS = x ] || [ x$PEER_DNS = xyes ]; then
++ if [ "x$new_domain_name" != x ] || [ "x$new_domain_name_servers" != x ]; then
++ conf="# Generated by dhclient for interface $interface\n"
++ if [ "x$new_domain_name" != x ]; then
++ conf="${conf}search $new_domain_name\n"
+ fi
+ for nameserver in $new_domain_name_servers; do
+- if [ $exit_status -ne 0 ]; then
+- break
+- fi
+- ( echo nameserver $nameserver >>/etc/resolv.conf.dhclient )
+- exit_status=$?
++ conf="${conf}nameserver $nameserver\n"
+ done
+-
+- # If there were no errors, attempt to mv the new file into place.
+- if [ $exit_status -eq 0 ]; then
+- ( mv /etc/resolv.conf.dhclient /etc/resolv.conf )
+- exit_status = $?
+- fi
+-
+- if [ $exit_status -ne 0 ]; then
+- $LOGGER "Error while writing new /etc/resolv.conf."
++ if [ -x /sbin/resolvconf ]; then
++ printf "$conf" | resolvconf -a "$interface"
++ else
++ printf "$conf" > /etc/resolv.conf
++ chmod 644 /etc/resolv.conf
+ fi
+ fi
+ fi
+diff -ur client.orig/scripts/linux client/scripts/linux
+--- client.orig/scripts/linux 2006-09-07 18:53:10.476329752 +0100
++++ client/scripts/linux 2006-09-07 19:18:57.000000000 +0100
+@@ -23,22 +23,22 @@
+ # of the $1 in its args.
+
+ make_resolv_conf() {
+- if [ x"$new_domain_name_servers" != x ]; then
+- cat /dev/null > /etc/resolv.conf.dhclient
+- chmod 644 /etc/resolv.conf.dhclient
+- if [ x"$new_domain_search" != x ]; then
+- echo search $new_domain_search >> /etc/resolv.conf.dhclient
+- elif [ x"$new_domain_name" != x ]; then
+- # Note that the DHCP 'Domain Name Option' is really just a domain
+- # name, and that this practice of using the domain name option as
+- # a search path is both nonstandard and deprecated.
+- echo search $new_domain_name >> /etc/resolv.conf.dhclient
++ if [ x$PEER_DNS = x ] || [ x$PEER_DNS = xyes ]; then
++ if [ "x$new_domain_name" != x ] || [ "x$new_domain_name_servers" != x ]; then
++ conf="# Generated by dhclient for interface $interface\n"
++ if [ "x$new_domain_name" != x ]; then
++ conf="${conf}search $new_domain_name\n"
++ fi
++ for nameserver in $new_domain_name_servers; do
++ conf="${conf}nameserver $nameserver\n"
++ done
++ if [ -x /sbin/resolvconf ]; then
++ printf "$conf" | resolvconf -a "$interface"
++ else
++ printf "$conf" > /etc/resolv.conf
++ chmod 644 /etc/resolv.conf
++ fi
+ fi
+- for nameserver in $new_domain_name_servers; do
+- echo nameserver $nameserver >>/etc/resolv.conf.dhclient
+- done
+-
+- mv /etc/resolv.conf.dhclient /etc/resolv.conf
+ fi
+ # If we're making confs, may as well make an ntp.conf too
+ make_ntp_conf
+diff -ur client.orig/scripts/netbsd client/scripts/netbsd
+--- client.orig/scripts/netbsd 2006-09-07 18:53:10.476329752 +0100
++++ client/scripts/netbsd 2006-09-07 19:20:10.000000000 +0100
+@@ -1,21 +1,22 @@
+ #!/bin/sh
+
+ make_resolv_conf() {
+- if [ "x$new_domain_name" != x ] && [ x"$new_domain_name_servers" != x ]; then
+- cat /dev/null > /etc/resolv.conf.dhclient
+- if [ "x$new_domain_search != x ]; then
+- echo search $new_domain_search >> /etc/resolv.conf.dhclient
+- elif [ "x$new_domain_name != x ]; then
+- # Note that the DHCP 'Domain Name Option' is really just a domain
+- # name, and that this practice of using the domain name option as
+- # a search path is both nonstandard and deprecated.
+- echo search $new_domain_name >> /etc/resolv.conf.dhclient
++ if [ x$PEER_DNS = x ] || [ x$PEER_DNS = xyes ]; then
++ if [ "x$new_domain_name" != x ] || [ "x$new_domain_name_servers" != x ]; then
++ conf="# Generated by dhclient for interface $interface\n"
++ if [ "x$new_domain_name" != x ]; then
++ conf="${conf}search $new_domain_name\n"
++ fi
++ for nameserver in $new_domain_name_servers; do
++ conf="${conf}nameserver $nameserver\n"
++ done
++ if [ -x /sbin/resolvconf ]; then
++ printf "$conf" | resolvconf -a "$interface"
++ else
++ printf "$conf" > /etc/resolv.conf
++ chmod 644 /etc/resolv.conf
++ fi
+ fi
+- for nameserver in $new_domain_name_servers; do
+- echo nameserver $nameserver >>/etc/resolv.conf.dhclient
+- done
+-
+- mv /etc/resolv.conf.dhclient /etc/resolv.conf
+ fi
+ # If we're making confs, may as well make an ntp.conf too
+ make_ntp_conf
+diff -ur client.orig/scripts/openbsd client/scripts/openbsd
+--- client.orig/scripts/openbsd 2006-09-07 18:53:10.476329752 +0100
++++ client/scripts/openbsd 2006-09-07 19:20:38.000000000 +0100
+@@ -1,21 +1,22 @@
+ #!/bin/sh
+
+ make_resolv_conf() {
+- if x"$new_domain_name_servers" != x ]; then
+- cat /dev/null > /etc/resolv.conf.dhclient
+- if [ x"$new_domain_search" != x ]; then
+- echo search $new_domain_search >> /etc/resolv.conf.dhclient
+- elif [ x"$new_domain_name" != x ]; then
+- # Note that the DHCP 'Domain Name Option' is really just a domain
+- # name, and that this practice of using the domain name option as
+- # a search path is both nonstandard and deprecated.
+- echo search $new_domain_name >> /etc/resolv.conf.dhclient
++ if [ x$PEER_DNS = x ] || [ x$PEER_DNS = xyes ]; then
++ if [ "x$new_domain_name" != x ] || [ "x$new_domain_name_servers" != x ]; then
++ conf="# Generated by dhclient for interface $interface\n"
++ if [ "x$new_domain_name" != x ]; then
++ conf="${conf}search $new_domain_name\n"
++ fi
++ for nameserver in $new_domain_name_servers; do
++ conf="${conf}nameserver $nameserver\n"
++ done
++ if [ -x /sbin/resolvconf ]; then
++ printf "$conf" | resolvconf -a "$interface"
++ else
++ printf "$conf" > /etc/resolv.conf
++ chmod 644 /etc/resolv.conf
++ fi
+ fi
+- for nameserver in $new_domain_name_servers; do
+- echo nameserver $nameserver >>/etc/resolv.conf.dhclient
+- done
+-
+- mv /etc/ersolv.conf.dhclient /etc/resolv.conf
+ fi
+ # If we're making confs, may as well make an ntp.conf too
+ make_ntp_conf
+diff -ur client.orig/scripts/solaris client/scripts/solaris
+--- client.orig/scripts/solaris 2006-09-07 18:53:10.476329752 +0100
++++ client/scripts/solaris 2006-09-07 19:21:12.000000000 +0100
+@@ -1,21 +1,22 @@
+ #!/bin/sh
+
+ make_resolv_conf() {
+- if [ x"$new_domain_name_servers" != x ]; then
+- cat /dev/null > /etc/resolv.conf.dhclient
+- if [ x"$new_domain_search" != x ]; then
+- echo search $new_domain_search >> /etc/resolv.conf.dhclient
+- elif [ x"$new_domain_name" != x ]; then
+- # Note that the DHCP 'Domain Name Option' is really just a domain
+- # name, and that this practice of using the domain name option as
+- # a search path is both nonstandard and deprecated.
+- echo search $new_domain_name >> /etc/resolv.conf.dhclient
++ if [ x$PEER_DNS = x ] || [ x$PEER_DNS = xyes ]; then
++ if [ "x$new_domain_name" != x ] || [ "x$new_domain_name_servers" != x ]; then
++ conf="# Generated by dhclient for interface $interface\n"
++ if [ "x$new_domain_name" != x ]; then
++ conf="${conf}search $new_domain_name\n"
++ fi
++ for nameserver in $new_domain_name_servers; do
++ conf="${conf}nameserver $nameserver\n"
++ done
++ if [ -x /sbin/resolvconf ]; then
++ printf "$conf" | resolvconf -a "$interface"
++ else
++ printf "$conf" > /etc/resolv.conf
++ chmod 644 /etc/resolv.conf
++ fi
+ fi
+- for nameserver in $new_domain_name_servers; do
+- echo nameserver $nameserver >>/etc/resolv.conf.dhclient
+- done
+-
+- mv /etc/resolv.conf.dhclient /etc/resolv.conf
+ fi
+ # If we're making confs, may as well make an ntp.conf too
+ make_ntp_conf
diff --git a/net-misc/dhcp/files/dhcp-3.1.2_p1-CVE-2009-1892.patch b/net-misc/dhcp/files/dhcp-3.1.2_p1-CVE-2009-1892.patch
new file mode 100644
index 000000000..ae1b92af8
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-3.1.2_p1-CVE-2009-1892.patch
@@ -0,0 +1,12 @@
+diff -uNr dhcp-3.1.2.ORIG/server/dhcp.c dhcp-3.1.2/server/dhcp.c
+--- dhcp-3.1.2.ORIG/server/dhcp.c 2009-07-13 14:26:15.000000000 +0100
++++ dhcp-3.1.2/server/dhcp.c 2009-07-13 14:26:33.000000000 +0100
+@@ -1747,6 +1747,8 @@
+ host_reference (&host, h, MDL);
+ }
+ if (!host) {
++ if (hp)
++ host_dereference (&hp, MDL);
+ find_hosts_by_haddr (&hp,
+ packet -> raw -> htype,
+ packet -> raw -> chaddr,
diff --git a/net-misc/dhcp/files/dhcp-3.1.3-dhclient-no-down.patch b/net-misc/dhcp/files/dhcp-3.1.3-dhclient-no-down.patch
new file mode 100644
index 000000000..89935df82
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-3.1.3-dhclient-no-down.patch
@@ -0,0 +1,77 @@
+diff -Nuar --exclude '*.orig' dhcp-3.1.3.orig//client/scripts/linux dhcp-3.1.3//client/scripts/linux
+--- dhcp-3.1.3.orig//client/scripts/linux 2010-10-15 04:59:15.890664245 +0000
++++ dhcp-3.1.3//client/scripts/linux 2010-10-15 05:04:57.940396350 +0000
+@@ -118,7 +118,7 @@
+ if [ x$reason = xPREINIT ]; then
+ if [ x$alias_ip_address != x ]; then
+ # Bring down alias interface. Its routes will disappear too.
+- ifconfig $interface:0- inet 0
++ ifconfig $interface:0- inet 0.0.0.0
+ fi
+ if [ $relmajor -lt 2 ] || ( [ $relmajor -eq 2 ] && [ $relminor -eq 0 ] )
+ then
+@@ -127,7 +127,7 @@
+ # Add route to make broadcast work. Do not omit netmask.
+ route add default dev $interface netmask 0.0.0.0
+ else
+- ifconfig $interface 0 up
++ ifconfig $interface 0.0.0.0 up
+ fi
+
+ # We need to give the kernel some time to get the interface up.
+@@ -155,12 +155,12 @@
+ if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \
+ [ x$alias_ip_address != x$old_ip_address ]; then
+ # Possible new alias. Remove old alias.
+- ifconfig $interface:0- inet 0
++ ifconfig $interface:0- inet 0.0.0.0
+ fi
+ if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then
+ # IP address changed. Bringing down the interface will delete all routes,
+ # and clear the ARP cache.
+- ifconfig $interface inet 0 down
++ ifconfig $interface inet 0.0.0.0
+
+ fi
+ if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
+@@ -179,7 +179,7 @@
+ fi
+ if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ];
+ then
+- ifconfig $interface:0- inet 0
++ ifconfig $interface:0- inet 0.0.0.0
+ ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+ route add -host $alias_ip_address $interface:0
+ fi
+@@ -191,11 +191,11 @@
+ || [ x$reason = xSTOP ]; then
+ if [ x$alias_ip_address != x ]; then
+ # Turn off alias interface.
+- ifconfig $interface:0- inet 0
++ ifconfig $interface:0- inet 0.0.0.0
+ fi
+ if [ x$old_ip_address != x ]; then
+ # Shut down interface, which will delete routes and clear arp cache.
+- ifconfig $interface inet 0 down
++ ifconfig $interface inet 0.0.0.0
+ fi
+ if [ x$alias_ip_address != x ]; then
+ ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+@@ -206,7 +206,7 @@
+
+ if [ x$reason = xTIMEOUT ]; then
+ if [ x$alias_ip_address != x ]; then
+- ifconfig $interface:0- inet 0
++ ifconfig $interface:0- inet 0.0.0.0
+ fi
+ ifconfig $interface inet $new_ip_address $new_subnet_arg \
+ $new_broadcast_arg $mtu_arg
+@@ -227,7 +227,7 @@
+ make_resolv_conf
+ exit_with_hooks 0
+ fi
+- ifconfig $interface inet 0 down
++ ifconfig $interface inet 0.0.0.0
+ exit_with_hooks 1
+ fi
+
diff --git a/net-misc/dhcp/files/dhcp-4.0-dhclient-ntp.patch b/net-misc/dhcp/files/dhcp-4.0-dhclient-ntp.patch
new file mode 100644
index 000000000..d3f29714b
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.0-dhclient-ntp.patch
@@ -0,0 +1,216 @@
+diff -uNr dhcp-4.0.0.ORIG/client/clparse.c dhcp-4.0.0/client/clparse.c
+--- dhcp-4.0.0.ORIG/client/clparse.c 2008-09-01 11:38:51.000000000 +0100
++++ dhcp-4.0.0/client/clparse.c 2008-09-01 11:48:17.000000000 +0100
+@@ -37,7 +37,7 @@
+
+ struct client_config top_level_config;
+
+-#define NUM_DEFAULT_REQUESTED_OPTS 9
++#define NUM_DEFAULT_REQUESTED_OPTS 10
+ struct option *default_requested_options[NUM_DEFAULT_REQUESTED_OPTS + 1];
+
+ static void parse_client_default_duid(struct parse *cfile);
+@@ -98,15 +98,20 @@
+ dhcp_universe.code_hash, &code, 0, MDL);
+
+ /* 8 */
+- code = D6O_NAME_SERVERS;
++ code = DHO_NTP_SERVERS;
+ option_code_hash_lookup(&default_requested_options[7],
+- dhcpv6_universe.code_hash, &code, 0, MDL);
++ dhcp_universe.code_hash, &code, 0, MDL);
+
+ /* 9 */
+- code = D6O_DOMAIN_SEARCH;
++ code = D6O_NAME_SERVERS;
+ option_code_hash_lookup(&default_requested_options[8],
+ dhcpv6_universe.code_hash, &code, 0, MDL);
+
++ /* 10 */
++ code = D6O_DOMAIN_SEARCH;
++ option_code_hash_lookup(&default_requested_options[9],
++ dhcpv6_universe.code_hash, &code, 0, MDL);
++
+ for (code = 0 ; code < NUM_DEFAULT_REQUESTED_OPTS ; code++) {
+ if (default_requested_options[code] == NULL)
+ log_fatal("Unable to find option definition for "
+diff -uNr dhcp-4.0.0.ORIG/client/scripts/bsdos dhcp-4.0.0/client/scripts/bsdos
+--- dhcp-4.0.0.ORIG/client/scripts/bsdos 2008-09-01 11:38:51.000000000 +0100
++++ dhcp-4.0.0/client/scripts/bsdos 2008-09-01 11:39:30.000000000 +0100
+@@ -29,6 +29,26 @@
+
+ mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
+ fi
++ # If we're making confs, may as well make an ntp.conf too
++ make_ntp_conf
++}
++
++make_ntp_conf() {
++ if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
++ if [ x$new_ntp_servers != x ]; then
++ conf="# Generated by dhclient for interface $interface\n"
++ conf="${conf}restrict default noquery notrust nomodify\n"
++ conf="${conf}restrict 127.0.0.1\n"
++ for ntpserver in $new_ntp_servers; do
++ conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
++ conf="${conf}server $ntpserver\n"
++ done
++ conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
++ conf="${conf}logfile /var/log/ntp.log\n"
++ printf "${conf}" > /etc/ntp.conf
++ chmod 644 /etc/ntp.conf
++ fi
++ fi
+ }
+
+ # Must be used on exit. Invokes the local dhcp client exit hooks, if any.
+diff -uNr dhcp-4.0.0.ORIG/client/scripts/freebsd dhcp-4.0.0/client/scripts/freebsd
+--- dhcp-4.0.0.ORIG/client/scripts/freebsd 2008-09-01 11:38:51.000000000 +0100
++++ dhcp-4.0.0/client/scripts/freebsd 2008-09-01 11:39:30.000000000 +0100
+@@ -73,6 +73,26 @@
+ fi
+ fi
+ fi
++ # If we're making confs, may as well make an ntp.conf too
++ make_ntp_conf
++}
++
++make_ntp_conf() {
++ if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
++ if [ "x$new_ntp_servers" != x ]; then
++ conf="# Generated by dhclient for interface $interface\n"
++ conf="${conf}restrict default noquery notrust nomodify\n"
++ conf="${conf}restrict 127.0.0.1\n"
++ for ntpserver in $new_ntp_servers; do
++ conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
++ conf="${conf}server $ntpserver\n"
++ done
++ conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
++ conf="${conf}logfile /var/log/ntp.log\n"
++ printf "${conf}" > /etc/ntp.conf
++ chmod 644 /etc/ntp.conf
++ fi
++ fi
+ }
+
+ # Must be used on exit. Invokes the local dhcp client exit hooks, if any.
+diff -uNr dhcp-4.0.0.ORIG/client/scripts/linux dhcp-4.0.0/client/scripts/linux
+--- dhcp-4.0.0.ORIG/client/scripts/linux 2008-09-01 11:38:51.000000000 +0100
++++ dhcp-4.0.0/client/scripts/linux 2008-09-01 11:39:30.000000000 +0100
+@@ -55,6 +55,26 @@
+
+ mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
+ fi
++ # If we're making confs, may as well make an ntp.conf too
++ make_ntp_conf
++}
++
++make_ntp_conf() {
++ if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
++ if [ "x$new_ntp_servers" != x ]; then
++ conf="# Generated by dhclient for interface $interface\n"
++ conf="${conf}restrict default noquery notrust nomodify\n"
++ conf="${conf}restrict 127.0.0.1\n"
++ for ntpserver in $new_ntp_servers; do
++ conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
++ conf="${conf}server $ntpserver\n"
++ done
++ conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
++ conf="${conf}logfile /var/log/ntp.log\n"
++ printf "${conf}" > /etc/ntp.conf
++ chmod 644 /etc/ntp.conf
++ fi
++ fi
+ }
+
+ # Must be used on exit. Invokes the local dhcp client exit hooks, if any.
+diff -uNr dhcp-4.0.0.ORIG/client/scripts/netbsd dhcp-4.0.0/client/scripts/netbsd
+--- dhcp-4.0.0.ORIG/client/scripts/netbsd 2008-09-01 11:38:51.000000000 +0100
++++ dhcp-4.0.0/client/scripts/netbsd 2008-09-01 11:39:30.000000000 +0100
+@@ -29,6 +29,26 @@
+
+ mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
+ fi
++ # If we're making confs, may as well make an ntp.conf too
++ make_ntp_conf
++}
++
++make_ntp_conf() {
++ if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
++ if [ "x$new_ntp_servers" != x ]; then
++ conf="# Generated by dhclient for interface $interface\n"
++ conf="${conf}restrict default noquery notrust nomodify\n"
++ conf="${conf}restrict 127.0.0.1\n"
++ for ntpserver in $new_ntp_servers; do
++ conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
++ conf="${conf}server $ntpserver\n"
++ done
++ conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
++ conf="${conf}logfile /var/log/ntp.log\n"
++ printf "${conf}" > /etc/ntp.conf
++ chmod 644 /etc/ntp.conf
++ fi
++ fi
+ }
+
+ # Must be used on exit. Invokes the local dhcp client exit hooks, if any.
+diff -uNr dhcp-4.0.0.ORIG/client/scripts/openbsd dhcp-4.0.0/client/scripts/openbsd
+--- dhcp-4.0.0.ORIG/client/scripts/openbsd 2008-09-01 11:38:51.000000000 +0100
++++ dhcp-4.0.0/client/scripts/openbsd 2008-09-01 11:39:30.000000000 +0100
+@@ -29,6 +29,26 @@
+
+ mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
+ fi
++ # If we're making confs, may as well make an ntp.conf too
++ make_ntp_conf
++}
++
++make_ntp_conf() {
++ if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
++ if [ "x$new_ntp_servers" != x ]; then
++ conf="# Generated by dhclient for interface $interface\n"
++ conf="${conf}restrict default noquery notrust nomodify\n"
++ conf="${conf}restrict 127.0.0.1\n"
++ for ntpserver in $new_ntp_servers; do
++ conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
++ conf="${conf}server $ntpserver\n"
++ done
++ conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
++ conf="${conf}logfile /var/log/ntp.log\n"
++ printf "${conf}" > /etc/ntp.conf
++ chmod 644 /etc/ntp.conf
++ fi
++ fi
+ }
+
+ # Must be used on exit. Invokes the local dhcp client exit hooks, if any.
+diff -uNr dhcp-4.0.0.ORIG/client/scripts/solaris dhcp-4.0.0/client/scripts/solaris
+--- dhcp-4.0.0.ORIG/client/scripts/solaris 2008-09-01 11:38:51.000000000 +0100
++++ dhcp-4.0.0/client/scripts/solaris 2008-09-01 11:39:30.000000000 +0100
+@@ -17,6 +17,26 @@
+
+ mv /etc/resolv.conf.dhclient /etc/resolv.conf
+ fi
++ # If we're making confs, may as well make an ntp.conf too
++ make_ntp_conf
++}
++
++make_ntp_conf() {
++ if [ x$PEER_NTP = x ] || [ x$PEER_NTP = xyes ]; then
++ if [ "x$new_ntp_servers" != x ]; then
++ conf="# Generated by dhclient for interface $interface\n"
++ conf="${conf}restrict default noquery notrust nomodify\n"
++ conf="${conf}restrict 127.0.0.1\n"
++ for ntpserver in $new_ntp_servers; do
++ conf="${conf}restrict $ntpserver nomodify notrap noquery\n"
++ conf="${conf}server $ntpserver\n"
++ done
++ conf="${conf}driftfile /var/lib/ntp/ntp.drift\n"
++ conf="${conf}logfile /var/log/ntp.log\n"
++ printf "${conf}" > /etc/ntp.conf
++ chmod 644 /etc/ntp.conf
++ fi
++ fi
+ }
+
+ # Must be used on exit. Invokes the local dhcp client exit hooks, if any.
diff --git a/net-misc/dhcp/files/dhcp-4.0.1-dhclient-stdin-conf.patch b/net-misc/dhcp/files/dhcp-4.0.1-dhclient-stdin-conf.patch
new file mode 100644
index 000000000..ddbe4a39d
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.0.1-dhclient-stdin-conf.patch
@@ -0,0 +1,114 @@
+diff -uNr dhcp-4.0.1.ORIG/client/clparse.c dhcp-4.0.1/client/clparse.c
+--- dhcp-4.0.1.ORIG/client/clparse.c 2009-03-30 13:54:47.000000000 +0100
++++ dhcp-4.0.1/client/clparse.c 2009-03-30 13:58:02.000000000 +0100
+@@ -174,6 +174,10 @@
+ #endif
+ }
+
++ /* Read any extra configuration from stdin */
++ read_client_conf_stdin ((struct interface_info *)0,
++ &top_level_config);
++
+ /* Set up state and config structures for clients that don't
+ have per-interface configuration statements. */
+ config = (struct client_config *)0;
+@@ -203,23 +207,13 @@
+ return status;
+ }
+
+-int read_client_conf_file (const char *name, struct interface_info *ip,
++int read_client_conf_actual (struct parse *cfile, struct interface_info *ip,
+ struct client_config *client)
+ {
+- int file;
+- struct parse *cfile;
+ const char *val;
+ int token;
+ isc_result_t status;
+
+- if ((file = open (name, O_RDONLY)) < 0)
+- return uerr2isc (errno);
+-
+- cfile = NULL;
+- status = new_parse(&cfile, file, NULL, 0, path_dhclient_conf, 0);
+- if (status != ISC_R_SUCCESS || cfile == NULL)
+- return status;
+-
+ do {
+ token = peek_token (&val, (unsigned *)0, cfile);
+ if (token == END_OF_FILE)
+@@ -230,10 +224,74 @@
+ status = (cfile -> warnings_occurred
+ ? ISC_R_BADPARSE
+ : ISC_R_SUCCESS);
++ return status;
++}
++
++int read_client_conf_file (const char *name, struct interface_info *ip,
++ struct client_config *client)
++{
++ int file;
++ struct parse *cfile;
++ isc_result_t status;
++
++ if ((file = open (name, O_RDONLY)) < 0)
++ return uerr2isc (errno);
++
++ cfile = (struct parse *)0;
++ new_parse (&cfile, file, (char *)0, 0, path_dhclient_conf, 0);
++ status = read_client_conf_actual(cfile, ip, client);
+ end_parse (&cfile);
+ return status;
+ }
+
++int read_client_conf_stdin (struct interface_info *ip,
++ struct client_config *client)
++{
++ int file;
++ char *buffer = NULL, *p;
++ unsigned buflen, len = 0;
++ struct parse *cfile;
++ size_t bytes;
++ isc_result_t status;
++
++ file = fileno(stdin);
++ if (isatty (file))
++ return ISC_R_NOTFOUND;
++ if (fcntl (file, F_SETFL, O_NONBLOCK) < 0)
++ log_fatal ("could not set stdin to non blocking!");
++
++ buflen = BUFSIZ;
++ buffer = malloc (BUFSIZ + 1);
++ p = buffer;
++ do {
++ bytes = read (file, p, BUFSIZ);
++ if (bytes == 0)
++ break;
++ if (bytes == -1)
++ log_fatal ("failed to read stdin!");
++ if (bytes >= BUFSIZ) {
++ buflen += BUFSIZ;
++ len += BUFSIZ;
++ buffer = realloc (buffer, buflen + 1);
++ if (!buffer)
++ log_fatal ("not enough buffer to read stdin!");
++ p = buffer + len;
++ } else {
++ len += bytes;
++ break;
++ }
++ } while(1);
++ buffer[len] = '\0';
++
++ cfile = (struct parse *)0;
++ status = new_parse (&cfile, -1, buffer, len, "stdin", 0);
++ if (status == ISC_R_SUCCESS) {
++ status = read_client_conf_actual (cfile, ip, client);
++ end_parse (&cfile);
++ }
++ free(buffer);
++ return status;
++}
+
+ /* lease-file :== client-lease-statements END_OF_FILE
+ client-lease-statements :== <nil>
diff --git a/net-misc/dhcp/files/dhcp-4.2.0-errwarn-message.patch b/net-misc/dhcp/files/dhcp-4.2.0-errwarn-message.patch
new file mode 100644
index 000000000..f882a1345
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.2.0-errwarn-message.patch
@@ -0,0 +1,31 @@
+ripped from Fedora & tweaked
+
+--- dhcp-4.2.0/omapip/errwarn.c
++++ dhcp-4.2.0/omapip/errwarn.c
+@@ -76,20 +76,13 @@
+
+ #if !defined (NOMINUM)
+ log_error ("%s", "");
+- log_error ("If you did not get this software from ftp.isc.org, please");
+- log_error ("get the latest from ftp.isc.org and install that before");
+- log_error ("requesting help.");
++ log_error ("This version of ISC DHCP is based on the release available");
++ log_error ("on ftp.isc.org. Features have been added and other changes");
++ log_error ("have been made to the base software release in order to make");
++ log_error ("it work better with this distribution.");
+ log_error ("%s", "");
+- log_error ("If you did get this software from ftp.isc.org and have not");
+- log_error ("yet read the README, please read it before requesting help.");
+- log_error ("If you intend to request help from the dhcp-server@isc.org");
+- log_error ("mailing list, please read the section on the README about");
+- log_error ("submitting bug reports and requests for help.");
+- log_error ("%s", "");
+- log_error ("Please do not under any circumstances send requests for");
+- log_error ("help directly to the authors of this software - please");
+- log_error ("send them to the appropriate mailing list as described in");
+- log_error ("the README file.");
++ log_error ("Please report for this software via the Gentoo Bugzilla site:");
++ log_error (" http://bugs.gentoo.org/");
+ log_error ("%s", "");
+ log_error ("exiting.");
+ #endif
diff --git a/net-misc/dhcp/files/dhcp-4.2.0-improved-xid.patch b/net-misc/dhcp/files/dhcp-4.2.0-improved-xid.patch
new file mode 100644
index 000000000..567601f06
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.2.0-improved-xid.patch
@@ -0,0 +1,138 @@
+diff -up dhcp-4.2.0/client/dhclient.c.xid dhcp-4.2.0/client/dhclient.c
+--- dhcp-4.2.0/client/dhclient.c.xid 2010-09-23 06:21:03.000000000 -0400
++++ dhcp-4.2.0/client/dhclient.c 2010-09-23 09:14:09.000000000 -0400
+@@ -805,6 +805,26 @@ main(int argc, char **argv) {
+ }
+ }
+
++ /* We create a backup seed before rediscovering interfaces in order to
++ have a seed built using all of the available interfaces
++ It's interesting if required interfaces doesn't let us defined
++ a really unique seed due to a lack of valid HW addr later
++ (this is the case with DHCP over IB)
++ We only use the last device as using a sum could broke the
++ uniqueness of the seed among multiple nodes
++ */
++ unsigned backup_seed = 0;
++ for (ip = interfaces; ip; ip = ip -> next) {
++ int junk;
++ if ( ip -> hw_address.hlen <= sizeof seed )
++ continue;
++ memcpy (&junk,
++ &ip -> hw_address.hbuf [ip -> hw_address.hlen -
++ sizeof seed], sizeof seed);
++ backup_seed = junk;
++ }
++
++
+ /* At this point, all the interfaces that the script thinks
+ are relevant should be running, so now we once again call
+ discover_interfaces(), and this time ask it to actually set
+@@ -819,14 +839,36 @@ main(int argc, char **argv) {
+ Not much entropy, but we're booting, so we're not likely to
+ find anything better. */
+ seed = 0;
++ int seed_flag = 0;
+ for (ip = interfaces; ip; ip = ip->next) {
+ int junk;
++ if ( ip -> hw_address.hlen <= sizeof seed )
++ continue;
+ memcpy(&junk,
+ &ip->hw_address.hbuf[ip->hw_address.hlen -
+ sizeof seed], sizeof seed);
+ seed += junk;
++ seed_flag = 1;
+ }
+- srandom(seed + cur_time);
++ if ( seed_flag == 0 ) {
++ if ( backup_seed != 0 ) {
++ seed = backup_seed;
++ log_info ("xid: rand init seed (0x%x) built using all"
++ " available interfaces",seed);
++ }
++ else {
++ seed = cur_time^((unsigned) gethostid()) ;
++ log_info ("xid: warning: no netdev with useable HWADDR found"
++ " for seed's uniqueness enforcement");
++ log_info ("xid: rand init seed (0x%x) built using gethostid",
++ seed);
++ }
++ /* we only use seed and no current time as a broadcast reply */
++ /* will certainly be used by the hwaddrless interface */
++ srandom(seed);
++ }
++ else
++ srandom(seed + cur_time);
+
+ /* Setup specific Infiniband options */
+ for (ip = interfaces; ip; ip = ip->next) {
+@@ -1310,7 +1352,7 @@ void dhcpack (packet)
+ return;
+ }
+
+- log_info ("DHCPACK from %s", piaddr (packet -> client_addr));
++ log_info ("DHCPACK from %s (xid=0x%x)", piaddr (packet -> client_addr), client -> xid);
+
+ lease = packet_to_lease (packet, client);
+ if (!lease) {
+@@ -2010,7 +2052,7 @@ void dhcpnak (packet)
+ return;
+ }
+
+- log_info ("DHCPNAK from %s", piaddr (packet -> client_addr));
++ log_info ("DHCPNAK from %s (xid=0x%x)", piaddr (packet -> client_addr), client -> xid);
+
+ if (!client -> active) {
+ #if defined (DEBUG)
+@@ -2136,10 +2178,10 @@ void send_discover (cpp)
+ client -> packet.secs = htons (65535);
+ client -> secs = client -> packet.secs;
+
+- log_info ("DHCPDISCOVER on %s to %s port %d interval %ld",
++ log_info ("DHCPDISCOVER on %s to %s port %d interval %ld (xid=0x%x)",
+ client -> name ? client -> name : client -> interface -> name,
+ inet_ntoa (sockaddr_broadcast.sin_addr),
+- ntohs (sockaddr_broadcast.sin_port), (long)(client -> interval));
++ ntohs (sockaddr_broadcast.sin_port), (long)(client -> interval), client -> xid);
+
+ /* Send out a packet. */
+ result = send_packet (client -> interface, (struct packet *)0,
+@@ -2394,10 +2436,10 @@ void send_request (cpp)
+ client -> packet.secs = htons (65535);
+ }
+
+- log_info ("DHCPREQUEST on %s to %s port %d",
++ log_info ("DHCPREQUEST on %s to %s port %d (xid=0x%x)",
+ client -> name ? client -> name : client -> interface -> name,
+ inet_ntoa (destination.sin_addr),
+- ntohs (destination.sin_port));
++ ntohs (destination.sin_port), client -> xid);
+
+ if (destination.sin_addr.s_addr != INADDR_BROADCAST &&
+ fallback_interface)
+@@ -2427,10 +2469,10 @@ void send_decline (cpp)
+
+ int result;
+
+- log_info ("DHCPDECLINE on %s to %s port %d",
++ log_info ("DHCPDECLINE on %s to %s port %d (xid=0x%x)",
+ client -> name ? client -> name : client -> interface -> name,
+ inet_ntoa (sockaddr_broadcast.sin_addr),
+- ntohs (sockaddr_broadcast.sin_port));
++ ntohs (sockaddr_broadcast.sin_port), client -> xid);
+
+ /* Send out a packet. */
+ result = send_packet (client -> interface, (struct packet *)0,
+@@ -2470,10 +2512,10 @@ void send_release (cpp)
+ return;
+ }
+
+- log_info ("DHCPRELEASE on %s to %s port %d",
++ log_info ("DHCPRELEASE on %s to %s port %d (xid=0x%x)",
+ client -> name ? client -> name : client -> interface -> name,
+ inet_ntoa (destination.sin_addr),
+- ntohs (destination.sin_port));
++ ntohs (destination.sin_port), client -> xid);
+
+ if (fallback_interface)
+ result = send_packet (fallback_interface,
diff --git a/net-misc/dhcp/files/dhcp-4.2.0-lpf-ib.patch b/net-misc/dhcp/files/dhcp-4.2.0-lpf-ib.patch
new file mode 100644
index 000000000..52a7aa8a2
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.2.0-lpf-ib.patch
@@ -0,0 +1,538 @@
+diff -up dhcp-4.2.0/common/lpf.c.ib dhcp-4.2.0/common/lpf.c
+--- dhcp-4.2.0/common/lpf.c.ib 2010-09-23 05:24:09.000000000 -0400
++++ dhcp-4.2.0/common/lpf.c 2010-09-23 06:21:03.000000000 -0400
+@@ -42,6 +42,7 @@
+ #include "includes/netinet/udp.h"
+ #include "includes/netinet/if_ether.h"
+ #include <net/if.h>
++#include <ifaddrs.h>
+
+ #ifndef PACKET_AUXDATA
+ #define PACKET_AUXDATA 8
+@@ -59,6 +60,15 @@ struct tpacket_auxdata
+ /* Reinitializes the specified interface after an address change. This
+ is not required for packet-filter APIs. */
+
++/* Default broadcast address for IPoIB */
++static unsigned char default_ib_bcast_addr[20] = {
++ 0x00, 0xff, 0xff, 0xff,
++ 0xff, 0x12, 0x40, 0x1b,
++ 0x00, 0x00, 0x00, 0x00,
++ 0x00, 0x00, 0x00, 0x00,
++ 0xff, 0xff, 0xff, 0xff
++};
++
+ #ifdef USE_LPF_SEND
+ void if_reinitialize_send (info)
+ struct interface_info *info;
+@@ -86,10 +96,21 @@ int if_register_lpf (info)
+ struct sockaddr common;
+ } sa;
+ struct ifreq ifr;
++ int type;
++ int protocol;
+
+ /* Make an LPF socket. */
+- if ((sock = socket(PF_PACKET, SOCK_RAW,
+- htons((short)ETH_P_ALL))) < 0) {
++ get_hw_addr(info);
++
++ if (info->hw_address.hbuf[0] == HTYPE_INFINIBAND) {
++ type = SOCK_DGRAM;
++ protocol = ETHERTYPE_IP;
++ } else {
++ type = SOCK_RAW;
++ protocol = ETH_P_ALL;
++ }
++
++ if ((sock = socket(PF_PACKET, type, htons((short)protocol))) < 0) {
+ if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||
+ errno == ESOCKTNOSUPPORT || errno == EPFNOSUPPORT ||
+ errno == EAFNOSUPPORT || errno == EINVAL) {
+@@ -111,6 +132,7 @@ int if_register_lpf (info)
+ /* Bind to the interface name */
+ memset (&sa, 0, sizeof sa);
+ sa.ll.sll_family = AF_PACKET;
++ sa.ll.sll_protocol = htons(protocol);
+ sa.ll.sll_ifindex = ifr.ifr_ifindex;
+ if (bind (sock, &sa.common, sizeof sa)) {
+ if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||
+@@ -126,8 +148,6 @@ int if_register_lpf (info)
+ log_fatal ("Bind socket to interface: %m");
+ }
+
+- get_hw_addr(info->name, &info->hw_address);
+-
+ return sock;
+ }
+ #endif /* USE_LPF_SEND || USE_LPF_RECEIVE */
+@@ -182,6 +202,8 @@ void if_deregister_send (info)
+ in bpf includes... */
+ extern struct sock_filter dhcp_bpf_filter [];
+ extern int dhcp_bpf_filter_len;
++extern struct sock_filter dhcp_ib_bpf_filter [];
++extern int dhcp_ib_bpf_filter_len;
+
+ #if defined (HAVE_TR_SUPPORT)
+ extern struct sock_filter dhcp_bpf_tr_filter [];
+@@ -199,11 +221,13 @@ void if_register_receive (info)
+ /* Open a LPF device and hang it on this interface... */
+ info -> rfdesc = if_register_lpf (info);
+
+- val = 1;
+- if (setsockopt (info -> rfdesc, SOL_PACKET, PACKET_AUXDATA, &val,
+- sizeof val) < 0) {
+- if (errno != ENOPROTOOPT)
+- log_fatal ("Failed to set auxiliary packet data: %m");
++ if (info->hw_address.hbuf[0] != HTYPE_INFINIBAND) {
++ val = 1;
++ if (setsockopt (info -> rfdesc, SOL_PACKET, PACKET_AUXDATA,
++ &val, sizeof val) < 0) {
++ if (errno != ENOPROTOOPT)
++ log_fatal ("Failed to set auxiliary packet data: %m");
++ }
+ }
+
+ #if defined (HAVE_TR_SUPPORT)
+@@ -249,15 +273,28 @@ static void lpf_gen_filter_setup (info)
+
+ memset(&p, 0, sizeof(p));
+
+- /* Set up the bpf filter program structure. This is defined in
+- bpf.c */
+- p.len = dhcp_bpf_filter_len;
+- p.filter = dhcp_bpf_filter;
+-
+- /* Patch the server port into the LPF program...
+- XXX changes to filter program may require changes
+- to the insn number(s) used below! XXX */
+- dhcp_bpf_filter [8].k = ntohs ((short)local_port);
++ if (info->hw_address.hbuf[0] == HTYPE_INFINIBAND) {
++ /* Set up the bpf filter program structure. */
++ p.len = dhcp_ib_bpf_filter_len;
++ p.filter = dhcp_ib_bpf_filter;
++
++ /* Patch the server port into the LPF program...
++ XXX
++ changes to filter program may require changes
++ to the insn number(s) used below!
++ XXX */
++ dhcp_ib_bpf_filter[6].k = ntohs ((short)local_port);
++ } else {
++ /* Set up the bpf filter program structure.
++ This is defined in bpf.c */
++ p.len = dhcp_bpf_filter_len;
++ p.filter = dhcp_bpf_filter;
++
++ /* Patch the server port into the LPF program...
++ XXX changes to filter program may require changes
++ to the insn number(s) used below! XXX */
++ dhcp_bpf_filter [8].k = ntohs ((short)local_port);
++ }
+
+ if (setsockopt (info -> rfdesc, SOL_SOCKET, SO_ATTACH_FILTER, &p,
+ sizeof p) < 0) {
+@@ -314,6 +351,54 @@ static void lpf_tr_filter_setup (info)
+ #endif /* USE_LPF_RECEIVE */
+
+ #ifdef USE_LPF_SEND
++ssize_t send_packet_ib(interface, packet, raw, len, from, to, hto)
++ struct interface_info *interface;
++ struct packet *packet;
++ struct dhcp_packet *raw;
++ size_t len;
++ struct in_addr from;
++ struct sockaddr_in *to;
++ struct hardware *hto;
++{
++ unsigned ibufp = 0;
++ double ih [1536 / sizeof (double)];
++ unsigned char *buf = (unsigned char *)ih;
++ ssize_t result;
++
++ union sockunion {
++ struct sockaddr sa;
++ struct sockaddr_ll sll;
++ struct sockaddr_storage ss;
++ } su;
++
++ assemble_udp_ip_header (interface, buf, &ibufp, from.s_addr,
++ to->sin_addr.s_addr, to->sin_port,
++ (unsigned char *)raw, len);
++ memcpy (buf + ibufp, raw, len);
++
++ memset(&su, 0, sizeof(su));
++ su.sll.sll_family = AF_PACKET;
++ su.sll.sll_protocol = htons(ETHERTYPE_IP);
++
++ if (!(su.sll.sll_ifindex = if_nametoindex(interface->name))) {
++ errno = ENOENT;
++ log_error ("send_packet_ib: %m - failed to get if index");
++ return -1;
++ }
++
++ su.sll.sll_hatype = htons(HTYPE_INFINIBAND);
++ su.sll.sll_halen = sizeof(interface->bcast_addr);
++ memcpy(&su.sll.sll_addr, interface->bcast_addr, 20);
++
++ result = sendto(interface->wfdesc, buf, ibufp + len, 0,
++ &su.sa, sizeof(su));
++
++ if (result < 0)
++ log_error ("send_packet_ib: %m");
++
++ return result;
++}
++
+ ssize_t send_packet (interface, packet, raw, len, from, to, hto)
+ struct interface_info *interface;
+ struct packet *packet;
+@@ -334,6 +419,11 @@ ssize_t send_packet (interface, packet,
+ return send_fallback (interface, packet, raw,
+ len, from, to, hto);
+
++ if (interface->hw_address.hbuf[0] == HTYPE_INFINIBAND) {
++ return send_packet_ib(interface, packet, raw, len, from,
++ to, hto);
++ }
++
+ if (hto == NULL && interface->anycast_mac_addr.hlen)
+ hto = &interface->anycast_mac_addr;
+
+@@ -355,6 +445,42 @@ ssize_t send_packet (interface, packet,
+ #endif /* USE_LPF_SEND */
+
+ #ifdef USE_LPF_RECEIVE
++ssize_t receive_packet_ib (interface, buf, len, from, hfrom)
++ struct interface_info *interface;
++ unsigned char *buf;
++ size_t len;
++ struct sockaddr_in *from;
++ struct hardware *hfrom;
++{
++ int length = 0;
++ int offset = 0;
++ unsigned char ibuf [1536];
++ unsigned bufix = 0;
++ unsigned paylen;
++
++ length = read(interface->rfdesc, ibuf, sizeof(ibuf));
++
++ if (length <= 0)
++ return length;
++
++ offset = decode_udp_ip_header(interface, ibuf, bufix, from,
++ (unsigned)length, &paylen, 0);
++
++ if (offset < 0)
++ return 0;
++
++ bufix += offset;
++ length -= offset;
++
++ if (length < paylen)
++ log_fatal("Internal inconsistency at %s:%d.", MDL);
++
++ /* Copy out the data in the packet... */
++ memcpy(buf, &ibuf[bufix], paylen);
++
++ return (ssize_t)paylen;
++}
++
+ ssize_t receive_packet (interface, buf, len, from, hfrom)
+ struct interface_info *interface;
+ unsigned char *buf;
+@@ -381,6 +507,10 @@ ssize_t receive_packet (interface, buf,
+ };
+ struct cmsghdr *cmsg;
+
++ if (interface->hw_address.hbuf[0] == HTYPE_INFINIBAND) {
++ return receive_packet_ib(interface, buf, len, from, hfrom);
++ }
++
+ length = recvmsg (interface -> rfdesc, &msg, 0);
+ if (length <= 0)
+ return length;
+@@ -461,33 +591,41 @@ void maybe_setup_fallback ()
+ }
+
+ void
+-get_hw_addr(const char *name, struct hardware *hw) {
+- int sock;
+- struct ifreq tmp;
+- struct sockaddr *sa;
++get_hw_addr(struct interface_info *info)
++{
++ struct hardware *hw = &info->hw_address;
++ char *name = info->name;
++ struct ifaddrs *ifaddrs;
++ struct ifaddrs *ifa;
++ struct sockaddr_ll *sll = NULL;
+
+- if (strlen(name) >= sizeof(tmp.ifr_name)) {
+- log_fatal("Device name too long: \"%s\"", name);
+- }
++ if (getifaddrs(&ifaddrs) == -1)
++ log_fatal("Failed to get interfaces");
++
++ for (ifa = ifaddrs; ifa != NULL; ifa = ifa->ifa_next) {
++
++ if (ifa->ifa_addr->sa_family != AF_PACKET)
++ continue;
+
+- sock = socket(AF_INET, SOCK_DGRAM, 0);
+- if (sock < 0) {
+- log_fatal("Can't create socket for \"%s\": %m", name);
++ if (ifa->ifa_flags & IFF_LOOPBACK)
++ continue;
++
++ if (strcmp(ifa->ifa_name, name) == 0) {
++ sll = (struct sockaddr_ll *)(void *)ifa->ifa_addr;
++ break;
++ }
+ }
+
+- memset(&tmp, 0, sizeof(tmp));
+- strcpy(tmp.ifr_name, name);
+- if (ioctl(sock, SIOCGIFHWADDR, &tmp) < 0) {
+- log_fatal("Error getting hardware address for \"%s\": %m",
+- name);
++ if (sll == NULL) {
++ freeifaddrs(ifaddrs);
++ log_fatal("Failed to get HW address for %s\n", name);
+ }
+
+- sa = &tmp.ifr_hwaddr;
+- switch (sa->sa_family) {
++ switch (sll->sll_hatype) {
+ case ARPHRD_ETHER:
+ hw->hlen = 7;
+ hw->hbuf[0] = HTYPE_ETHER;
+- memcpy(&hw->hbuf[1], sa->sa_data, 6);
++ memcpy(&hw->hbuf[1], sll->sll_addr, 6);
+ break;
+ case ARPHRD_IEEE802:
+ #ifdef ARPHRD_IEEE802_TR
+@@ -495,18 +633,36 @@ get_hw_addr(const char *name, struct har
+ #endif /* ARPHRD_IEEE802_TR */
+ hw->hlen = 7;
+ hw->hbuf[0] = HTYPE_IEEE802;
+- memcpy(&hw->hbuf[1], sa->sa_data, 6);
++ memcpy(&hw->hbuf[1], sll->sll_addr, 6);
+ break;
+ case ARPHRD_FDDI:
+ hw->hlen = 17;
+ hw->hbuf[0] = HTYPE_FDDI;
+- memcpy(&hw->hbuf[1], sa->sa_data, 16);
++ memcpy(&hw->hbuf[1], sll->sll_addr, 16);
++ break;
++ case ARPHRD_INFINIBAND:
++ /* For Infiniband, save the broadcast address and store
++ * the port GUID into the hardware address.
++ */
++ if (ifa->ifa_flags & IFF_BROADCAST) {
++ struct sockaddr_ll *bll;
++
++ bll = (struct sockaddr_ll *)ifa->ifa_broadaddr;
++ memcpy(&info->bcast_addr, bll->sll_addr, 20);
++ } else {
++ memcpy(&info->bcast_addr, default_ib_bcast_addr,
++ 20);
++ }
++
++ hw->hlen = 1;
++ hw->hbuf[0] = HTYPE_INFINIBAND;
+ break;
+ default:
++ freeifaddrs(ifaddrs);
+ log_fatal("Unsupported device type %ld for \"%s\"",
+- (long int)sa->sa_family, name);
++ (long int)sll->sll_family, name);
+ }
+
+- close(sock);
++ freeifaddrs(ifaddrs);
+ }
+ #endif
+diff -up dhcp-4.2.0/includes/dhcp.h.ib dhcp-4.2.0/includes/dhcp.h
+--- dhcp-4.2.0/includes/dhcp.h.ib 2009-11-19 20:49:01.000000000 -0500
++++ dhcp-4.2.0/includes/dhcp.h 2010-09-23 06:21:03.000000000 -0400
+@@ -79,6 +79,7 @@ struct dhcp_packet {
+ #define HTYPE_ETHER 1 /* Ethernet 10Mbps */
+ #define HTYPE_IEEE802 6 /* IEEE 802.2 Token Ring... */
+ #define HTYPE_FDDI 8 /* FDDI... */
++#define HTYPE_INFINIBAND 32 /* Infiniband IPoIB */
+
+ /* Magic cookie validating dhcp options field (and bootp vendor
+ extensions field). */
+diff -up dhcp-4.2.0/client/dhclient.c.ib dhcp-4.2.0/client/dhclient.c
+--- dhcp-4.2.0/client/dhclient.c.ib 2010-09-23 06:11:14.000000000 -0400
++++ dhcp-4.2.0/client/dhclient.c 2010-09-23 06:21:03.000000000 -0400
+@@ -98,6 +98,29 @@ static void usage(void);
+
+ static isc_result_t write_duid(struct data_string *duid);
+
++static void setup_ib_interface(struct interface_info *ip)
++{
++ struct group *g;
++
++ /* Set the broadcast flag */
++ ip->client->config->bootp_broadcast_always = 1;
++
++ /*
++ * Find out if a dhcp-client-identifier option was specified either
++ * in the config file or on the command line
++ */
++ for (g = ip->client->config->on_transmission; g != NULL; g = g->next) {
++ if ((g->statements != NULL) &&
++ (strcmp(g->statements->data.option->option->name,
++ "dhcp-client-identifier") == 0)) {
++ return;
++ }
++ }
++
++ /* No client ID specified */
++ log_fatal("dhcp-client-identifier must be specified for InfiniBand");
++}
++
+ int
+ main(int argc, char **argv) {
+ int fd;
+@@ -805,6 +828,14 @@ main(int argc, char **argv) {
+ }
+ srandom(seed + cur_time);
+
++ /* Setup specific Infiniband options */
++ for (ip = interfaces; ip; ip = ip->next) {
++ if (ip->client &&
++ (ip->hw_address.hbuf[0] == HTYPE_INFINIBAND)) {
++ setup_ib_interface(ip);
++ }
++ }
++
+ /* Start a configuration state machine for each interface. */
+ #ifdef DHCPv6
+ if (local_family == AF_INET6) {
+diff -up dhcp-4.2.0/common/bpf.c.ib dhcp-4.2.0/common/bpf.c
+--- dhcp-4.2.0/common/bpf.c.ib 2010-09-23 05:24:01.000000000 -0400
++++ dhcp-4.2.0/common/bpf.c 2010-09-23 06:37:48.000000000 -0400
+@@ -116,7 +116,7 @@ int if_register_bpf (info)
+ log_fatal ("Can't attach interface %s to bpf device %s: %m",
+ info -> name, filename);
+
+- get_hw_addr(info->name, &info->hw_address);
++ get_hw_addr(info);
+
+ return sock;
+ }
+@@ -198,11 +198,44 @@ struct bpf_insn dhcp_bpf_filter [] = {
+ BPF_STMT(BPF_RET+BPF_K, 0),
+ };
+
++/* Packet filter program for DHCP over Infiniband.
++ *
++ * XXX
++ * Changes to the filter program may require changes to the constant offsets
++ * used in lpf_gen_filter_setup to patch the port in the BPF program!
++ * XXX
++ */
++struct bpf_insn dhcp_ib_bpf_filter [] = {
++ /* Packet filter for Infiniband */
++ /* Make sure it's a UDP packet... */
++ BPF_STMT(BPF_LD + BPF_B + BPF_ABS, 9),
++ BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, IPPROTO_UDP, 0, 6),
++
++ /* Make sure this isn't a fragment... */
++ BPF_STMT(BPF_LD + BPF_H + BPF_ABS, 6),
++ BPF_JUMP(BPF_JMP + BPF_JSET + BPF_K, 0x1fff, 4, 0),
++
++ /* Get the IP header length... */
++ BPF_STMT(BPF_LDX + BPF_B + BPF_MSH, 0),
++
++ /* Make sure it's to the right port... */
++ BPF_STMT(BPF_LD + BPF_H + BPF_IND, 2),
++ BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, 67, 0, 1),
++
++ /* If we passed all the tests, ask for the whole packet. */
++ BPF_STMT(BPF_RET + BPF_K, (u_int)-1),
++
++ /* Otherwise, drop it. */
++ BPF_STMT(BPF_RET + BPF_K, 0),
++};
++
+ #if defined (DEC_FDDI)
+ struct bpf_insn *bpf_fddi_filter;
+ #endif
+
+ int dhcp_bpf_filter_len = sizeof dhcp_bpf_filter / sizeof (struct bpf_insn);
++int dhcp_ib_bpf_filter_len = sizeof dhcp_ib_bpf_filter / sizeof (struct bpf_insn);
++
+ #if defined (HAVE_TR_SUPPORT)
+ struct bpf_insn dhcp_bpf_tr_filter [] = {
+ /* accept all token ring packets due to variable length header */
+@@ -552,7 +585,9 @@ void maybe_setup_fallback ()
+ }
+
+ void
+-get_hw_addr(const char *name, struct hardware *hw) {
++get_hw_addr(struct interface_info *info) {
++ struct hardware *hw = &info->hw_address;
++ char *name = info->name;
+ struct ifaddrs *ifa;
+ struct ifaddrs *p;
+ struct sockaddr_dl *sa;
+diff -up dhcp-4.2.0/common/socket.c.ib dhcp-4.2.0/common/socket.c
+--- dhcp-4.2.0/common/socket.c.ib 2009-11-19 20:49:01.000000000 -0500
++++ dhcp-4.2.0/common/socket.c 2010-09-23 06:21:03.000000000 -0400
+@@ -283,7 +283,7 @@ if_register_socket(struct interface_info
+
+ /* If this is a normal IPv4 address, get the hardware address. */
+ if ((local_family == AF_INET) && (strcmp(info->name, "fallback") != 0))
+- get_hw_addr(info->name, &info->hw_address);
++ get_hw_addr(info);
+
+ return sock;
+ }
+@@ -429,7 +429,7 @@ if_register6(struct interface_info *info
+ if (req_multi)
+ if_register_multicast(info);
+
+- get_hw_addr(info->name, &info->hw_address);
++ get_hw_addr(info);
+
+ if (!quiet_interface_discovery) {
+ if (info->shared_network != NULL) {
+diff -up dhcp-4.2.0/includes/dhcpd.h.ib dhcp-4.2.0/includes/dhcpd.h
+--- dhcp-4.2.0/includes/dhcpd.h.ib 2010-09-23 06:07:17.000000000 -0400
++++ dhcp-4.2.0/includes/dhcpd.h 2010-09-23 06:21:03.000000000 -0400
+@@ -1214,6 +1214,7 @@ struct interface_info {
+ struct shared_network *shared_network;
+ /* Networks connected to this interface. */
+ struct hardware hw_address; /* Its physical address. */
++ u_int8_t bcast_addr[20]; /* Infiniband broadcast address */
+ struct in_addr *addresses; /* Addresses associated with this
+ * interface.
+ */
+@@ -2324,7 +2325,7 @@ void print_dns_status (int, struct dhcp_
+ #endif
+ const char *print_time(TIME);
+
+-void get_hw_addr(const char *name, struct hardware *hw);
++void get_hw_addr(struct interface_info *info);
+
+ /* socket.c */
+ #if defined (USE_SOCKET_SEND) || defined (USE_SOCKET_RECEIVE) \
+diff -up dhcp-4.2.0/common/dlpi.c.ib dhcp-4.2.0/common/dlpi.c
+--- dhcp-4.2.0/common/dlpi.c.ib 2010-09-23 05:24:05.000000000 -0400
++++ dhcp-4.2.0/common/dlpi.c 2010-09-23 06:39:26.000000000 -0400
+@@ -1342,7 +1342,9 @@ void maybe_setup_fallback ()
+ #endif /* USE_DLPI_SEND */
+
+ void
+-get_hw_addr(const char *name, struct hardware *hw) {
++get_hw_addr(struct interface_info *info) {
++ struct hardware *hw = &info->hw_address;
++ char *name = info->name;
+ int sock, unit;
+ long buf[DLPI_MAXDLBUF];
+ union DL_primitives *dlp;
diff --git a/net-misc/dhcp/files/dhcp-4.2.0-options.patch b/net-misc/dhcp/files/dhcp-4.2.0-options.patch
new file mode 100644
index 000000000..6c2062afa
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.2.0-options.patch
@@ -0,0 +1,401 @@
+diff -up dhcp-4.2.0/client/clparse.c.options dhcp-4.2.0/client/clparse.c
+--- dhcp-4.2.0/client/clparse.c.options 2009-11-19 20:48:58.000000000 -0500
++++ dhcp-4.2.0/client/clparse.c 2010-09-23 06:07:17.000000000 -0400
+@@ -136,6 +136,7 @@ isc_result_t read_client_conf ()
+ /* Requested lease time, used by DHCPv6 (DHCPv4 uses the option cache)
+ */
+ top_level_config.requested_lease = 7200;
++ top_level_config.bootp_broadcast_always = 0;
+
+ group_allocate (&top_level_config.on_receipt, MDL);
+ if (!top_level_config.on_receipt)
+@@ -303,7 +304,8 @@ void read_client_leases ()
+ interface-declaration |
+ LEASE client-lease-statement |
+ ALIAS client-lease-statement |
+- KEY key-definition */
++ KEY key-definition |
++ BOOTP_BROADCAST_ALWAYS */
+
+ void parse_client_statement (cfile, ip, config)
+ struct parse *cfile;
+@@ -717,6 +719,12 @@ void parse_client_statement (cfile, ip,
+ parse_reject_statement (cfile, config);
+ return;
+
++ case BOOTP_BROADCAST_ALWAYS:
++ token = next_token(&val, (unsigned*)0, cfile);
++ config -> bootp_broadcast_always = 1;
++ parse_semi (cfile);
++ return;
++
+ default:
+ lose = 0;
+ stmt = (struct executable_statement *)0;
+diff -up dhcp-4.2.0/client/dhclient.c.options dhcp-4.2.0/client/dhclient.c
+--- dhcp-4.2.0/client/dhclient.c.options 2010-02-17 15:33:55.000000000 -0500
++++ dhcp-4.2.0/client/dhclient.c 2010-09-23 06:11:14.000000000 -0400
+@@ -39,6 +39,12 @@
+ #include <limits.h>
+ #include <dns/result.h>
+
++/*
++ * Defined in stdio.h when _GNU_SOURCE is set, but we don't want to define
++ * that when building ISC code.
++ */
++extern int asprintf(char **strp, const char *fmt, ...);
++
+ TIME default_lease_time = 43200; /* 12 hours... */
+ TIME max_lease_time = 86400; /* 24 hours... */
+
+@@ -82,6 +88,9 @@ int wanted_ia_na = -1; /* the absolute
+ int wanted_ia_ta = 0;
+ int wanted_ia_pd = 0;
+ char *mockup_relay = NULL;
++int bootp_broadcast_always = 0;
++
++extern u_int32_t default_requested_options[];
+
+ void run_stateless(int exit_mode);
+
+@@ -112,6 +121,15 @@ main(int argc, char **argv) {
+ int local_family_set = 0;
+ #endif /* DHCPv6 */
+ char *s;
++ char *dhcp_client_identifier_arg = NULL;
++ char *dhcp_host_name_arg = NULL;
++ char *dhcp_fqdn_arg = NULL;
++ char *dhcp_vendor_class_identifier_arg = NULL;
++ char *dhclient_request_options = NULL;
++
++ int timeout_arg = 0;
++ char *arg_conf = NULL;
++ int arg_conf_len = 0;
+
+ /* Initialize client globals. */
+ memset(&default_duid, 0, sizeof(default_duid));
+@@ -297,6 +315,88 @@ main(int argc, char **argv) {
+ } else if (!strcmp(argv[i], "--version")) {
+ log_info("isc-dhclient-%s", PACKAGE_VERSION);
+ exit(0);
++ } else if (!strcmp(argv[i], "-I")) {
++ if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
++ usage();
++ exit(1);
++ }
++
++ if (strlen(argv[i]) >= DHCP_MAX_OPTION_LEN) {
++ log_error("-I option dhcp-client-identifier string \"%s\" is too long - maximum length is: %d", argv[i], DHCP_MAX_OPTION_LEN-1);
++ exit(1);
++ }
++
++ dhcp_client_identifier_arg = argv[i];
++ } else if (!strcmp(argv[i], "-B")) {
++ bootp_broadcast_always = 1;
++ } else if (!strcmp(argv[i], "-H")) {
++ if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
++ usage();
++ exit(1);
++ }
++
++ if (strlen(argv[i]) >= DHCP_MAX_OPTION_LEN) {
++ log_error("-H option host-name string \"%s\" is too long - maximum length is: %d", argv[i], DHCP_MAX_OPTION_LEN-1);
++ exit(1);
++ }
++
++ if (dhcp_host_name_arg != NULL) {
++ log_error("The -H <host-name> and -F <fqdn> arguments are mutually exclusive");
++ exit(1);
++ }
++
++ dhcp_host_name_arg = argv[i];
++ } else if (!strcmp(argv[i], "-F")) {
++ if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
++ usage();
++ exit(1);
++ }
++
++ if (strlen(argv[i]) >= DHCP_MAX_OPTION_LEN) {
++ log_error("-F option fqdn.fqdn string \"%s\" is too long - maximum length is: %d", argv[i], DHCP_MAX_OPTION_LEN-1);
++ exit(1);
++ }
++
++ if (dhcp_fqdn_arg != NULL) {
++ log_error("Only one -F <fqdn> argument can be specified");
++ exit(1);
++ }
++
++ if (dhcp_host_name_arg != NULL) {
++ log_error("The -F <fqdn> and -H <host-name> arguments are mutually exclusive");
++ exit(1);
++ }
++
++ dhcp_fqdn_arg = argv[i];
++ } else if (!strcmp(argv[i], "-timeout")) {
++ if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
++ usage();
++ exit(1);
++ }
++
++ if ((timeout_arg = atoi(argv[i])) <= 0) {
++ log_error("-T timeout option must be > 0 - bad value: %s",argv[i]);
++ exit(1);
++ }
++ } else if (!strcmp(argv[i], "-V")) {
++ if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
++ usage();
++ exit(1);
++ }
++
++ if (strlen(argv[i]) >= DHCP_MAX_OPTION_LEN) {
++ log_error("-V option vendor-class-identifier string \"%s\" is too long - maximum length is: %d", argv[i], DHCP_MAX_OPTION_LEN-1);
++ exit(1);
++ }
++
++ dhcp_vendor_class_identifier_arg = argv[i];
++ } else if (!strcmp(argv[i], "-R")) {
++ if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
++ usage();
++ exit(1);
++ }
++
++ dhclient_request_options = argv[i];
+ } else if (argv[i][0] == '-') {
+ usage();
+ } else if (interfaces_requested < 0) {
+@@ -466,6 +566,166 @@ main(int argc, char **argv) {
+ /* Parse the dhclient.conf file. */
+ read_client_conf();
+
++ /* Parse any extra command line configuration arguments: */
++ if ((dhcp_client_identifier_arg != NULL) && (*dhcp_client_identifier_arg != '\0')) {
++ arg_conf_len = asprintf(&arg_conf, "send dhcp-client-identifier \"%s\";", dhcp_client_identifier_arg);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to send -I option dhcp-client-identifier");
++ }
++
++ if ((dhcp_host_name_arg != NULL) && (*dhcp_host_name_arg != '\0')) {
++ if (arg_conf == 0) {
++ arg_conf_len = asprintf(&arg_conf, "send host-name \"%s\";", dhcp_host_name_arg);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to send -H option host-name");
++ } else {
++ char *last_arg_conf = arg_conf;
++ arg_conf = NULL;
++ arg_conf_len = asprintf(&arg_conf, "%s\nsend host-name \"%s\";", last_arg_conf, dhcp_host_name_arg);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to send -H option host-name");
++
++ free(last_arg_conf);
++ }
++ }
++
++ if ((dhcp_fqdn_arg != NULL) && (*dhcp_fqdn_arg != '\0')) {
++ if (arg_conf == 0) {
++ arg_conf_len = asprintf(&arg_conf, "send fqdn.fqdn \"%s\";", dhcp_fqdn_arg);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to send -F option fqdn.fqdn");
++ } else {
++ char *last_arg_conf = arg_conf;
++ arg_conf = NULL;
++ arg_conf_len = asprintf(&arg_conf, "%s\nsend fqdn.fqdn \"%s\";", last_arg_conf, dhcp_fqdn_arg);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to send -F option fqdn.fqdn");
++
++ free(last_arg_conf);
++ }
++ }
++
++ if (timeout_arg) {
++ if (arg_conf == 0) {
++ arg_conf_len = asprintf(&arg_conf, "timeout %d;", timeout_arg);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to process -timeout timeout argument");
++ } else {
++ char *last_arg_conf = arg_conf;
++ arg_conf = NULL;
++ arg_conf_len = asprintf(&arg_conf, "%s\ntimeout %d;", last_arg_conf, timeout_arg);
++
++ if ((arg_conf == 0) || (arg_conf_len == 0))
++ log_fatal("Unable to process -timeout timeout argument");
++
++ free(last_arg_conf);
++ }
++ }
++
++ if ((dhcp_vendor_class_identifier_arg != NULL) && (*dhcp_vendor_class_identifier_arg != '\0')) {
++ if (arg_conf == 0) {
++ arg_conf_len = asprintf(&arg_conf, "send vendor-class-identifier \"%s\";", dhcp_vendor_class_identifier_arg);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to send -V option vendor-class-identifier");
++ } else {
++ char *last_arg_conf = arg_conf;
++ arg_conf = NULL;
++ arg_conf_len = asprintf(&arg_conf, "%s\nsend vendor-class-identifier \"%s\";", last_arg_conf, dhcp_vendor_class_identifier_arg);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to send -V option vendor-class-identifier");
++
++ free(last_arg_conf);
++ }
++ }
++
++ if (dhclient_request_options != NULL) {
++ if (arg_conf == 0) {
++ arg_conf_len = asprintf(&arg_conf, "request %s;", dhclient_request_options);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to parse -R <request options list> argument");
++ } else {
++ char *last_arg_conf = arg_conf;
++ arg_conf = NULL;
++ arg_conf_len = asprintf(&arg_conf, "%s\nrequest %s;", last_arg_conf, dhclient_request_options);
++
++ if ((arg_conf == 0) || (arg_conf_len <= 0))
++ log_fatal("Unable to parse -R <request options list> argument");
++
++ free(last_arg_conf);
++ }
++ }
++
++ if (arg_conf) {
++ if (arg_conf_len == 0)
++ if ((arg_conf_len = strlen(arg_conf)) == 0)
++ /* huh ? cannot happen ! */
++ log_fatal("Unable to process -I/-H/-F/-timeout/-V/-R configuration arguments");
++
++ /* parse the extra dhclient.conf configuration arguments
++ * into top level config: */
++ struct parse *cfile = (struct parse *)0;
++ const char *val = NULL;
++ int token;
++
++ status = new_parse(&cfile, -1, arg_conf, arg_conf_len, "extra dhclient -I/-H/-F/-timeout/-V/-R configuration arguments", 0);
++
++ if ((status != ISC_R_SUCCESS) || (cfile -> warnings_occurred))
++ log_fatal("Cannot parse -I/-H/-F/-timeout/-V/-R configuration arguments !");
++ /* more detailed parse failures will be logged */
++
++ do {
++ token = peek_token(&val, (unsigned *)0, cfile);
++ if (token == END_OF_FILE)
++ break;
++
++ parse_client_statement(cfile, (struct interface_info *)0, &top_level_config);
++ } while (1);
++
++ if (cfile -> warnings_occurred)
++ log_fatal("Cannot parse -I/-H/-F/-timeout/-V/-R configuration arguments !");
++ end_parse(&cfile);
++
++ if (timeout_arg) {
++ /* we just set the toplevel timeout, but per-client
++ * timeouts may still be at defaults. Also, it makes no
++ * sense having the reboot_timeout or backoff_cutoff
++ * greater than the timeout:
++ */
++ if ((top_level_config.backoff_cutoff == 15) && (top_level_config.backoff_cutoff > (timeout_arg / 2)))
++ top_level_config.backoff_cutoff = (((unsigned long)(timeout_arg / 2)) == 0) ? timeout_arg : (unsigned long)(timeout_arg / 2);
++
++ for (ip=interfaces; ip; ip = ip->next) {
++ if (ip->client->config->timeout == 60)
++ ip->client->config->timeout = timeout_arg;
++
++ if ((ip->client->config->reboot_timeout == 10) && (ip->client->config->reboot_timeout > ip->client->config->timeout))
++ ip->client->config->reboot_timeout = ip->client->config->timeout;
++ if ((ip->client->config->backoff_cutoff == 15) && (ip->client->config->backoff_cutoff > top_level_config.backoff_cutoff))
++ ip->client->config->backoff_cutoff = top_level_config.backoff_cutoff;
++ }
++ }
++
++ if ((dhclient_request_options != 0) && (top_level_config.requested_options != (void *) default_requested_options)) {
++ for (ip=interfaces; ip; ip = ip->next) {
++ if (ip->client->config->requested_options == (void *) default_requested_options)
++ ip->client->config->requested_options = top_level_config.requested_options;
++ }
++ }
++
++ free(arg_conf);
++ arg_conf = NULL;
++ arg_conf_len = 0;
++ }
++
+ /* Parse the lease database. */
+ read_client_leases();
+
+@@ -2337,7 +2597,8 @@ void make_discover (client, lease)
+ client -> packet.xid = random ();
+ client -> packet.secs = 0; /* filled in by send_discover. */
+
+- if (can_receive_unicast_unconfigured (client -> interface))
++ if ((!(bootp_broadcast_always || client->config->bootp_broadcast_always))
++ && can_receive_unicast_unconfigured(client->interface))
+ client -> packet.flags = 0;
+ else
+ client -> packet.flags = htons (BOOTP_BROADCAST);
+@@ -2421,7 +2682,9 @@ void make_request (client, lease)
+ } else {
+ memset (&client -> packet.ciaddr, 0,
+ sizeof client -> packet.ciaddr);
+- if (can_receive_unicast_unconfigured (client -> interface))
++ if ((!(bootp_broadcast_always ||
++ client ->config->bootp_broadcast_always)) &&
++ can_receive_unicast_unconfigured (client -> interface))
+ client -> packet.flags = 0;
+ else
+ client -> packet.flags = htons (BOOTP_BROADCAST);
+@@ -2483,7 +2746,8 @@ void make_decline (client, lease)
+ client -> packet.hops = 0;
+ client -> packet.xid = client -> xid;
+ client -> packet.secs = 0; /* Filled in by send_request. */
+- if (can_receive_unicast_unconfigured (client -> interface))
++ if ((!(bootp_broadcast_always || client->config-> bootp_broadcast_always))
++ && can_receive_unicast_unconfigured (client->interface))
+ client -> packet.flags = 0;
+ else
+ client -> packet.flags = htons (BOOTP_BROADCAST);
+diff -up dhcp-4.2.0/common/conflex.c.options dhcp-4.2.0/common/conflex.c
+--- dhcp-4.2.0/common/conflex.c.options 2010-03-24 17:49:47.000000000 -0400
++++ dhcp-4.2.0/common/conflex.c 2010-09-23 06:07:17.000000000 -0400
+@@ -803,6 +803,8 @@ intern(char *atom, enum dhcp_token dfv)
+ return BALANCE;
+ if (!strcasecmp (atom + 1, "ound"))
+ return BOUND;
++ if (!strcasecmp (atom + 1, "ootp-broadcast-always"))
++ return BOOTP_BROADCAST_ALWAYS;
+ break;
+ case 'c':
+ if (!strcasecmp(atom + 1, "ase"))
+diff -up dhcp-4.2.0/includes/dhcpd.h.options dhcp-4.2.0/includes/dhcpd.h
+--- dhcp-4.2.0/includes/dhcpd.h.options 2010-09-23 05:24:32.000000000 -0400
++++ dhcp-4.2.0/includes/dhcpd.h 2010-09-23 06:07:17.000000000 -0400
+@@ -1119,6 +1119,9 @@ struct client_config {
+ int do_forward_update; /* If nonzero, and if we have the
+ information we need, update the
+ A record for the address we get. */
++
++ int bootp_broadcast_always; /* If nonzero, always set the BOOTP_BROADCAST
++ flag in requests */
+ };
+
+ /* Per-interface state used in the dhcp client... */
+diff -up dhcp-4.2.0/includes/dhctoken.h.options dhcp-4.2.0/includes/dhctoken.h
+--- dhcp-4.2.0/includes/dhctoken.h.options 2010-02-17 15:33:55.000000000 -0500
++++ dhcp-4.2.0/includes/dhctoken.h 2010-09-23 06:08:18.000000000 -0400
+@@ -357,7 +357,8 @@ enum dhcp_token {
+ CONFLICT_DONE = 660,
+ AUTO_PARTNER_DOWN = 661,
+ GETHOSTNAME = 662,
+- REWIND = 663
++ REWIND = 663,
++ BOOTP_BROADCAST_ALWAYS = 664
+ };
+
+ #define is_identifier(x) ((x) >= FIRST_TOKEN && \
diff --git a/net-misc/dhcp/files/dhcp-4.2.0-xen-checksum.patch b/net-misc/dhcp/files/dhcp-4.2.0-xen-checksum.patch
new file mode 100644
index 000000000..fe33bdf50
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.2.0-xen-checksum.patch
@@ -0,0 +1,245 @@
+diff -up dhcp-4.2.0/common/bpf.c.xen dhcp-4.2.0/common/bpf.c
+--- dhcp-4.2.0/common/bpf.c.xen 2009-11-19 20:48:59.000000000 -0500
++++ dhcp-4.2.0/common/bpf.c 2010-09-23 05:24:01.000000000 -0400
+@@ -485,7 +485,7 @@ ssize_t receive_packet (interface, buf,
+ offset = decode_udp_ip_header (interface,
+ interface -> rbuf,
+ interface -> rbuf_offset,
+- from, hdr.bh_caplen, &paylen);
++ from, hdr.bh_caplen, &paylen, 0);
+
+ /* If the IP or UDP checksum was bad, skip the packet... */
+ if (offset < 0) {
+diff -up dhcp-4.2.0/common/dlpi.c.xen dhcp-4.2.0/common/dlpi.c
+--- dhcp-4.2.0/common/dlpi.c.xen 2009-11-19 20:49:00.000000000 -0500
++++ dhcp-4.2.0/common/dlpi.c 2010-09-23 05:24:05.000000000 -0400
+@@ -694,7 +694,7 @@ ssize_t receive_packet (interface, buf,
+ length -= offset;
+ #endif
+ offset = decode_udp_ip_header (interface, dbuf, bufix,
+- from, length, &paylen);
++ from, length, &paylen, 0);
+
+ /*
+ * If the IP or UDP checksum was bad, skip the packet...
+diff -up dhcp-4.2.0/common/lpf.c.xen dhcp-4.2.0/common/lpf.c
+--- dhcp-4.2.0/common/lpf.c.xen 2009-07-23 14:52:19.000000000 -0400
++++ dhcp-4.2.0/common/lpf.c 2010-09-23 05:24:09.000000000 -0400
+@@ -29,18 +29,33 @@
+ #include "dhcpd.h"
+ #if defined (USE_LPF_SEND) || defined (USE_LPF_RECEIVE)
+ #include <sys/ioctl.h>
++#include <sys/socket.h>
+ #include <sys/uio.h>
+ #include <errno.h>
+
+ #include <asm/types.h>
+ #include <linux/filter.h>
+ #include <linux/if_ether.h>
++#include <linux/if_packet.h>
+ #include <netinet/in_systm.h>
+ #include "includes/netinet/ip.h"
+ #include "includes/netinet/udp.h"
+ #include "includes/netinet/if_ether.h"
+ #include <net/if.h>
+
++#ifndef PACKET_AUXDATA
++#define PACKET_AUXDATA 8
++
++struct tpacket_auxdata
++{
++ __u32 tp_status;
++ __u32 tp_len;
++ __u32 tp_snaplen;
++ __u16 tp_mac;
++ __u16 tp_net;
++};
++#endif
++
+ /* Reinitializes the specified interface after an address change. This
+ is not required for packet-filter APIs. */
+
+@@ -66,10 +81,14 @@ int if_register_lpf (info)
+ struct interface_info *info;
+ {
+ int sock;
+- struct sockaddr sa;
++ union {
++ struct sockaddr_ll ll;
++ struct sockaddr common;
++ } sa;
++ struct ifreq ifr;
+
+ /* Make an LPF socket. */
+- if ((sock = socket(PF_PACKET, SOCK_PACKET,
++ if ((sock = socket(PF_PACKET, SOCK_RAW,
+ htons((short)ETH_P_ALL))) < 0) {
+ if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||
+ errno == ESOCKTNOSUPPORT || errno == EPFNOSUPPORT ||
+@@ -84,11 +103,16 @@ int if_register_lpf (info)
+ log_fatal ("Open a socket for LPF: %m");
+ }
+
++ memset (&ifr, 0, sizeof ifr);
++ strncpy (ifr.ifr_name, (const char *)info -> ifp, sizeof ifr.ifr_name);
++ if (ioctl (sock, SIOCGIFINDEX, &ifr))
++ log_fatal ("Failed to get interface index: %m");
++
+ /* Bind to the interface name */
+ memset (&sa, 0, sizeof sa);
+- sa.sa_family = AF_PACKET;
+- strncpy (sa.sa_data, (const char *)info -> ifp, sizeof sa.sa_data);
+- if (bind (sock, &sa, sizeof sa)) {
++ sa.ll.sll_family = AF_PACKET;
++ sa.ll.sll_ifindex = ifr.ifr_ifindex;
++ if (bind (sock, &sa.common, sizeof sa)) {
+ if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||
+ errno == ESOCKTNOSUPPORT || errno == EPFNOSUPPORT ||
+ errno == EAFNOSUPPORT || errno == EINVAL) {
+@@ -170,9 +194,18 @@ static void lpf_gen_filter_setup (struct
+ void if_register_receive (info)
+ struct interface_info *info;
+ {
++ int val;
++
+ /* Open a LPF device and hang it on this interface... */
+ info -> rfdesc = if_register_lpf (info);
+
++ val = 1;
++ if (setsockopt (info -> rfdesc, SOL_PACKET, PACKET_AUXDATA, &val,
++ sizeof val) < 0) {
++ if (errno != ENOPROTOOPT)
++ log_fatal ("Failed to set auxiliary packet data: %m");
++ }
++
+ #if defined (HAVE_TR_SUPPORT)
+ if (info -> hw_address.hbuf [0] == HTYPE_IEEE802)
+ lpf_tr_filter_setup (info);
+@@ -294,7 +327,6 @@ ssize_t send_packet (interface, packet,
+ double hh [16];
+ double ih [1536 / sizeof (double)];
+ unsigned char *buf = (unsigned char *)ih;
+- struct sockaddr sa;
+ int result;
+ int fudge;
+
+@@ -315,15 +347,7 @@ ssize_t send_packet (interface, packet,
+ (unsigned char *)raw, len);
+ memcpy (buf + ibufp, raw, len);
+
+- /* For some reason, SOCK_PACKET sockets can't be connected,
+- so we have to do a sentdo every time. */
+- memset (&sa, 0, sizeof sa);
+- sa.sa_family = AF_PACKET;
+- strncpy (sa.sa_data,
+- (const char *)interface -> ifp, sizeof sa.sa_data);
+-
+- result = sendto (interface -> wfdesc,
+- buf + fudge, ibufp + len - fudge, 0, &sa, sizeof sa);
++ result = write (interface -> wfdesc, buf + fudge, ibufp + len - fudge);
+ if (result < 0)
+ log_error ("send_packet: %m");
+ return result;
+@@ -340,14 +364,35 @@ ssize_t receive_packet (interface, buf,
+ {
+ int length = 0;
+ int offset = 0;
++ int nocsum = 0;
+ unsigned char ibuf [1536];
+ unsigned bufix = 0;
+ unsigned paylen;
++ unsigned char cmsgbuf[CMSG_LEN(sizeof(struct tpacket_auxdata))];
++ struct iovec iov = {
++ .iov_base = ibuf,
++ .iov_len = sizeof ibuf,
++ };
++ struct msghdr msg = {
++ .msg_iov = &iov,
++ .msg_iovlen = 1,
++ .msg_control = cmsgbuf,
++ .msg_controllen = sizeof(cmsgbuf),
++ };
++ struct cmsghdr *cmsg;
+
+- length = read (interface -> rfdesc, ibuf, sizeof ibuf);
++ length = recvmsg (interface -> rfdesc, &msg, 0);
+ if (length <= 0)
+ return length;
+
++ for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
++ if (cmsg->cmsg_level == SOL_PACKET &&
++ cmsg->cmsg_type == PACKET_AUXDATA) {
++ struct tpacket_auxdata *aux = (void *)CMSG_DATA(cmsg);
++ nocsum = aux->tp_status & TP_STATUS_CSUMNOTREADY;
++ }
++ }
++
+ bufix = 0;
+ /* Decode the physical header... */
+ offset = decode_hw_header (interface, ibuf, bufix, hfrom);
+@@ -364,7 +409,7 @@ ssize_t receive_packet (interface, buf,
+
+ /* Decode the IP and UDP headers... */
+ offset = decode_udp_ip_header (interface, ibuf, bufix, from,
+- (unsigned)length, &paylen);
++ (unsigned)length, &paylen, nocsum);
+
+ /* If the IP or UDP checksum was bad, skip the packet... */
+ if (offset < 0)
+diff -up dhcp-4.2.0/common/nit.c.xen dhcp-4.2.0/common/nit.c
+--- dhcp-4.2.0/common/nit.c.xen 2009-11-19 20:49:01.000000000 -0500
++++ dhcp-4.2.0/common/nit.c 2010-09-23 05:24:18.000000000 -0400
+@@ -369,7 +369,7 @@ ssize_t receive_packet (interface, buf,
+
+ /* Decode the IP and UDP headers... */
+ offset = decode_udp_ip_header (interface, ibuf, bufix,
+- from, length, &paylen);
++ from, length, &paylen, 0);
+
+ /* If the IP or UDP checksum was bad, skip the packet... */
+ if (offset < 0)
+diff -up dhcp-4.2.0/common/packet.c.xen dhcp-4.2.0/common/packet.c
+--- dhcp-4.2.0/common/packet.c.xen 2009-07-23 14:52:20.000000000 -0400
++++ dhcp-4.2.0/common/packet.c 2010-09-23 05:24:21.000000000 -0400
+@@ -211,7 +211,7 @@ ssize_t
+ decode_udp_ip_header(struct interface_info *interface,
+ unsigned char *buf, unsigned bufix,
+ struct sockaddr_in *from, unsigned buflen,
+- unsigned *rbuflen)
++ unsigned *rbuflen, int nocsum)
+ {
+ unsigned char *data;
+ struct ip ip;
+@@ -322,7 +322,7 @@ decode_udp_ip_header(struct interface_in
+ 8, IPPROTO_UDP + ulen))));
+
+ udp_packets_seen++;
+- if (usum && usum != sum) {
++ if (!nocsum && usum && usum != sum) {
+ udp_packets_bad_checksum++;
+ if (udp_packets_seen > 4 &&
+ (udp_packets_seen / udp_packets_bad_checksum) < 2) {
+diff -up dhcp-4.2.0/common/upf.c.xen dhcp-4.2.0/common/upf.c
+--- dhcp-4.2.0/common/upf.c.xen 2009-11-19 20:49:01.000000000 -0500
++++ dhcp-4.2.0/common/upf.c 2010-09-23 05:24:25.000000000 -0400
+@@ -320,7 +320,7 @@ ssize_t receive_packet (interface, buf,
+
+ /* Decode the IP and UDP headers... */
+ offset = decode_udp_ip_header (interface, ibuf, bufix,
+- from, length, &paylen);
++ from, length, &paylen, 0);
+
+ /* If the IP or UDP checksum was bad, skip the packet... */
+ if (offset < 0)
+diff -up dhcp-4.2.0/includes/dhcpd.h.xen dhcp-4.2.0/includes/dhcpd.h
+--- dhcp-4.2.0/includes/dhcpd.h.xen 2010-06-01 13:29:59.000000000 -0400
++++ dhcp-4.2.0/includes/dhcpd.h 2010-09-23 05:24:32.000000000 -0400
+@@ -2769,7 +2769,7 @@ ssize_t decode_hw_header PROTO ((struct
+ unsigned, struct hardware *));
+ ssize_t decode_udp_ip_header PROTO ((struct interface_info *, unsigned char *,
+ unsigned, struct sockaddr_in *,
+- unsigned, unsigned *));
++ unsigned, unsigned *, int));
+
+ /* ethernet.c */
+ void assemble_ethernet_header PROTO ((struct interface_info *, unsigned char *,
diff --git a/net-misc/dhcp/files/dhcp-4.2.1-dhclient-resolvconf.patch b/net-misc/dhcp/files/dhcp-4.2.1-dhclient-resolvconf.patch
new file mode 100644
index 000000000..6d8caecdf
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.2.1-dhclient-resolvconf.patch
@@ -0,0 +1,384 @@
+--- a/client/scripts/bsdos
++++ b/client/scripts/bsdos
+@@ -1,34 +1,41 @@
+ #!/bin/sh
+
+ make_resolv_conf() {
++ if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then
++ return 0
++ fi
++ local conf=
+ if [ x"$new_domain_name_servers" != x ]; then
+- cat /dev/null > /etc/resolv.conf.dhclient
+ if [ "x$new_domain_search" != x ]; then
+- echo search $new_domain_search >> /etc/resolv.conf.dhclient
++ conf="${conf}search ${new_domain_search}\n"
+ elif [ "x$new_domain_name" != x ]; then
+ # Note that the DHCP 'Domain Name Option' is really just a domain
+ # name, and that this practice of using the domain name option as
+ # a search path is both nonstandard and deprecated.
+- echo search $new_domain_name >> /etc/resolv.conf.dhclient
++ conf="${conf}search ${new_domain_name}\n"
+ fi
+ for nameserver in $new_domain_name_servers; do
+- echo nameserver $nameserver >> /etc/resolv.conf.dhclient
++ conf="${conf}nameserver ${nameserver}\n"
+ done
+-
+- mv /etc/resolv.conf.dhclient /etc/resolv.conf
+ elif [ "x${new_dhcp6_name_servers}" != x ] ; then
+- cat /dev/null > /etc/resolv.conf.dhclient6
+- chmod 644 /etc/resolv.conf.dhclient6
+-
+ if [ "x${new_dhcp6_domain_search}" != x ] ; then
+- echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6
++ conf="${conf}search ${new_dhcp6_domain_search}\n"
+ fi
+ for nameserver in ${new_dhcp6_name_servers} ; do
+- echo nameserver ${nameserver} >> /etc/resolv.conf.dhclient6
++ conf="${conf}nameserver ${nameserver}\n"
+ done
++ fi
+
+- mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
++ if [ x"$conf" != x ]; then
++ conf="# Generated by dhclient or interface $interface\n${conf}"
++ if type resolvconf >/dev/null 2>&1; then
++ printf "${conf}" | resolvconf -a $interface
++ else
++ printf "${conf}" > /etc/resolv.conf
++ chmod 644 /etc/resolv.conf
++ fi
+ fi
++
+ # If we're making confs, may as well make an ntp.conf too
+ make_ntp_conf
+ }
+--- a/client/scripts/freebsd
++++ b/client/scripts/freebsd
+@@ -11,68 +11,41 @@
+ fi
+
+ make_resolv_conf() {
++ if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then
++ return 0
++ fi
++ local conf=
+ if [ x"$new_domain_name_servers" != x ]; then
+- ( cat /dev/null > /etc/resolv.conf.dhclient )
+- exit_status=$?
+- if [ $exit_status -ne 0 ]; then
+- $LOGGER "Unable to create /etc/resolv.conf.dhclient: Error $exit_status"
+- else
+- if [ "x$new_domain_search" != x ]; then
+- ( echo search $new_domain_search >> /etc/resolv.conf.dhclient )
+- exit_status=$?
+- elif [ "x$new_domain_name" != x ]; then
+- # Note that the DHCP 'Domain Name Option' is really just a domain
+- # name, and that this practice of using the domain name option as
+- # a search path is both nonstandard and deprecated.
+- ( echo search $new_domain_name >> /etc/resolv.conf.dhclient )
+- exit_status=$?
+- fi
+- for nameserver in $new_domain_name_servers; do
+- if [ $exit_status -ne 0 ]; then
+- break
+- fi
+- ( echo nameserver $nameserver >>/etc/resolv.conf.dhclient )
+- exit_status=$?
+- done
+-
+- # If there were no errors, attempt to mv the new file into place.
+- if [ $exit_status -eq 0 ]; then
+- ( mv /etc/resolv.conf.dhclient /etc/resolv.conf )
+- exit_status=$?
+- fi
+-
+- if [ $exit_status -ne 0 ]; then
+- $LOGGER "Error while writing new /etc/resolv.conf."
+- fi
++ if [ "x$new_domain_search" != x ]; then
++ conf="${conf}search ${new_domain_search}\n"
++ elif [ "x$new_domain_name" != x ]; then
++ # Note that the DHCP 'Domain Name Option' is really just a domain
++ # name, and that this practice of using the domain name option as
++ # a search path is both nonstandard and deprecated.
++ conf="${conf}search ${new_domain_name}\n"
+ fi
++ for nameserver in $new_domain_name_servers; do
++ conf="${conf}nameserver ${nameserver}\n"
++ done
+ elif [ "x${new_dhcp6_name_servers}" != x ] ; then
+- ( cat /dev/null > /etc/resolv.conf.dhclient6 )
+- exit_status=$?
+- if [ $exit_status -ne 0 ] ; then
+- $LOGGER "Unable to create /etc/resolv.conf.dhclient6: Error $exit_status"
+- else
+- if [ "x${new_dhcp6_domain_search}" != x ] ; then
+- ( echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6 )
+- exit_status=$?
+- fi
+- for nameserver in ${new_dhcp6_name_servers} ; do
+- if [ $exit_status -ne 0 ] ; then
+- break
+- fi
+- ( echo nameserver ${nameserver} >> /etc/resolv.conf.dhclient6 )
+- exit_status=$?
+- done
+-
+- if [ $exit_status -eq 0 ] ; then
+- ( mv /etc/resolv.conf.dhclient6 /etc/resolv.conf )
+- exit_status=$?
+- fi
++ if [ "x${new_dhcp6_domain_search}" != x ] ; then
++ conf="${conf}search ${new_dhcp6_domain_search}\n"
++ fi
++ for nameserver in ${new_dhcp6_name_servers} ; do
++ conf="${conf}nameserver ${nameserver}\n"
++ done
++ fi
+
+- if [ $exit_status -ne 0 ] ; then
+- $LOGGER "Error while writing new /etc/resolv.conf."
+- fi
++ if [ x"$conf" != x ]; then
++ conf="# Generated by dhclient or interface $interface\n${conf}"
++ if type resolvconf >/dev/null 2>&1; then
++ printf "${conf}" | resolvconf -a $interface
++ else
++ printf "${conf}" > /etc/resolv.conf
++ chmod 644 /etc/resolv.conf
+ fi
+ fi
++
+ # If we're making confs, may as well make an ntp.conf too
+ make_ntp_conf
+ }
+--- a/client/scripts/linux
++++ b/client/scripts/linux
+@@ -26,35 +26,41 @@
+ ip=/sbin/ip
+
+ make_resolv_conf() {
++ if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then
++ return 0
++ fi
++ local conf=
+ if [ x"$new_domain_name_servers" != x ]; then
+- cat /dev/null > /etc/resolv.conf.dhclient
+- chmod 644 /etc/resolv.conf.dhclient
+- if [ x"$new_domain_search" != x ]; then
+- echo search $new_domain_search >> /etc/resolv.conf.dhclient
+- elif [ x"$new_domain_name" != x ]; then
++ if [ "x$new_domain_search" != x ]; then
++ conf="${conf}search ${new_domain_search}\n"
++ elif [ "x$new_domain_name" != x ]; then
+ # Note that the DHCP 'Domain Name Option' is really just a domain
+ # name, and that this practice of using the domain name option as
+ # a search path is both nonstandard and deprecated.
+- echo search $new_domain_name >> /etc/resolv.conf.dhclient
++ conf="${conf}search ${new_domain_name}\n"
+ fi
+ for nameserver in $new_domain_name_servers; do
+- echo nameserver $nameserver >>/etc/resolv.conf.dhclient
++ conf="${conf}nameserver ${nameserver}\n"
+ done
+-
+- mv /etc/resolv.conf.dhclient /etc/resolv.conf
+ elif [ "x${new_dhcp6_name_servers}" != x ] ; then
+- cat /dev/null > /etc/resolv.conf.dhclient6
+- chmod 644 /etc/resolv.conf.dhclient6
+-
+ if [ "x${new_dhcp6_domain_search}" != x ] ; then
+- echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6
++ conf="${conf}search ${new_dhcp6_domain_search}\n"
+ fi
+ for nameserver in ${new_dhcp6_name_servers} ; do
+- echo nameserver ${nameserver} >> /etc/resolv.conf.dhclient6
++ conf="${conf}nameserver ${nameserver}\n"
+ done
++ fi
+
+- mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
++ if [ x"$conf" != x ]; then
++ conf="# Generated by dhclient or interface $interface\n${conf}"
++ if type resolvconf >/dev/null 2>&1; then
++ printf "${conf}" | resolvconf -a $interface
++ else
++ printf "${conf}" > /etc/resolv.conf
++ chmod 644 /etc/resolv.conf
++ fi
+ fi
++
+ # If we're making confs, may as well make an ntp.conf too
+ make_ntp_conf
+ }
+--- a/client/scripts/netbsd
++++ b/client/scripts/netbsd
+@@ -1,34 +1,41 @@
+ #!/bin/sh
+
+ make_resolv_conf() {
+- if [ "x$new_domain_name" != x ] && [ x"$new_domain_name_servers" != x ]; then
+- cat /dev/null > /etc/resolv.conf.dhclient
+- if [ "x$new_domain_search" != x ]; then
+- echo search $new_domain_search >> /etc/resolv.conf.dhclient
+- elif [ "x$new_domain_name" != x ]; then
++ if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then
++ return 0
++ fi
++ local conf=
++ if [ x"$new_domain_name_servers" != x ]; then
++ if [ "x$new_domain_search" != x ]; then
++ conf="${conf}search ${new_domain_search}\n"
++ elif [ "x$new_domain_name" != x ]; then
+ # Note that the DHCP 'Domain Name Option' is really just a domain
+ # name, and that this practice of using the domain name option as
+ # a search path is both nonstandard and deprecated.
+- echo search $new_domain_name >> /etc/resolv.conf.dhclient
++ conf="${conf}search ${new_domain_name}\n"
+ fi
+ for nameserver in $new_domain_name_servers; do
+- echo nameserver $nameserver >>/etc/resolv.conf.dhclient
++ conf="${conf}nameserver ${nameserver}\n"
+ done
+-
+- mv /etc/resolv.conf.dhclient /etc/resolv.conf
+ elif [ "x${new_dhcp6_name_servers}" != x ] ; then
+- cat /dev/null > /etc/resolv.conf.dhclient6
+- chmod 644 /etc/resolv.conf.dhclient6
+-
+ if [ "x${new_dhcp6_domain_search}" != x ] ; then
+- echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6
++ conf="${conf}search ${new_dhcp6_domain_search}\n"
+ fi
+ for nameserver in ${new_dhcp6_name_servers} ; do
+- echo nameserver ${nameserver} >> /etc/resolv.conf.dhclient6
++ conf="${conf}nameserver ${nameserver}\n"
+ done
++ fi
+
+- mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
++ if [ x"$conf" != x ]; then
++ conf="# Generated by dhclient or interface $interface\n${conf}"
++ if type resolvconf >/dev/null 2>&1; then
++ printf "${conf}" | resolvconf -a $interface
++ else
++ printf "${conf}" > /etc/resolv.conf
++ chmod 644 /etc/resolv.conf
++ fi
+ fi
++
+ # If we're making confs, may as well make an ntp.conf too
+ make_ntp_conf
+ }
+--- a/client/scripts/openbsd
++++ b/client/scripts/openbsd
+@@ -1,34 +1,41 @@
+ #!/bin/sh
+
+ make_resolv_conf() {
+- if x"$new_domain_name_servers" != x ]; then
+- cat /dev/null > /etc/resolv.conf.dhclient
+- if [ x"$new_domain_search" != x ]; then
+- echo search $new_domain_search >> /etc/resolv.conf.dhclient
+- elif [ x"$new_domain_name" != x ]; then
++ if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then
++ return 0
++ fi
++ local conf=
++ if [ x"$new_domain_name_servers" != x ]; then
++ if [ "x$new_domain_search" != x ]; then
++ conf="${conf}search ${new_domain_search}\n"
++ elif [ "x$new_domain_name" != x ]; then
+ # Note that the DHCP 'Domain Name Option' is really just a domain
+ # name, and that this practice of using the domain name option as
+ # a search path is both nonstandard and deprecated.
+- echo search $new_domain_name >> /etc/resolv.conf.dhclient
++ conf="${conf}search ${new_domain_name}\n"
+ fi
+ for nameserver in $new_domain_name_servers; do
+- echo nameserver $nameserver >>/etc/resolv.conf.dhclient
++ conf="${conf}nameserver ${nameserver}\n"
+ done
+-
+- mv /etc/ersolv.conf.dhclient /etc/resolv.conf
+ elif [ "x${new_dhcp6_name_servers}" != x ] ; then
+- cat /dev/null > /etc/resolv.conf.dhclient6
+- chmod 644 /etc/resolv.conf.dhclient6
+-
+ if [ "x${new_dhcp6_domain_search}" != x ] ; then
+- echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6
++ conf="${conf}search ${new_dhcp6_domain_search}\n"
+ fi
+ for nameserver in ${new_dhcp6_name_servers} ; do
+- echo nameserver ${nameserver} >> /etc/resolv.conf.dhclient6
++ conf="${conf}nameserver ${nameserver}\n"
+ done
++ fi
+
+- mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
++ if [ x"$conf" != x ]; then
++ conf="# Generated by dhclient or interface $interface\n${conf}"
++ if type resolvconf >/dev/null 2>&1; then
++ printf "${conf}" | resolvconf -a $interface
++ else
++ printf "${conf}" > /etc/resolv.conf
++ chmod 644 /etc/resolv.conf
++ fi
+ fi
++
+ # If we're making confs, may as well make an ntp.conf too
+ make_ntp_conf
+ }
+--- a/client/scripts/solaris
++++ b/client/scripts/solaris
+@@ -1,22 +1,41 @@
+ #!/bin/sh
+
+ make_resolv_conf() {
++ if [ x"$PEER_DNS" != x ] && [ x$"PEER_DNS" != xyes ]; then
++ return 0
++ fi
++ local conf=
+ if [ x"$new_domain_name_servers" != x ]; then
+- cat /dev/null > /etc/resolv.conf.dhclient
+- if [ x"$new_domain_search" != x ]; then
+- echo search $new_domain_search >> /etc/resolv.conf.dhclient
+- elif [ x"$new_domain_name" != x ]; then
++ if [ "x$new_domain_search" != x ]; then
++ conf="${conf}search ${new_domain_search}\n"
++ elif [ "x$new_domain_name" != x ]; then
+ # Note that the DHCP 'Domain Name Option' is really just a domain
+ # name, and that this practice of using the domain name option as
+ # a search path is both nonstandard and deprecated.
+- echo search $new_domain_name >> /etc/resolv.conf.dhclient
++ conf="${conf}search ${new_domain_name}\n"
+ fi
+ for nameserver in $new_domain_name_servers; do
+- echo nameserver $nameserver >>/etc/resolv.conf.dhclient
++ conf="${conf}nameserver ${nameserver}\n"
++ done
++ elif [ "x${new_dhcp6_name_servers}" != x ] ; then
++ if [ "x${new_dhcp6_domain_search}" != x ] ; then
++ conf="${conf}search ${new_dhcp6_domain_search}\n"
++ fi
++ for nameserver in ${new_dhcp6_name_servers} ; do
++ conf="${conf}nameserver ${nameserver}\n"
+ done
++ fi
+
+- mv /etc/resolv.conf.dhclient /etc/resolv.conf
++ if [ x"$conf" != x ]; then
++ conf="# Generated by dhclient or interface $interface\n${conf}"
++ if type resolvconf >/dev/null 2>&1; then
++ printf "${conf}" | resolvconf -a $interface
++ else
++ printf "${conf}" > /etc/resolv.conf
++ chmod 644 /etc/resolv.conf
++ fi
+ fi
++
+ # If we're making confs, may as well make an ntp.conf too
+ make_ntp_conf
+ }
diff --git a/net-misc/dhcp/files/dhcp-4.2.1-nogateway.patch b/net-misc/dhcp/files/dhcp-4.2.1-nogateway.patch
new file mode 100644
index 000000000..11aaacefd
--- /dev/null
+++ b/net-misc/dhcp/files/dhcp-4.2.1-nogateway.patch
@@ -0,0 +1,46 @@
+http://bugs.gentoo.org/265531
+
+--- dhcp-4.2.1/client/scripts/linux
++++ dhcp-4.2.1/client/scripts/linux
+@@ -193,12 +193,14 @@
+ ifconfig $interface inet $new_ip_address $new_subnet_arg \
+ $new_broadcast_arg $mtu_arg
+ # Add a network route to the computed network address.
+- for router in $new_routers; do
+- if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
+- route add -host $router dev $interface
+- fi
+- route add default gw $router $metric_arg dev $interface
+- done
++ if [ x$PEER_ROUTERS = x ] || [ x$PEER_ROUTERS = xyes ]; then
++ for router in $new_routers; do
++ if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
++ route add -host $router dev $interface
++ fi
++ route add default gw $router $metric_arg dev $interface
++ done
++ fi
+ fi
+ if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ];
+ then
+@@ -244,12 +246,14 @@
+ ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+ route add -host $alias_ip_address dev $interface:0
+ fi
+- for router in $new_routers; do
+- if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
+- route add -host $router dev $interface
+- fi
+- route add default gw $router $metric_arg dev $interface
+- done
++ if [ x$PEER_ROUTERS = x ] || [ x$PEER_ROUTERS = xyes ]; then
++ for router in $new_routers; do
++ if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
++ route add -host $router dev $interface
++ fi
++ route add default gw $router $metric_arg dev $interface
++ done
++ fi
+ make_resolv_conf
+ exit_with_hooks 0
+ fi
diff --git a/net-misc/dhcp/files/dhcpd.conf b/net-misc/dhcp/files/dhcpd.conf
new file mode 100644
index 000000000..1672633c8
--- /dev/null
+++ b/net-misc/dhcp/files/dhcpd.conf
@@ -0,0 +1,29 @@
+# /etc/conf.d/dhcpd: config file for /etc/init.d/dhcpd
+
+# If you require more than one instance of dhcpd you can create symbolic
+# links to dhcpd service like so
+# cd /etc/init.d
+# ln -s dhcpd dhcpd.foo
+# cd ../conf.d
+# cp dhcpd dhcpd.foo
+# Now you can edit dhcpd.foo and specify a different configuration file.
+# You'll also need to specify a pidfile in that dhcpd.conf file.
+# See the pid-file-name option in the dhcpd.conf man page for details.
+
+# If you wish to run dhcpd in a chroot, uncomment the following line
+# DHCPD_CHROOT="/chroot/dhcp"
+
+# Then run emerge dhcp --config
+# All file paths below are relative to the chroot.
+# You can specify a different chroot directory but MAKE SURE it's empty.
+
+# Specify a configuration file - the default is /etc/dhcp/dhcpd.conf
+# DHCPD_CONF="/etc/dhcp/dhcpd.conf"
+
+# Configure which interface or interfaces to for dhcpd to listen on.
+# List all interfaces space separated. If this is not specified then
+# we listen on all interfaces.
+# DHCPD_IFACE=""
+
+# Insert any other dhcpd options - see the man page for a full list.
+# DHCPD_OPTS=""
diff --git a/net-misc/dhcp/files/dhcpd.init2 b/net-misc/dhcp/files/dhcpd.init2
new file mode 100644
index 000000000..82cb26e77
--- /dev/null
+++ b/net-misc/dhcp/files/dhcpd.init2
@@ -0,0 +1,94 @@
+#!/sbin/runscript
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcpd.init2,v 1.1 2009/07/09 14:45:22 chainsaw Exp $
+
+opts="configtest"
+
+DHCPD_CONF=${DHCPD_CONF:-/etc/dhcp/dhcpd.conf}
+
+depend() {
+ need net
+ use logger dns
+}
+
+get_var() {
+ sed -n 's/^[[:blank:]]\?'"$1"' "*\([^#";]\+\).*/\1/p' \
+ "${DHCPD_CHROOT}/${DHCPD_CONF}"
+}
+
+checkconfig() {
+ /usr/sbin/dhcpd -cf ${DHCPD_CHROOT}/${DHCPD_CONF} -t 1>/dev/null 2>&1
+ ret=$?
+ if [ $ret -ne 0 ]; then
+ eerror "${SVCNAME} has detected a syntax error in your configuration files:"
+ /usr/sbin/dhcpd -cf ${DHCPD_CHROOT}/${DHCPD_CONF} -t
+ fi
+
+ return $ret
+}
+
+configtest() {
+ ebegin "Checking ${SVCNAME} configuration"
+ checkconfig
+ eend $?
+}
+
+start() {
+ # Work out our cffile if it's on our DHCPD_OPTS
+ case " ${DHCPD_OPTS} " in
+ *" -cf "*)
+ DHCPD_CONF=" ${DHCPD_OPTS} "
+ DHCPD_CONF="${DHCPD_CONF##* -cf }"
+ DHCPD_CONF="${DHCPD_CONF%% *}"
+ ;;
+ *) DHCPD_OPTS="${DHCPD_OPTS} -cf ${DHCPD_CONF}"
+ ;;
+ esac
+
+ if [ ! -f "${DHCPD_CHROOT}/${DHCPD_CONF}" ] ; then
+ eerror "${DHCPD_CHROOT}/${DHCPD_CONF} does not exist"
+ return 1
+ fi
+
+ checkconfig || return 1
+
+ local leasefile="$(get_var lease-file-name)"
+ leasefile="${DHCPD_CHROOT}/${leasefile:-/var/lib/dhcp/dhcpd.leases}"
+ if [ ! -f "${leasefile}" ] ; then
+ ebegin "Creating ${leasefile}"
+ touch "${leasefile}"
+ chown dhcp:dhcp "${leasefile}"
+ eend $? || return 1
+ fi
+
+ # Setup LD_PRELOAD so name resolution works in our chroot.
+ if [ -n "${DHCPD_CHROOT}" ] ; then
+ LD_PRELOAD="${LD_PRELOAD} /usr/lib/libresolv.so"
+ export LD_PRELOAD="${LD_PRELOAD} /usr/lib/libnss_dns.so"
+ fi
+
+ local pidfile="$(get_var pid-file-name)"
+ pidfile="${pidfile:-/var/run/dhcp/dhcpd.pid}"
+
+ ebegin "Starting ${DHCPD_CHROOT:+chrooted }${SVCNAME}"
+ start-stop-daemon --start --exec /usr/sbin/dhcpd \
+ --pidfile "${DHCPD_CHROOT}/${pidfile}" \
+ -- ${DHCPD_OPTS} -q -pf "${pidfile}" \
+ -user dhcp -group dhcp \
+ ${DHCPD_CHROOT:+-chroot} ${DHCPD_CHROOT} ${DHCPD_IFACE}
+ eend $? \
+ && save_options chroot "${DHCPD_CHROOT}" \
+ && save_options pidfile "${pidfile}"
+}
+
+stop() {
+ local chroot="$(get_options chroot)"
+
+ checkconfig || return 1
+
+ ebegin "Stopping ${chroot:+chrooted }${SVCNAME}"
+ start-stop-daemon --stop --exec /usr/sbin/dhcpd \
+ --pidfile "${chroot}/$(get_options pidfile)"
+ eend $?
+}
diff --git a/net-misc/dhcp/files/dhcpd.init3 b/net-misc/dhcp/files/dhcpd.init3
new file mode 100755
index 000000000..3b0053142
--- /dev/null
+++ b/net-misc/dhcp/files/dhcpd.init3
@@ -0,0 +1,94 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcpd.init3,v 1.1 2011/03/05 23:59:20 vapier Exp $
+
+opts="configtest"
+
+DHCPD_CONF=${DHCPD_CONF:-/etc/dhcp/${SVCNAME}.conf}
+
+depend() {
+ need net
+ use logger dns
+}
+
+get_var() {
+ sed -n 's/^[[:blank:]]\?'"$1"' "*\([^#";]\+\).*/\1/p' \
+ "${DHCPD_CHROOT}/${DHCPD_CONF}"
+}
+
+checkconfig() {
+ dhcpd ${DHCPD_OPTS} ${DHCPD_CHROOT:+-chroot} ${DHCPD_CHROOT} -t 1>/dev/null 2>&1
+ local ret=$?
+ if [ $ret -ne 0 ] ; then
+ eerror "${SVCNAME} has detected a syntax error in your configuration files:"
+ dhcpd ${DHCPD_OPTS} ${DHCPD_CHROOT:+-chroot} ${DHCPD_CHROOT} -t
+ fi
+
+ return $ret
+}
+
+configtest() {
+ ebegin "Checking ${SVCNAME} configuration"
+ checkconfig
+ eend $?
+}
+
+start() {
+ # Work out our cffile if it's in our DHCPD_OPTS
+ case " ${DHCPD_OPTS} " in
+ *" -cf "*)
+ DHCPD_CONF=" ${DHCPD_OPTS} "
+ DHCPD_CONF="${DHCPD_CONF##* -cf }"
+ DHCPD_CONF="${DHCPD_CONF%% *}"
+ ;;
+ *) DHCPD_OPTS="${DHCPD_OPTS} -cf ${DHCPD_CONF}"
+ ;;
+ esac
+
+ if [ ! -f "${DHCPD_CHROOT}/${DHCPD_CONF}" ] ; then
+ eerror "${DHCPD_CHROOT}/${DHCPD_CONF} does not exist"
+ return 1
+ fi
+
+ checkconfig || return 1
+
+ checkpath -d -o dhcp:dhcp /var/run/dhcp /var/lib/dhcp
+
+ local leasefile="$(get_var lease-file-name)"
+ leasefile="${leasefile:-/var/lib/dhcp/${SVCNAME}.leases}"
+ if [ ! -f "${DHCPD_CHROOT}${leasefile}" ] ; then
+ ebegin "Creating ${leasefile}"
+ touch "${DHCPD_CHROOT}${leasefile}"
+ chown dhcp:dhcp "${DHCPD_CHROOT}${leasefile}"
+ eend $? || return 1
+ fi
+
+ # Setup LD_PRELOAD so name resolution works in our chroot.
+ if [ -n "${DHCPD_CHROOT}" ] ; then
+ LD_PRELOAD="${LD_PRELOAD} /usr/lib/libresolv.so"
+ export LD_PRELOAD="${LD_PRELOAD} /usr/lib/libnss_dns.so"
+ fi
+
+ local pidfile="$(get_var pid-file-name)"
+ pidfile="${pidfile:-/var/run/dhcp/${SVCNAME}.pid}"
+
+ ebegin "Starting ${DHCPD_CHROOT:+chrooted }${SVCNAME}"
+ start-stop-daemon --start --exec /usr/sbin/dhcpd \
+ --pidfile "${DHCPD_CHROOT}/${pidfile}" \
+ -- ${DHCPD_OPTS} -q -pf "${pidfile}" -lf "${leasefile}" \
+ -user dhcp -group dhcp \
+ ${DHCPD_CHROOT:+-chroot} ${DHCPD_CHROOT} ${DHCPD_IFACE}
+ eend $? \
+ && save_options chroot "${DHCPD_CHROOT}" \
+ && save_options pidfile "${pidfile}"
+}
+
+stop() {
+ local chroot="$(get_options chroot)"
+
+ ebegin "Stopping ${chroot:+chrooted }${SVCNAME}"
+ start-stop-daemon --stop --exec /usr/sbin/dhcpd \
+ --pidfile "${chroot}/$(get_options pidfile)"
+ eend $?
+}
diff --git a/net-misc/dhcp/files/dhcrelay.conf b/net-misc/dhcp/files/dhcrelay.conf
new file mode 100644
index 000000000..1102d3a41
--- /dev/null
+++ b/net-misc/dhcp/files/dhcrelay.conf
@@ -0,0 +1,13 @@
+# /etc/conf.d/dhcrelay: config file for /etc/init.d/dhcrelay
+
+# Configure which interface or interfaces to for dhcrelay to listen on
+# and send to.
+# List all interfaces space separated. If this is not specified then
+# we use all interfaces.
+#IFACE=""
+
+# Insert any other options needed. See dhcrelay(8) for details.
+#DHCRELAY_OPTS=""
+
+# Space separated list of IPs to forward BOOTP/DHCP packets to.
+DHCRELAY_SERVERS=""
diff --git a/net-misc/dhcp/files/dhcrelay.init b/net-misc/dhcp/files/dhcrelay.init
new file mode 100644
index 000000000..2f92956be
--- /dev/null
+++ b/net-misc/dhcp/files/dhcrelay.init
@@ -0,0 +1,32 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcrelay.init,v 1.2 2007/03/22 15:36:59 uberlord Exp $
+
+depend() {
+ need net
+ use logger
+}
+
+start() {
+ if [ -z "${DHCRELAY_SERVERS}" ]; then
+ eerror "No DHCRELAY_SERVERS specified in /etc/conf.d/dhcrelay"
+ return 1
+ fi
+
+ local IFACES= i=
+ for i in ${IFACE} ; do
+ IFACES="${IFACES} -i ${i}"
+ done
+
+ ebegin "Starting dhcrelay"
+ start-stop-daemon --start --exec /usr/sbin/dhcrelay \
+ -- -q ${IFACES} ${DHCRELAY_OPTS} ${DHCRELAY_SERVERS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping dhcrelay"
+ start-stop-daemon --stop --pidfile /var/run/dhcrelay.pid
+ eend $?
+}
diff --git a/net-misc/dhcp/files/dhcrelay.init2 b/net-misc/dhcp/files/dhcrelay.init2
new file mode 100755
index 000000000..4f09249a6
--- /dev/null
+++ b/net-misc/dhcp/files/dhcrelay.init2
@@ -0,0 +1,29 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcp/files/dhcrelay.init2,v 1.2 2011/03/08 20:13:26 vapier Exp $
+
+depend() {
+ need net
+ use logger
+}
+
+start() {
+ if [ -z "${DHCRELAY_SERVERS}" ]; then
+ eerror "No DHCRELAY_SERVERS specified in /etc/conf.d/dhcrelay"
+ return 1
+ fi
+
+ checkpath -d /var/run/dhcp
+
+ ebegin "Starting dhcrelay"
+ start-stop-daemon --start --exec /usr/sbin/dhcrelay \
+ -- -q $(printf -- '-i %s ' ${IFACE}) ${DHCRELAY_OPTS} ${DHCRELAY_SERVERS}
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping dhcrelay"
+ start-stop-daemon --stop --pidfile /var/run/dhcp/dhcrelay.pid
+ eend $?
+}
diff --git a/net-misc/dhcp/metadata.xml b/net-misc/dhcp/metadata.xml
new file mode 100644
index 000000000..de6dcfd48
--- /dev/null
+++ b/net-misc/dhcp/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>base-system</herd>
+ <longdescription lang="en">The ISC DHCP client/server package.</longdescription>
+ <longdescription lang="ja">ISC DHCP クライアント/サーバ・パッケージです。</longdescription>
+ <use>
+ <flag name="client">Install the dhclient program</flag>
+ <flag name="server">Install the dhcpd and dhcrelay programs</flag>
+ <flag name="infiniband">Enable ipoib support</flag>
+ </use>
+</pkgmetadata>
diff --git a/perl-core/encoding-warnings/ChangeLog b/perl-core/encoding-warnings/ChangeLog
index 0e46fef6b..cce70e111 100644
--- a/perl-core/encoding-warnings/ChangeLog
+++ b/perl-core/encoding-warnings/ChangeLog
@@ -1,7 +1,10 @@
# ChangeLog for perl-core/encoding-warnings
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 25 Jun 2011; Justin Lecher <jlec@gentoo.org> encoding-warnings-0.11.ebuild:
+ RDEPEND is not explicitly assigned -> fixed
+
*encoding-warnings-0.11 (22 Jun 2010)
22 Jun 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
diff --git a/perl-core/encoding-warnings/Manifest b/perl-core/encoding-warnings/Manifest
index bb2a3c43d..989f211c2 100644
--- a/perl-core/encoding-warnings/Manifest
+++ b/perl-core/encoding-warnings/Manifest
@@ -1,14 +1,14 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
DIST encoding-warnings-0.11.tar.gz 16110 RMD160 ba26a43222f7988d2ba5025d9ecdbb1112e9ca84 SHA1 c03e57cb0be7ed0186c80c663076e86a6933dbcb SHA256 67faf727b59ab1132d2b147bc1f927dc752897ce1f57b303efc46c3a969bf25e
-EBUILD encoding-warnings-0.11.ebuild 461 RMD160 2f0b4e68563245bdd128beb2326cacb8ffc0ccdb SHA1 bfb3ca0b502f428e33a90ed02a9d1fdcc7944e69 SHA256 33fb7c8fa8e41443774b82abc7ff759d6588806939d0e9fe78d5fceaa126e238
-MISC ChangeLog 297 RMD160 62fd6f46460f1cf3d9fa9c36ab74a5cc16eaa38a SHA1 ae76b7ff43e8c37dc70d55703c264acab7e5fdef SHA256 5bb69e39f8503fed87dad38212ceb2db4702e7c429033ea84303b956c506a861
+EBUILD encoding-warnings-0.11.ebuild 481 RMD160 fa57947e876ba7c52f68c9263fa7ab770d098859 SHA1 6b47d0c4408ecc249cc33c4a23f6d91e33f135fb SHA256 6976f916546f9f5929f8792dabc0e35831b37d62762b7302471e93f6e72c1e69
+MISC ChangeLog 422 RMD160 c1ce3303b972135850f89a53ab050a614ffcf6ae SHA1 f40b12da52e74ef420b2f0c18026b02b05c8e6e6 SHA256 f270473fc535ffc7d394128027c545f9e41e47e4d24aa9ec5289a06f56ca7f0d
MISC metadata.xml 225 RMD160 aa7d7690bc9d41aa160500739ec29a5aecb24958 SHA1 a7fa143a3c80636c1f82827063de2327d4380d57 SHA256 3b760abcba804d12e90e8101abef730ff1be333e8c01f273f7a05e68f5f1df88
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEAREKAAYFAkwg6HEACgkQL+gLs3iH94c9KQCfUuXHvLzT39sN4lMX4v78ptTt
-2doAn2bY/ekwAHnLb4KOEa7toxOFlJ8N
-=MUT8
+iEYEAREIAAYFAk4F5fQACgkQgAnW8HDreRZlOgCguElHEwgvhk+FmlvnPX35W7/I
+pfEAn0+jwHr8r0qLKA1D2Wkx6aOp/quM
+=DWPt
-----END PGP SIGNATURE-----
diff --git a/perl-core/encoding-warnings/encoding-warnings-0.11.ebuild b/perl-core/encoding-warnings/encoding-warnings-0.11.ebuild
index 1a37e29f8..b4d3f0c1b 100644
--- a/perl-core/encoding-warnings/encoding-warnings-0.11.ebuild
+++ b/perl-core/encoding-warnings/encoding-warnings-0.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -15,3 +15,4 @@ KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}"
diff --git a/profiles/package.mask b/profiles/package.mask
index a83b0833f..3e279a9be 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,11 +30,15 @@
#--- END OF EXAMPLES ---
-# Sebastien Fabbro (07 Jan 2011)
-# svn trunk development of root
->=sci-physics/root-9999
+# Justin Lecher <jlec@gentoo.org> (24 Jun 2011)
+# fftw dep is masked
+sci-libs/pfft
-# Justin Lecher <jlec> (04 Jan 2011)
+# Justin Lecher <jlec@gentoo.org> (24 Jun 2011)
+# paraview dep is masked
+sci-visualization/vtkPOFFReader
+
+# Justin Lecher <jlec@gentoo.org> (04 Jan 2011)
# Masked for several QA reasons:
# portage screams during processing this ebuild
# Author uses @gentoo.org address, although not a dev
@@ -48,76 +52,57 @@
# #348029
sci-biology/tablet-bin
-# Sebastien Fabbro (29 Sep 2010)
-# alpha software
->=sci-libs/fftw-3.3_alpha1
-
-# Justin Lecher (jlec) (1 Aug 09)
-# jlec@gentoo.org
+# Christoph Junghans <ottxor@gentoo.org> (20 Apr 2011)
# mask live ebuild
-=sci-chemistry/burrow-owl-9999_pre15
+=sci-physics/espresso-9999
-# Christoph Junghans (ottxor) (23 Jan 11)
-# ottxor@gentoo.org
+# Christoph Junghans <ottxor@gentoo.org> (23 Jan 2011)
# mask live ebuild
=sys-cluster/nullmpi-9999
-# Christoph Junghans (ottxor) (20 Apr 11)
-# ottxor@gentoo.org
-# mask live ebuild
-=sci-physics/espresso-9999
+# Francois Bissey (kiwifb) (29 Oct 2010)
+# f.r.bissey@massey.ac.nz
+# mask paraview-3.8.* as there are no stable versions in the tree
+# Avoid accidental upgrade
+>=sci-visualization/paraview-3.8.0
-# Christoph Junghans (ottxor) (03 Oct 10)
-# ottxor@gentoo.org
+# Christoph Junghans <ottxor@gentoo.org> (03 Oct 2010)
# masked for testing
=sci-libs/openmm-2.0
-# Christoph Junghans (ottxor) (31 Jul 10)
-# ottxor@gentoo.org
+# Sebastien Fabbro (29 Sep 2010)
+# alpha software
+>=sci-libs/fftw-3.3_alpha1
+
+# Christoph Junghans <ottxor@gentoo.org> (31 Jul 2010)
# mask live ebuilds
=sci-chemistry/gromacs-4.0.9999
=sci-chemistry/gromacs-4.5.9999
=sci-chemistry/gromacs-9999
=app-doc/gromacs-manual-9999
-# Christoph Junghans (ottxor) (23 Jan 10)
-# ottxor@gentoo.org
+# Christoph Junghans <ottxor@gentoo.org> (23 Jan 2010)
# mask live ebuilds
=sci-libs/votca-tools-9999
=sci-chemistry/votca-csg-9999
=app-doc/votca-csg-manual-9999
-# Justin Lecher (jlec) (08 Jun 09)
-# jlec@gentoo.org
-# mask live ebuilds
-=sci-chemistry/pymol-apbs-plugin-9999
-=sci-chemistry/coot-9999
-=sci-chemistry/pymol-9999
-
-# Christoph Junghans (ottxor) (02 Nov 09)
-# ottxor@gentoo.org
+# Christoph Junghans <ottxor@gentoo.org> (02 Nov 2009)
# live cvs ebuild, deps changing constantly
# report to bug #232363
=sci-visualization/gnuplot-4.4.9999
=sci-visualization/gnuplot-4.5.9999
-# Justin Lecher (jlec) (11 May 09)
-# jlec@gentoo.org
-# work in progress
-=sci-chemistry/almost-1.0.3-r1
-
-# Francois Bissey (kiwifb) (29 Oct 2010)
-# f.r.bissey@massey.ac.nz
-# mask paraview-3.8.* as there are no stable versions in the tree
-# Avoid accidental upgrade
->=sci-visualization/paraview-3.8.0
+# Justin Lecher <jlec@gentoo.org> (1 Aug 2009)
+# mask live ebuild
+=sci-chemistry/burrow-owl-9999_pre15
-# Andreas K. Huettel (dilfridge) (23 Jun 2010)
-# mask dev-lang/aldor for removal in 30d since there is no source available anymore
-# (was a svn checkout, but the server is dead)
-=dev-lang/aldor-1.1.0
+# Justin Lecher <jlec@gentoo.org> (08 Jun 2009)
+# mask live ebuilds
+=sci-chemistry/pymol-apbs-plugin-9999
+=sci-chemistry/coot-9999
+=sci-chemistry/pymol-9999
-# Andreas K. Huettel (dilfridge) (27 Jun 2010)
-# mask for removal in 30d since there is no source anymore
-# (fetch restricted, and the ftp server does not respond; no hint of program at HOMEPAGE)
-sci-biology/newbler
+# Justin Lecher <jlec@gentoo.org> (11 May 2009)
+# work in progress
+=sci-chemistry/almost-1.0.3-r1
diff --git a/sci-astronomy/casacore/ChangeLog b/sci-astronomy/casacore/ChangeLog
new file mode 100644
index 000000000..b66cfa96f
--- /dev/null
+++ b/sci-astronomy/casacore/ChangeLog
@@ -0,0 +1,7 @@
+# ChangeLog for sci-astronomy/casacore
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 24 Jun 2011; Justin Lecher <jlec@gentoo.org> casacore-1.2.20110516.ebuild:
+ Sort inherit and/or USE
+
diff --git a/sci-astronomy/casacore/Manifest b/sci-astronomy/casacore/Manifest
index 6e081f258..cfca214ff 100644
--- a/sci-astronomy/casacore/Manifest
+++ b/sci-astronomy/casacore/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX 1.2.20110516-headers.patch 936 RMD160 0775642a72727df99130b41c484d69f034410992 SHA1 7ede5cb0f92cc5cf6ed9ce1d1beda191ad7d5c4e SHA256 34769b047fabff24e6da4069d040c6f5f44e393170831925c14d5391394d9444
AUX 1.2.20110516-implicits.patch 6423 RMD160 01569cd7ec3b5f4cb6498722945fb1a9eccf87a2 SHA1 512e292f7a9ea90ec87950a9a5c70e94cf91a020 SHA256 7f537b6a7404d185580b3ad12676f87a718f9e92ffab24229888959f323879f4
AUX 1.2.20110516-libdir.patch 8284 RMD160 dcecff84020fff3f7fb91386a3c338b5fda26c44 SHA1 1fdc9e7f8087918d6511d1ccdf717c1e078f1be7 SHA256 112112db01eca5657a08a492b923f96c183d6e77aa9d6ca1d2402fd7aedb72a2
DIST casacore-1.2.20110516.tar.bz2 4649168 RMD160 3d0f7df94b88b93a3cd36b5f76e01538f37b0877 SHA1 57e9b1b19a61c846d7ceeeeb575ff92998b011fc SHA256 d47a113038bf26a4431bbbeb4821b0e245a452fc1d63ffe4d9df2af0d3155ca7
-EBUILD casacore-1.2.20110516.ebuild 1099 RMD160 76ece8f9079b711e047819a6c89f9a8f3216dd12 SHA1 1f8b3e97e52db514f1724ce69a563e28b8622bca SHA256 686eb5146c308be21d3bb886565ed227bd2334545e3e85ef9e42848407a419f7
+EBUILD casacore-1.2.20110516.ebuild 1099 RMD160 16c1a52947aef05bb0b9e659b1186de0b4853bdc SHA1 d13dee016b957873fc9697890714f326a6890895 SHA256 304fd4e2bf4bd89aaa822a4fc416a5decc62dbe90620560b23aaccf17d3865dc
+MISC ChangeLog 227 RMD160 0d357dccfeb0a6901a4ccc9c76b4c2504a6f9778 SHA1 7d6e4e2958d8c32529cf17799d0e3969f2af9de0 SHA256 bc19d04dfc4d26a88d22b044b6ef22dffa673a176740292d834020bbf7af336e
MISC metadata.xml 391 RMD160 2b9d91edfd432ddf16694c417d25e89eaa13da42 SHA1 c6300dc3bf52bdd055804ad2f2c2480cc2304dcb SHA256 58c9dd33f794ccc2a1243b05da6f787660e1d844ba29c62f264b780793ab01b8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4EgYUACgkQgAnW8HDreRZWgQCdH+9ScWjLhwnS2K4iuHeSZQ94
+zVYAn2Saqxtf69UPwG1llHMrkeg2ND2t
+=b+gh
+-----END PGP SIGNATURE-----
diff --git a/sci-astronomy/casacore/casacore-1.2.20110516.ebuild b/sci-astronomy/casacore/casacore-1.2.20110516.ebuild
index deec38284..c535e9523 100644
--- a/sci-astronomy/casacore/casacore-1.2.20110516.ebuild
+++ b/sci-astronomy/casacore/casacore-1.2.20110516.ebuild
@@ -4,7 +4,7 @@
EAPI=4
-inherit eutils cmake-utils
+inherit cmake-utils eutils
DESCRIPTION="Core libraries for the Common Astronomy Software Applications"
HOMEPAGE="http://code.google.com/p/casacore/"
diff --git a/sci-astronomy/eye/ChangeLog b/sci-astronomy/eye/ChangeLog
index e91d1227f..205be6502 100644
--- a/sci-astronomy/eye/ChangeLog
+++ b/sci-astronomy/eye/ChangeLog
@@ -1,7 +1,10 @@
# ChangeLog for sci-astronomy/eye
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 24 Jun 2011; Justin Lecher <jlec@gentoo.org> eye-1.4.1.ebuild:
+ Sort inherit and/or USE
+
*eye-1.4.1 (18 Nov 2010)
18 Nov 2010; Sébastien Fabbro <bicatali@gentoo.org> +eye-1.4.1.ebuild,
diff --git a/sci-astronomy/eye/Manifest b/sci-astronomy/eye/Manifest
index 135e266ff..7f6594d04 100644
--- a/sci-astronomy/eye/Manifest
+++ b/sci-astronomy/eye/Manifest
@@ -1,5 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX eye-1.4.1-configure.patch 1521 RMD160 4e21ded936e19e7745a815b02d5121a5de7e791d SHA1 b0a81827e9f052ccf91ac93571ef2ce2872a93c8 SHA256 426d54714b01cf7616e31401e6f36f93642a28e50f13bbb30718d5d949ae4e0b
DIST eye-1.4.1.tar.gz 744173 RMD160 886d85638f099276d393dd14c841efb41c06d50a SHA1 73815581cb93c6c579f4a8c8de88f274890439e9 SHA256 f3b480be936ea8143d9f469d2901b227092ec8e7692fd2578b8ecdbcd8875824
-EBUILD eye-1.4.1.ebuild 808 RMD160 1039d52c0e522cf478a30a0d538f203eef832207 SHA1 529358d63d93e12ab19819c8f62282bb5cdc0387 SHA256 91cd62943c309ca1144b9e16059664587cca96fed5f4c8b3dd494d990c84a369
-MISC ChangeLog 287 RMD160 4b3e10bc31fa606eb2cb115a22855778e3106666 SHA1 57c0fb40b5d38466cb59009fe3fd1e017b2c9dde SHA256 9fd0826f218d876a694714f944f61006f2105f23825ea13f82fb6cae779c3b03
+EBUILD eye-1.4.1.ebuild 808 RMD160 e82521ff4555390253da4101a4f6611d6b58ce87 SHA1 e6847c2dd4f0b9d3f30413413036d7dbe1114bb5 SHA256 077abf77b9498f9523663c2a88ea87b5ff54fb4f3dd9bb451a18ac1e368d0623
+MISC ChangeLog 379 RMD160 1f5edf69d0645a9e4e313386c8700cedd8b6ed36 SHA1 05d2519b348918e5adb5b303fe1d7ce227c6f57c SHA256 85420060f74136642827d24c07b6ee0c30203bd1000a3feb3004229f2e9ef8ad
MISC metadata.xml 655 RMD160 fcec85388054934d37c4188bd508c00e00c281d2 SHA1 e51a4415f87217fbd8ade88e15fa2c10f1de83a2 SHA256 a4dca7403f21df6c4862cfd17549594c627b82633cb5cea7e808834f6c08959e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4EglcACgkQgAnW8HDreRZx1QCgjHsaSmcpZQMsysuvjSEXlF/a
+nycAoJyW/sXiWmudK29m4fBrTVeWTBtg
+=Ry2X
+-----END PGP SIGNATURE-----
diff --git a/sci-astronomy/eye/eye-1.4.1.ebuild b/sci-astronomy/eye/eye-1.4.1.ebuild
index e389ca03b..5cb826551 100644
--- a/sci-astronomy/eye/eye-1.4.1.ebuild
+++ b/sci-astronomy/eye/eye-1.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=3
-inherit eutils autotools
+inherit autotools eutils
DESCRIPTION="Enhance astronomical object extraction with neural network filters"
HOMEPAGE="http://www.astromatic.net/software/eye"
diff --git a/sci-astronomy/missfits/ChangeLog b/sci-astronomy/missfits/ChangeLog
index be0a06fb0..8a7e0eb1c 100644
--- a/sci-astronomy/missfits/ChangeLog
+++ b/sci-astronomy/missfits/ChangeLog
@@ -1,7 +1,11 @@
# ChangeLog for sci-astronomy/missfits
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 25 Jun 2011; Justin Lecher <jlec@gentoo.org> missfits-2.4.0.ebuild,
+ metadata.xml:
+ Cleaned ebuild, unused local USE-description: 'plplot'
+
*missfits-2.4.0 (18 Nov 2010)
18 Nov 2010; Sébastien Fabbro <bicatali@gentoo.org> +missfits-2.4.0.ebuild,
diff --git a/sci-astronomy/missfits/Manifest b/sci-astronomy/missfits/Manifest
index 64c28807b..57320f9f5 100644
--- a/sci-astronomy/missfits/Manifest
+++ b/sci-astronomy/missfits/Manifest
@@ -1,5 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
AUX missfits-2.4.0-configure.patch 3223 RMD160 7a3da312bf067a655202624cc1e156666b25dfd5 SHA1 a2652ebb1ad4e799308fbebadd47a70765a55d94 SHA256 57d8c51435573043c35b532e779f8f67eee54d8f17e63cb9fd3b892d7153fa35
DIST missfits-2.4.0.tar.gz 381606 RMD160 0cc4e7aa2d27607c5137e424581dc173ab692bcb SHA1 f2ff6fa889bcab66fffa3210a7d179b5f1d0b641 SHA256 40cd9de9d539ac95d34c108afa0ade4b26475adf4772a95ee42b0f9ab6edaf21
-EBUILD missfits-2.4.0.ebuild 851 RMD160 c59aee8c7d741cf37df62935259427301d8a7be1 SHA1 4acd3cb235fa73ec2d8974e40f4863dffefa16d7 SHA256 ae82c035800bc8f06e916dd5346787e73f7375f54f5466afd504d7a7bd8935f1
-MISC ChangeLog 307 RMD160 5bb0694d4a94cc0bcebc26913cc7e162bc3d735f SHA1 dbce0224932ff301488e7320010f80b7cf30420e SHA256 9ad3b334e8e711d90f1e8b5b8eca95a1591da4538cbe71d7fad66e01729dbc12
-MISC metadata.xml 665 RMD160 24b25af62924fef76691b176c6a39a4c6e728f02 SHA1 0d3c8fc603cb07359d885486273e0dc077c0d02a SHA256 5b9a3023094ce5da8f5787ab3aac15f728d466b0ac29c23ae22fab5f187a49bf
+EBUILD missfits-2.4.0.ebuild 686 RMD160 479a50099efd2546a939186d2516b4baabf0afaf SHA1 71eb8d465aef1a4c279a4bf9f14a3a4cfb9d8126 SHA256 30f8d0024e63818852e0ae100d23909f341b5a90da23a36872cfd0e256646ac6
+MISC ChangeLog 451 RMD160 2a3817063c4b042617072685618ffb3c832c40d9 SHA1 ba5d8d96687be98cdb33419daa9988d45b8e069a SHA256 eda78d1d6a24df563ec11f957886d878976bed13a0f301c38500663949ff31cb
+MISC metadata.xml 543 RMD160 0ba62e9208ce536ee9a2c08ed24b0ba0b8f02083 SHA1 65a101f1e363e77f9555655bc66458c514d193f3 SHA256 fcfb63c372b73a4553c56f39d6940a0cf8d8d8d15e5beef95ffcb5acab405d17
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREIAAYFAk4F7tQACgkQgAnW8HDreRZYtwCfczBxyOBZSaFSdizjB6Adaf30
+7zYAoIlovwtLBhTIDcftTq9+FPiuh4b/
+=bzQS
+-----END PGP SIGNATURE-----
diff --git a/sci-astronomy/missfits/metadata.xml b/sci-astronomy/missfits/metadata.xml
index 9abf5c25b..e8c098543 100644
--- a/sci-astronomy/missfits/metadata.xml
+++ b/sci-astronomy/missfits/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+ <herd>sci</herd>
+ <longdescription lang="en">
MissFITS is a program that performs basic maintenance and packaging
tasks on FITS files using an optimised FITS library. MissFITS can:
* add/edit/remove FITS header keywords
@@ -10,7 +10,4 @@
* unpile/pile FITS data-cubes
* create/check/update FITS checksums, using R. Seaman’s protocol.
</longdescription>
-<use>
- <flag name="plplot">Build with <pkg>sci-libs/plplot</pkg> to allow diagnostic plots during processing</flag>
-</use>
</pkgmetadata>
diff --git a/sci-astronomy/missfits/missfits-2.4.0.ebuild b/sci-astronomy/missfits/missfits-2.4.0.ebuild
index d710b9f85..cf97ed926 100644
--- a/sci-astronomy/missfits/missfits-2.4.0.ebuild
+++ b/sci-astronomy/missfits/missfits-2.4.0.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/scamp/scamp-1.7.0.ebuild,v 1.1 2010/05/03 21:44:04 bicatali Exp $
-EAPI=3
-inherit eutils autotools
+EAPI=4
+
+inherit autotools eutils
DESCRIPTION="Performs basic maintenance and packaging tasks on FITS files"
-HOMEPAGE="http://www.astromatic.net/software/missfits"
+HOMEPAGE="http://www.astromatic.net/software/missfits/"
SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
@@ -14,19 +15,15 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc"
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
src_prepare() {
epatch "${FILESDIR}"/${P}-configure.patch
eautoreconf
}
src_install () {
- emake DESTDIR="${D}" install || die "emake install failed"
- dodoc AUTHORS ChangeLog HISTORY README THANKS BUGS
+ default
if use doc; then
insinto /usr/share/doc/${PF}
- doins doc/*.pdf || die "pdf doc install failed"
+ doins doc/*.pdf
fi
}
diff --git a/sci-astronomy/psfex/Manifest b/sci-astronomy/psfex/Manifest
index a89bca695..e38a380d7 100644
--- a/sci-astronomy/psfex/Manifest
+++ b/sci-astronomy/psfex/Manifest
@@ -2,12 +2,12 @@
Hash: SHA1
DIST psfex-3.9.1.tar.gz 2364495 RMD160 54c1a32c7f9305a91b973a974c4ae527a4dc3143 SHA1 af164b4e3d1bf61cdd738e8c52730f8564460ae0 SHA256 1758a1a40166ef59475d8fab6abda33ca0ed0a837531ff7ad577d8bce4e511f7
-EBUILD psfex-3.9.1.ebuild 1183 RMD160 8d6a5d0516905461ad7396048041a8b77b80ba72 SHA1 5efaa2f2a3e61efd61fea3cdd63ff09b58b76974 SHA256 db8a963587ebcedbc59342e771b1083a1c449dcf4b7bdab856a39800ba66416e
+EBUILD psfex-3.9.1.ebuild 1183 RMD160 26f4f8c2c4e6e6bee033972d051f5ca949a58877 SHA1 88f82e87f8258be728318d1930dfcf93cec51022 SHA256 afe364cee799aabbe1a474fbd62f88db3288f7078292be05965f437e81083d55
MISC metadata.xml 608 RMD160 16d7fe8c80598c89ae9a28647326731fa17579b5 SHA1 aa50c8cf441f11b93cf3cb133113d819cb55178b SHA256 11164a313edba70d4453e479bc6ee510c190f60dfe8ddaf6e1df74cde674d07b
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAkzkbYoACgkQ1ycZbhPLE2A7MACcDGkfh4bbgwggd+IENWm4izNH
-rsMAnRXGJG+TOyOuFMkgQ0Ny1FlxIDAL
-=wt/K
+iEYEARECAAYFAk4EhyIACgkQgAnW8HDreRbrjACfStyPlJje9jUp1Iii4zNJzaVe
+EAwAn0mOjSRI8gK34Pgnt2HxijHc5BIB
+=zk3W
-----END PGP SIGNATURE-----
diff --git a/sci-astronomy/psfex/psfex-3.9.1.ebuild b/sci-astronomy/psfex/psfex-3.9.1.ebuild
index 9d95745bc..3530ea969 100644
--- a/sci-astronomy/psfex/psfex-3.9.1.ebuild
+++ b/sci-astronomy/psfex/psfex-3.9.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="doc threads plplot"
+IUSE="doc plplot threads"
RDEPEND="virtual/cblas
sci-libs/lapack-atlas
diff --git a/sci-astronomy/skymaker/Manifest b/sci-astronomy/skymaker/Manifest
index 828a78e4a..5e57a4766 100644
--- a/sci-astronomy/skymaker/Manifest
+++ b/sci-astronomy/skymaker/Manifest
@@ -1,5 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX skymaker-configure.patch 1152 RMD160 ac9808398cf1e2e0dcb17ca7a0e0e54814e1803c SHA1 1ddbe2391e66a48c5220a00a3500cb5a6cbfe356 SHA256 a27412b932426c28b61e98eb6eb9be8c83c8ad56c020b3892ecf4e6ae2235374
DIST skymaker-3.3.3.tar.gz 415740 RMD160 8f9809a1fcf6659a6d76b6d8f6cc1a9154306262 SHA1 781e4e1955a04bfadb74904243ddfd8f507839d5 SHA256 75ddcfcc577591b3ad430171fa867cc7a573bb93f541fd82ef6ebe873c1816f4
-EBUILD skymaker-3.3.3.ebuild 698 RMD160 d7c98c777616a773ca64baa85c3d753a37d92c52 SHA1 3cbf5ce62625e29d6eeda11ee6797c3a4cd7b024 SHA256 949a15f774162c4d47fc515c2d8a3e0b6f02fb04ee29ff6df602943e31860de3
+EBUILD skymaker-3.3.3.ebuild 698 RMD160 5086f36d06bdd0bcf82f1066233c1d6c2bfb324a SHA1 a78b52ddf0b7294864d08794b466815cc08605e3 SHA256 5c6ff7aae00edf2b7a61027a1cc258e30fe972cb5c457b9d2905e7d28f2e38f7
MISC ChangeLog 504 RMD160 3278dbafae2c1350b3ee2132d40feb2884ad24d9 SHA1 9ad54a932a7d3dd7a237e095fa69e29eca1f81f2 SHA256 954c491b6107fe2867ecdb7a6ff89d89c45dd16220b88a31d76c8ba496f8b1fc
MISC metadata.xml 522 RMD160 82a2f56adf45447226214d63b733d5ee59a7a28f SHA1 f3fd9b95737eec4ac3bb5d7103b6237b21089d20 SHA256 d86351847a40cd61b3b7da6a9794b11a34de5192952dcb849d91cbc442b05646
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4EhycACgkQgAnW8HDreRYIKwCg0aUQ4uxJxWREhEsQkfzXoXWp
+7XUAn2DgdbrunHDwK76kE9aJme7it8Jj
+=k3Vm
+-----END PGP SIGNATURE-----
diff --git a/sci-astronomy/skymaker/skymaker-3.3.3.ebuild b/sci-astronomy/skymaker/skymaker-3.3.3.ebuild
index 07fc85770..99dd48b0d 100644
--- a/sci-astronomy/skymaker/skymaker-3.3.3.ebuild
+++ b/sci-astronomy/skymaker/skymaker-3.3.3.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=2
-inherit eutils autotools
+inherit autotools eutils
DESCRIPTION="Program that simulates astronomical images"
HOMEPAGE="http://www.astromatic.net/software/skymaker"
diff --git a/sci-astronomy/stuff/Manifest b/sci-astronomy/stuff/Manifest
index 2dfa594fd..a38923192 100644
--- a/sci-astronomy/stuff/Manifest
+++ b/sci-astronomy/stuff/Manifest
@@ -1,5 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX stuff-configure.patch 1734 RMD160 cd80f40b8bf4757a7f30219a68393bc014dad63d SHA1 ba572bd637a09246ca2fcdb0f576ec183ce798b0 SHA256 7cdcd8b57aae0d2b80534794d3f9d34a72fde74e20cd6220f70e7d286fce11a9
DIST stuff-1.19.tar.gz 4017086 RMD160 c8ac8d3bbe7cd4a7e48b81b98de60b6c777e6e74 SHA1 acf5b26e5cc10eac757b55b8cca59d5ca3d3ab94 SHA256 592e6bfff704d1391b150a0820b52258ef69a99b698ac07eb0a8f04daf5b0210
-EBUILD stuff-1.19.ebuild 690 RMD160 7efea25ad8594cc817f98d78cb1aad60222118fe SHA1 3522b40dfe6a16c70fb6199e47bcbd6530cffb33 SHA256 cc7da95766f458816f763308e9ae697c101a810652d25d030c6f62394b636d92
+EBUILD stuff-1.19.ebuild 690 RMD160 d131ccfb5b7ad8fe0a8f272ed3d8b2323f7190d7 SHA1 1321ff319e1d02027374dbaaf4404da7584b56d5 SHA256 a6a667a18447e04baeace961941cc8c7d114f0f39535b516b45211c9ce8060c0
MISC ChangeLog 393 RMD160 1b8d57da8f964e6b587cb88039da9a7d096f7517 SHA1 b1224d92a265403f6473771b8887d9bc9b094a4c SHA256 49ac0889dbb5ce913e6f1068db7d490f3590071faec88b8ecc3b34c6e916a2f5
MISC metadata.xml 397 RMD160 1b501841d3d65e5f322607b8f336e077ded9cb7e SHA1 5c5037a6ce527cf3c559426e9355fa804ad6e2db SHA256 69add15cada8ac23ffc005025d85d26e369d568ee8d3b88755d0a99571d6bd3f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4EhywACgkQgAnW8HDreRayhgCfUDhqlPx5iUku6SQJpMNK8yZ/
+JX8AnApgK1ToA9ofIO/qUVr5FufOwh7w
+=2Vnj
+-----END PGP SIGNATURE-----
diff --git a/sci-astronomy/stuff/stuff-1.19.ebuild b/sci-astronomy/stuff/stuff-1.19.ebuild
index 9231d7b27..39abdb39e 100644
--- a/sci-astronomy/stuff/stuff-1.19.ebuild
+++ b/sci-astronomy/stuff/stuff-1.19.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=2
-inherit eutils autotools
+inherit autotools eutils
DESCRIPTION="Tool for automatic generation of astronomical catalogs"
HOMEPAGE="http://astromatic.iap.fr/software/stuff/"
diff --git a/sci-astronomy/weightwatcher/ChangeLog b/sci-astronomy/weightwatcher/ChangeLog
index c2f6ee227..b886eb169 100644
--- a/sci-astronomy/weightwatcher/ChangeLog
+++ b/sci-astronomy/weightwatcher/ChangeLog
@@ -1,7 +1,11 @@
# ChangeLog for sci-astronomy/weightwatcher
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 25 Jun 2011; Justin Lecher <jlec@gentoo.org> weightwatcher-1.8.10.ebuild,
+ metadata.xml:
+ Cleaned ebuild, no eauto* function called
+
18 Nov 2010; Sébastien Fabbro <bicatali@gentoo.org> ChangeLog:
Initial import
diff --git a/sci-astronomy/weightwatcher/Manifest b/sci-astronomy/weightwatcher/Manifest
index dc26d6c97..9826603bc 100644
--- a/sci-astronomy/weightwatcher/Manifest
+++ b/sci-astronomy/weightwatcher/Manifest
@@ -1,13 +1,14 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
DIST weightwatcher-1.8.10.tar.gz 403372 RMD160 530b81d4b40354f85eb21bcd62b473457033ce4d SHA1 00c824fdc068299db04e48263558e1da223baeff SHA256 7f8a09deb586bb118c79d7ebcb8c6958d9ea49862f7d5a2dfdf229c550e8f740
-EBUILD weightwatcher-1.8.10.ebuild 692 RMD160 811a7bbe0512a2d86a5f3d16448250a0ab2c8bda SHA1 42140a2587530c735d5383b47ffe5bda9ab1de02 SHA256 4c13bdf29fecb952cc815fda3965f75ddd51a28999c4f7b05dabf22e674a363d
-MISC metadata.xml 479 RMD160 2abe17c2742f23806adee6a24fcee03e357ddf3c SHA1 804697574ded40d4b802df5aa31aaec9cbc22b30 SHA256 8e8e110f13856ad59bea1abc02de7f0fe172e7951c147fb7f780036f3a65de52
+EBUILD weightwatcher-1.8.10.ebuild 517 RMD160 cc2f96177bbb6af7bb746c85669e2616d50f1e70 SHA1 4bafd53f0944f6045c70370fd72f8a2619e275e9 SHA256 9a19a994c35259bfc6743fe13995b380c5c8368d670f3ab5b99d9ae07ffb2b1f
+MISC ChangeLog 349 RMD160 1f074aee3274c53f77def751a5ef77754e44e58e SHA1 0051d0f751f75ce7e167e6c80a65aa3af9f0dd4d SHA256 4959c4d7230fb771495634b9c1416a5085750f08831fde056761f29725e3e341
+MISC metadata.xml 481 RMD160 3335871d604c67ce9b43c7d863f951b9e1735eb4 SHA1 31775493c9b40dfce2fb7aa638b6d325bf9911ce SHA256 af2d3375fefbb033ababcc44c8a2f9cd3765b3ec0d786bdb6d37d7dd356a141f
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAkzkbVwACgkQ1ycZbhPLE2DZQACdEbXHKnrW/sS4WjVUCATXIsZ/
-GQoAoJNwPc9xAew9DlmagSNIXWWxgF45
-=Q4TL
+iEYEAREIAAYFAk4F7xoACgkQgAnW8HDreRaeOACfZ5L1wH10RAKUbSrEzywHmv7i
+iJIAoLdCz8gJ36paAzfxnrmJAWzYyvqA
+=KJ7w
-----END PGP SIGNATURE-----
diff --git a/sci-astronomy/weightwatcher/metadata.xml b/sci-astronomy/weightwatcher/metadata.xml
index 098d83643..278512904 100644
--- a/sci-astronomy/weightwatcher/metadata.xml
+++ b/sci-astronomy/weightwatcher/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+ <herd>sci</herd>
+ <longdescription lang="en">
WeightWatcher is a program that combines weight-maps, flag-maps and
polygon data in order to produce control maps which can directly be
used in astronomical image-processing packages like Drizzle,
diff --git a/sci-astronomy/weightwatcher/weightwatcher-1.8.10.ebuild b/sci-astronomy/weightwatcher/weightwatcher-1.8.10.ebuild
index a2c96fba4..c4a277050 100644
--- a/sci-astronomy/weightwatcher/weightwatcher-1.8.10.ebuild
+++ b/sci-astronomy/weightwatcher/weightwatcher-1.8.10.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=3
-inherit eutils autotools
+EAPI=4
+
+inherit eutils
DESCRIPTION="Combine weight maps and polygon for astronomical images weighting"
-HOMEPAGE="http://www.astromatic.net/software/weightwatcher"
+HOMEPAGE="http://www.astromatic.net/software/weightwatcher/"
SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
@@ -14,14 +15,10 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc threads"
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
src_install () {
- emake DESTDIR="${D}" install || die "emake install failed"
- dodoc AUTHORS ChangeLog HISTORY README THANKS BUGS
+ default
if use doc; then
insinto /usr/share/doc/${PF}
- doins doc/*.pdf || die "pdf doc install failed"
+ doins doc/*.pdf
fi
}
diff --git a/sci-biology/OBO-Edit/ChangeLog b/sci-biology/OBO-Edit/ChangeLog
new file mode 100644
index 000000000..e1de6ad37
--- /dev/null
+++ b/sci-biology/OBO-Edit/ChangeLog
@@ -0,0 +1,7 @@
+# ChangeLog for sci-biology/OBO-Edit
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 25 Jun 2011; Justin Lecher <jlec@gentoo.org> OBO-Edit-2.1_beta8.ebuild:
+ Cleaned ebuild
+
diff --git a/sci-biology/OBO-Edit/Manifest b/sci-biology/OBO-Edit/Manifest
index b12079377..7d3684c16 100644
--- a/sci-biology/OBO-Edit/Manifest
+++ b/sci-biology/OBO-Edit/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
AUX response.varfile 161 RMD160 3fbf3bb5a79dafecefdd64314f4fcfbb05ecc8d0 SHA1 46c6214c7072221455e74a9aa502c85b8edca0be SHA256 4a5793bb5bf94fcb10732cf9f821eacfa41b8a36d1a5fc4bae76408f19d85c02
DIST oboedit_2_1_8_linux_install4j.rpm 51962024 RMD160 b1ce3c7704c2fbe5185e36c6ad6c63f7fcf065fb SHA1 6a8a1605b9d6f16b6dc34469442a520029135eaa SHA256 e29edfe6531be9f64235e2891426b3ecf9f5a12f0f0f09a0b461f440dbcacfdd
-EBUILD OBO-Edit-2.1_beta8.ebuild 1202 RMD160 e344bfb70b7291a04f3a21e41d9a8cdbeb75af36 SHA1 7f3df8619ec1ca9d9fc0912e175a159d86ddd6da SHA256 41fcb00811757696c332c9d4d1941ea186d7265ab7d2bfe05c923e9486125b51
+EBUILD OBO-Edit-2.1_beta8.ebuild 1011 RMD160 9214f2ed58107aceb10259e9960380a2e42a508d SHA1 52ccbf82bb26a9764c73f43edd5749297c43bd0f SHA256 efbeebf397b2176e07fc80aaf020cd9d9e4d2b4523315a820939761d3902a8c7
+MISC ChangeLog 213 RMD160 b8548e6d5f3b28a81e670bea1bad94cf72b68541 SHA1 aed23b323ab6ec8f1ba26a4e0583e139d9b4c50e SHA256 60ac52b6c2696252417f779b77704412a18162fa69c7923c53722072ac6deb90
MISC metadata.xml 269 RMD160 53c242e331b0a82669ca7913da16dac854ab8dca SHA1 bc75ba3b0f5607ac5f396d3e8a99daf5ded5a7de SHA256 13472fd0615d2b381dbe36666fe1bbf3b1c34770aa409c6101b38741b4586f85
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREIAAYFAk4F9AUACgkQgAnW8HDreRaa7QCghXG6JSHPKGLWYGFRHT83RWD3
+oscAoJucwotuTlZpVfq0ImuGVTIQcThj
+=RaKC
+-----END PGP SIGNATURE-----
diff --git a/sci-biology/OBO-Edit/OBO-Edit-2.1_beta8.ebuild b/sci-biology/OBO-Edit/OBO-Edit-2.1_beta8.ebuild
index debd89f27..8842bcdb3 100644
--- a/sci-biology/OBO-Edit/OBO-Edit-2.1_beta8.ebuild
+++ b/sci-biology/OBO-Edit/OBO-Edit-2.1_beta8.ebuild
@@ -2,7 +2,9 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=3
+EAPI=4
+
+inherit rpm
DESCRIPTION="Java-based editor optimized for the OBO biological ontology file format"
HOMEPAGE="http://www.oboedit.org/"
@@ -15,19 +17,16 @@ KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="app-arch/rpm2targz"
-RDEPEND="${DEPEND}
- virtual/jre"
+RDEPEND="virtual/jre"
-src_unpack() {
- cd "${WORKDIR}"
- rpm2targz "${DISTDIR}/oboedit_2_1_8_linux_install4j.rpm" || die
- tar -xzf "${WORKDIR}/oboedit_2_1_8_linux_install4j.tar.gz" || die
-}
+S="${WORKDIR}"/opt
src_install(){
# sh "${DISTDIR}"/oboedit_2_1_8_unix_install4j.sh -q -overwrite --var-file="${FILESDIR}"/response.varfile --destination="${D}"/opt/OBO-Edit2
- mkdir -p "${D}"/opt/ || die
- cp -rp opt/OBO-Edit2 "${D}"/opt/ || die
- find "${D}"/opt -name firstrun | xargs rm -f # drop a world writable file
- find "${D}"/opt -name .svn | xargs rm -rf
+ find . -name firstrun -delete
+ find . -name .svn -exec rm -rf '{}' \;
+
+ insinto /opt/
+ doins -r OBO-Edit2
+ chmod 755 "${ED}"/opt/OBO-Edit2/*
}
diff --git a/sci-biology/ONTO-PERL/ChangeLog b/sci-biology/ONTO-PERL/ChangeLog
new file mode 100644
index 000000000..847ef31f3
--- /dev/null
+++ b/sci-biology/ONTO-PERL/ChangeLog
@@ -0,0 +1,7 @@
+# ChangeLog for sci-biology/ONTO-PERL
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 25 Jun 2011; Justin Lecher <jlec@gentoo.org> ONTO-PERL-1.31.ebuild:
+ Cleaned ebuild, 'http://search.cpan.org/CPAN' found in thirdpartymirrors
+
diff --git a/sci-biology/ONTO-PERL/Manifest b/sci-biology/ONTO-PERL/Manifest
index cea366935..66f2b8d5b 100644
--- a/sci-biology/ONTO-PERL/Manifest
+++ b/sci-biology/ONTO-PERL/Manifest
@@ -1,3 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
DIST ONTO-PERL-1.31.tar.gz 721117 RMD160 0253abe13b159578955aff5cd0b294ddc3c8c9ed SHA1 93147c710ab0c3e5d227c91ff22dea1de6d2c6fa SHA256 89a85cbe2f7ced1a394d863d9b6fbc54fae2cc8a3c2531fcaaebaf50489866b8
-EBUILD ONTO-PERL-1.31.ebuild 656 RMD160 e29e0b2bb9382c7cac680448c0e7a62850a2437f SHA1 f04ae934a75027f6f1f3f028994aab634bc0dc86 SHA256 3ab67cb3df24b53241929631c974c1b97455ad5977e4bc3ea587a2fa58bef316
+EBUILD ONTO-PERL-1.31.ebuild 549 RMD160 369b3febfed860468843bbf9ae3819c44929faf9 SHA1 84ef7853cae41bea9cc8c3ddf10eedd1429a5cf3 SHA256 cafd5f1e96a254aa4c8107214afe3795e6a6ced10a9dc6203b96e551f179dec3
+MISC ChangeLog 268 RMD160 7ee93ecde2424e9e58e287496593e5335ff877b0 SHA1 a5a25c4ccfee8d1f2c05c68ee0e869069bb31dff SHA256 2b597424fede3c8c80631c215da408b7050da0454e739b837d2a8563ddb6459e
MISC metadata.xml 165 RMD160 b247a16b6552b292d1249ff4e8ea5060ad2c4372 SHA1 a9f91a3a303f4c85430e21eca09913e1c9426366 SHA256 560c375768c8e164d954d61924f110da785b4771012cb830963eaa267a319132
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREIAAYFAk4F8lEACgkQgAnW8HDreRboOACgxyF0eel2GS+hFJWZFkewTKAJ
+l7EAoL/6f7pEw0MjEOHc4KkxAuGV160N
+=3aoL
+-----END PGP SIGNATURE-----
diff --git a/sci-biology/ONTO-PERL/ONTO-PERL-1.31.ebuild b/sci-biology/ONTO-PERL/ONTO-PERL-1.31.ebuild
index efb4f7a46..473a145f9 100644
--- a/sci-biology/ONTO-PERL/ONTO-PERL-1.31.ebuild
+++ b/sci-biology/ONTO-PERL/ONTO-PERL-1.31.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Geo-IP/Geo-IP-1.38.ebuild,v 1.1 2009/05/19 12:22:20 tove Exp $
+# $Header: $
EAPI=2
MODULE_AUTHOR=EASR
-inherit perl-module multilib
+
+inherit multilib perl-module
DESCRIPTION="Manipulates OBO- and OWL-formatted ontologies (like the Gene Ontology)"
+SRC_URI="mirror://cpan/authors/id/E/EA/EASR/ONTO-PERL/ONTO-PERL-1.31.tar.gz"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-SRC_URI="http://search.cpan.org/CPAN/authors/id/E/EA/EASR/ONTO-PERL/ONTO-PERL-1.31.tar.gz"
DEPEND=""
RDEPEND="${DEPEND}
diff --git a/sci-biology/amos/Manifest b/sci-biology/amos/Manifest
index 0f80e3de9..b9e41a1a5 100644
--- a/sci-biology/amos/Manifest
+++ b/sci-biology/amos/Manifest
@@ -1,4 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX amos.m4.patch 1597 RMD160 f59e198aa725132f9e63d95a7efb05281d83a26f SHA1 5f4dfd9ffc40b2d06a3e8b4996aed2cbbe1297e7 SHA256 c5015f3548b2465fe235a8f2906fc0da2ecc96e50ebe2d7818aa2e17202aa01d
EBUILD amos-9999.ebuild 1443 RMD160 020608c038facb917a9b52fe33cf5a70964fcffb SHA1 092e11d2844a4ea917d91c8edfd3d0682408ad34 SHA256 8e6ed1e4926c6e13531dc719d751028d5499e093b58a38ba8fb542d0db00da61
-MISC ChangeLog 213 RMD160 de502e7771dc17bd94b9bcd73b8288ebeff8892c SHA1 c0ea21e961752ecc7d8ed29334a31beb631ffc00 SHA256 423e7fb2941c5d867e363f2c6cbd26ed39b5efee85724fd76ac3d3c1803bd2d5
-MISC metadata.xml 549 RMD160 aaaa14a78b782644b19b4319869cfe78d2db5836 SHA1 f587b263a39731a1af3c80854aa5959f8edb7db6 SHA256 175313bbe3f6d424690f879605a71e0e2661d84b4c4cdd884d4a5cb05c04c7b9
+MISC metadata.xml 557 RMD160 3c1fa25a5d69a810652841110b688036a6971a64 SHA1 004c2081cbbcc715c82273022e7f4afce45c6da6 SHA256 fd4ffdf2f6037866d7ff2acf02e8d0c6bc9950888c1276c3de09958d4b141509
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4EwEoACgkQgAnW8HDreRZnVACdEvKREzWpDhIjVPoRWZUAm18J
+ZwkAn0MRMmjUrZeECCipLdsKQmR7bYci
+=hr7y
+-----END PGP SIGNATURE-----
diff --git a/sci-biology/apollo/Manifest b/sci-biology/apollo/Manifest
index 056646de8..5f874bbc5 100644
--- a/sci-biology/apollo/Manifest
+++ b/sci-biology/apollo/Manifest
@@ -1,2 +1,12 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
EBUILD apollo-9999.ebuild 1048 RMD160 21152d198e3c6a17442d1cde53f4bdf81d6089a1 SHA1 637631379bc584f26caba8fd4f4faea0597ba13e SHA256 6c8177a03caa6e4166d055da0fcb9b88feb2edaf00e3d38f996f73f644c6dc47
-MISC metadata.xml 261 RMD160 ce19afc5fdd536a9eadb35a705f09613e3774e32 SHA1 b95b491e808c8dd5a106edae7e48af4f8d61f58a SHA256 e3766426d46af16432093cd9fb8a2df3862c77ef313ad175ca2ef60af5cee6f5
+MISC metadata.xml 269 RMD160 53c242e331b0a82669ca7913da16dac854ab8dca SHA1 bc75ba3b0f5607ac5f396d3e8a99daf5ded5a7de SHA256 13472fd0615d2b381dbe36666fe1bbf3b1c34770aa409c6101b38741b4586f85
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4Ev5QACgkQgAnW8HDreRYwLgCeKqTedlqvgkrkXwKNBfFfYN9o
+o40AoJ8xTGL9Ko6q8XwA0X222+RUCPr3
+=ALTA
+-----END PGP SIGNATURE-----
diff --git a/sci-biology/argo-bin/ChangeLog b/sci-biology/argo-bin/ChangeLog
new file mode 100644
index 000000000..7f9152a7a
--- /dev/null
+++ b/sci-biology/argo-bin/ChangeLog
@@ -0,0 +1,7 @@
+# ChangeLog for sci-biology/argo-bin
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 25 Jun 2011; Justin Lecher <jlec@gentoo.org> argo-bin-1.0.31.ebuild:
+ Cleaned ebuild
+
diff --git a/sci-biology/argo-bin/Manifest b/sci-biology/argo-bin/Manifest
index ddf9aded8..12adf4d3e 100644
--- a/sci-biology/argo-bin/Manifest
+++ b/sci-biology/argo-bin/Manifest
@@ -1,3 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
DIST argo.jar 26624770 RMD160 d789a09818e3d6d3cb87b11411c49959a050fa79 SHA1 305a668897ebd8f9c9c12484b3518a591121e51d SHA256 33ece2dba7ee5cc36f5aab99b3e7df2d641b261d86aacac00745e9d4a2e914cf
-EBUILD argo-bin-1.0.31.ebuild 826 RMD160 43c29f959b336d944cd7864e5483f43fcd42a2dc SHA1 0b6778565dcc6d1f0a87340eefa2c9c5c5480586 SHA256 a4c2363eab488198df4762ecfc9f5a4549a0d58da895ddce6cbb4aaa0d7b6188
-MISC metadata.xml 261 RMD160 ce19afc5fdd536a9eadb35a705f09613e3774e32 SHA1 b95b491e808c8dd5a106edae7e48af4f8d61f58a SHA256 e3766426d46af16432093cd9fb8a2df3862c77ef313ad175ca2ef60af5cee6f5
+EBUILD argo-bin-1.0.31.ebuild 750 RMD160 48f92a7e0bc78e52758d23e03187a3c064b66ce4 SHA1 f0dd3eea6eeebd45c2e07f894d5d6f4ec031af61 SHA256 5a2c0b5e82bdac568e5d671730595a8969bdd7e33d051e3f2133379805302b90
+MISC ChangeLog 210 RMD160 c00a3a468c7cad5ff65f84c0d9f3357bc9fa25a9 SHA1 b98c0ed89efdef2754c6d89da9ae28b5bb93b544 SHA256 8789c4325700c8afd94e30292e96c792d1282177baa879b3ce548f08db288726
+MISC metadata.xml 269 RMD160 53c242e331b0a82669ca7913da16dac854ab8dca SHA1 bc75ba3b0f5607ac5f396d3e8a99daf5ded5a7de SHA256 13472fd0615d2b381dbe36666fe1bbf3b1c34770aa409c6101b38741b4586f85
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREIAAYFAk4F75cACgkQgAnW8HDreRbZLgCeLx70kw5eOyWwmJv7iQTwcWxo
+9DEAn0X1CgF0j1rrThydYJYRVfUwSX9+
+=ErKe
+-----END PGP SIGNATURE-----
diff --git a/sci-biology/argo-bin/argo-bin-1.0.31.ebuild b/sci-biology/argo-bin/argo-bin-1.0.31.ebuild
index ee72f80a9..7ed58fad2 100644
--- a/sci-biology/argo-bin/argo-bin-1.0.31.ebuild
+++ b/sci-biology/argo-bin/argo-bin-1.0.31.ebuild
@@ -1,14 +1,12 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sci-biology/consed/consed-19-r2.ebuild,v 1.2 2010/10/10 21:20:04 ulm Exp $
-EAPI=3
+EAPI=4
-inherit toolchain-funcs java-utils-2
+inherit java-utils-2 toolchain-funcs
-DESCRIPTION="The Argo Genome Browser is a production tool for
- visualizing and manually annotating whole genomes
- stored in .gff3 files"
+DESCRIPTION="Visualization and manually annotating whole genomes"
HOMEPAGE="http://www.broadinstitute.org/annotation/argo/"
SRC_URI="http://www.broadinstitute.org/annotation/argo/argo.jar"
#SRC_URI="http://www.broadinstitute.org/annotation/argo/src/workspace-2008-03-11.tgz"
@@ -26,4 +24,3 @@ src_install() {
java-pkg_newjar "${DISTDIR}"/argo.jar argo.jar
java-pkg_dolauncher
}
-
diff --git a/sci-biology/argo/Manifest b/sci-biology/argo/Manifest
index a23395d9c..62322c09d 100644
--- a/sci-biology/argo/Manifest
+++ b/sci-biology/argo/Manifest
@@ -1,3 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
DIST workspace-2008-03-11.tgz 109194467 RMD160 873b9c3facfe872108a4c8849a774d5c8c74893f SHA1 382642ae8d7498bb8c21764fa625aa47b4107cfb SHA256 0ee6acb0ebdc17cfbedfedb8559ba950ddd4c5c4ef5f7875fa93f3fad885b99e
-EBUILD argo-1.0.24.ebuild 935 RMD160 54eb968965979b8b37e236f94faa554ebb7d21df SHA1 65eda8fec914b3a43184e039c52a91d6381d8005 SHA256 f06f6d3ca2e10a5eee2e4f233bedfcacaaa918b4294d945a861399ffd95e40c3
-MISC metadata.xml 261 RMD160 ce19afc5fdd536a9eadb35a705f09613e3774e32 SHA1 b95b491e808c8dd5a106edae7e48af4f8d61f58a SHA256 e3766426d46af16432093cd9fb8a2df3862c77ef313ad175ca2ef60af5cee6f5
+EBUILD argo-1.0.24.ebuild 879 RMD160 7288ffba9db9f8380326957a0b2e780434b190fb SHA1 d662bcdf91e2a10bf6a49ae643d3d7552748f3ae SHA256 558fcb91ff7a7188d49a86343ae7c58ce5053995c0cdfd9e17fe7e7b8308e026
+MISC metadata.xml 269 RMD160 53c242e331b0a82669ca7913da16dac854ab8dca SHA1 bc75ba3b0f5607ac5f396d3e8a99daf5ded5a7de SHA256 13472fd0615d2b381dbe36666fe1bbf3b1c34770aa409c6101b38741b4586f85
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4Ei+4ACgkQgAnW8HDreRav7wCdFTNQA2y8/m1P5MN+B1mIVE+l
+5ucAnRUBfKPrUIvcaEfPasGiSs4CVkcM
+=wbss
+-----END PGP SIGNATURE-----
diff --git a/sci-biology/argo/argo-1.0.24.ebuild b/sci-biology/argo/argo-1.0.24.ebuild
index 30fba8746..055979850 100644
--- a/sci-biology/argo/argo-1.0.24.ebuild
+++ b/sci-biology/argo/argo-1.0.24.ebuild
@@ -4,11 +4,9 @@
EAPI=3
-inherit toolchain-funcs java-utils-2 java-pkg-2 java-ant-2
+inherit java-pkg-2 java-ant-2 java-utils-2 toolchain-funcs
-DESCRIPTION="The Argo Genome Browser is a production tool for
- visualizing and manually annotating whole genomes
- stored in .gff3 files"
+DESCRIPTION="Production tool for visualizing and manually annotating whole genomes"
HOMEPAGE="http://www.broadinstitute.org/annotation/argo/"
SRC_URI="http://www.broadinstitute.org/annotation/argo/src/workspace-2008-03-11.tgz"
@@ -18,8 +16,9 @@ KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5
- dev-java/ant-core"
+DEPEND="
+ >=virtual/jdk-1.5
+ dev-java/ant-core"
S="${WORKDIR}"/workspace-2008-03-11
diff --git a/sci-biology/autoeditor/ChangeLog b/sci-biology/autoeditor/ChangeLog
new file mode 100644
index 000000000..a95258201
--- /dev/null
+++ b/sci-biology/autoeditor/ChangeLog
@@ -0,0 +1,7 @@
+# ChangeLog for sci-biology/autoeditor
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 24 Jun 2011; Justin Lecher <jlec@gentoo.org> autoeditor-1.20.ebuild:
+ Shorten Summary
+
diff --git a/sci-biology/autoeditor/Manifest b/sci-biology/autoeditor/Manifest
index c6f9f202c..641dc429b 100644
--- a/sci-biology/autoeditor/Manifest
+++ b/sci-biology/autoeditor/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX Makefile.patch 3051 RMD160 bca80507a7d1b401a96b654e7049a54c8f68bd05 SHA1 453ce786ab004f25eb19842d8558ad450bb34560 SHA256 534d67e7effdb072d6a2c7469e67b50ff82da5c5c9bf16de57d30609b024055d
AUX sample_expected.out 1118 RMD160 38f3a997add481e6ac8b2f981e32aab6113302ce SHA1 5c1afa013888ccdeb4325935a4bc362dfdebe2e1 SHA256 bb51ba6b15a9916c65b0209742ff3dc3a8832c1355f65cbf35738ce88047ce9b
DIST autoEditor-1.20-sample.tar.gz 71953287 RMD160 bfb859a3badec0db85ee31086d2574cd43ebe3a3 SHA1 a36668f1d041552229684c20d9789e7b6301d57e SHA256 f25beb3668ab2b3f2018e5e3b9615995ba5a16b5ce002ff50806287f28f5ef25
DIST autoEditor-1.20.tar.gz 2438903 RMD160 598ac977eb424959fc052b4c857ef4487b7e13f9 SHA1 985b5e880148a904b157295053945f9530718d30 SHA256 c0c399eda52a10deb0e0362b4caf909014768a4d08e90c900392cdf712cefd66
-EBUILD autoeditor-1.20.ebuild 1304 RMD160 1090965e8b9dcfdbf5ed192976dd2ddde4164cdb SHA1 17c7245826480ec3e3ea93b1f373a1077dbdec70 SHA256 a3f44b7e1eb317350ec8e676068601d164e50f997ff0d9919282d4d68abb5711
-MISC metadata.xml 1152 RMD160 0c202dd48bd4242879dccee9f566e9003857db84 SHA1 bf658a22a72370f46e76da50b1960f5fbb189aae SHA256 a6323415c0ec7864b776e4454845e6e659f23e978669c86aa4188ac0bbad24b8
+EBUILD autoeditor-1.20.ebuild 1134 RMD160 9a60610118475e6bdcfc54676887e1a809fa526f SHA1 297b5566c27274765b52345a6c943d62d750d00f SHA256 8e62b735c19f1ea2a5a1a9fc729fb55f68706f9d6ddf68c6e51eaad02a686345
+MISC ChangeLog 213 RMD160 dad86b527258c7be58b278fd8afcb94f83c4f9a1 SHA1 e37a2303e9c3d7f86446da6094bcb684ff1989bf SHA256 e3e26aff923684c1790497a3cb2c2b04a094d0dba50a2944de58008857873971
+MISC metadata.xml 1160 RMD160 1006598866055875c6ad7f39e0634def718002db SHA1 2b13d7786cc0dac0434b14bace3467126904ddc2 SHA256 fb86e548211f36d0f56372b98bd47ff6228e9e81862714937afb1292e9004079
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4EwNcACgkQgAnW8HDreRb6RACgkYKEo++8/u1PQglFS2rPcO1y
+Va4An3GZWl1Zj/OwpNTKqys8QJwLFVpn
+=4wrn
+-----END PGP SIGNATURE-----
diff --git a/sci-biology/autoeditor/autoeditor-1.20.ebuild b/sci-biology/autoeditor/autoeditor-1.20.ebuild
index bbe990805..f39f43dd5 100644
--- a/sci-biology/autoeditor/autoeditor-1.20.ebuild
+++ b/sci-biology/autoeditor/autoeditor-1.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -6,20 +6,21 @@ EAPI=3
inherit eutils
-DESCRIPTION="AutoEditor is a program that can automatically correct discrepancies in a
-multiple alignment by reanalyzing the chromatograms of the discrepant bases."
+DESCRIPTION="Automatic correct of discrepancies in multiple sequence alignments"
HOMEPAGE="http://sourceforge.net/apps/mediawiki/amos/index.php?title=AutoEditor"
-SRC_URI="ftp://ftp.cbcb.umd.edu/pub/software/autoEditor/autoEditor-1.20.tar.gz
- test? ( ftp://ftp.cbcb.umd.edu/pub/software/autoEditor/autoEditor-1.20-sample.tar.gz )"
+SRC_URI="
+ ftp://ftp.cbcb.umd.edu/pub/software/autoEditor/autoEditor-1.20.tar.gz
+ test? ( ftp://ftp.cbcb.umd.edu/pub/software/autoEditor/autoEditor-1.20-sample.tar.gz )"
LICENSE="Artistic"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-DEPEND=">=sci-libs/io_lib-1.8.11
- sys-libs/zlib
- sci-biology/tigr-foundation-libs"
+DEPEND="
+ >=sci-libs/io_lib-1.8.11
+ sci-biology/tigr-foundation-libs
+ sys-libs/zlib"
RDEPEND="${DEPEND}"
S="${WORKDIR}"/autoEditor-1.20
@@ -29,14 +30,6 @@ src_prepare(){
rm -rf TigrFoundation-2.0 || die "Failed to drop TigrFoundation-2.0/"
}
-src_compile(){
- emake || die
-}
-
-src_install(){
- emake install DESTDIR="${D}" || die
-}
-
# TODO:
# * QA Notice: Package has poor programming practices which may compile
# * fine but exhibit random runtime failures.
diff --git a/sci-biology/bamtools/ChangeLog b/sci-biology/bamtools/ChangeLog
new file mode 100644
index 000000000..111c436cf
--- /dev/null
+++ b/sci-biology/bamtools/ChangeLog
@@ -0,0 +1,7 @@
+# ChangeLog for sci-biology/bamtools
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 24 Jun 2011; Justin Lecher <jlec@gentoo.org> bamtools-9999.ebuild:
+ Moved from 'git' to 'git-2'
+
diff --git a/sci-biology/bamtools/Manifest b/sci-biology/bamtools/Manifest
index 2d1817498..0fc975819 100644
--- a/sci-biology/bamtools/Manifest
+++ b/sci-biology/bamtools/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
DIST bamtools-20101215.tar.gz 142100 RMD160 615f64659faaf21d0d83a11e9d0748b5220888be SHA1 1c5d44928434e9e99187035630724205d10bc337 SHA256 3b90c8317207398d94bb7b7cf6470ee8ae8f3b306332c498d1696c80659dce07
EBUILD bamtools-20101215.ebuild 758 RMD160 d0dd72604cfde877a8ce64261a964c2a145a4b15 SHA1 7c0d41b89cf09f0c0a81f7d9ed7a5a3d44ea3837 SHA256 740ee79b8830e455363c5aafb47fe44675000ab119b915107de48f95b4345415
-EBUILD bamtools-9999.ebuild 885 RMD160 ecfefc0a74541f88fa2a331ad6799be05bef80ea SHA1 c1f10f3348ee88c90e278dd6b33c6bebd910303a SHA256 3424284b41b44b8087629335fcb894d89b6d58493410270a65f5f1b6251c7543
-MISC metadata.xml 547 RMD160 1b58f37f70cc5873715f4b77795428f1f393b7ee SHA1 a1900126a5dee33d7c9ed138923ea2f0db28fa9d SHA256 4573902d3d9a0bc60d9e253439e87462cba88e1cf6dd2ac7e1be35242f38b4d8
+EBUILD bamtools-9999.ebuild 887 RMD160 edac08fd4f626ddcd46e70e7e3a33629975526e6 SHA1 2b451d5e08c68ede6b0cea58e32c295e9449ddb1 SHA256 d9c89d10dbe417fc40c60d97ca12059ee562c9a9e0da1c2f453c61478a129d97
+MISC ChangeLog 221 RMD160 68ce47391131977af697c1358c535193098e7f8a SHA1 9f93a33b9fd78f6b33225cdc7bf523f602e9cc45 SHA256 965f3bb7dc9bba900ee96e9a82fc344d9b58743d39f27a9a1ccaf69fe9ec31ad
+MISC metadata.xml 555 RMD160 4562689d2995eb95550c28a48c7d9516b81bb572 SHA1 02ce41839a3b77ac7122a736b2dc71acc9408dc6 SHA256 8a592c3fc8ff1340d59d088fb6b1e5e3184433d6a1546985e09fa14b79869b09
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4ExvcACgkQgAnW8HDreRb9AgCghOuvXFxkcw3fHAPV4PTuTwD/
+UoAAoIlUD9lYLJRJ1QYyHKYPPEGo4bQT
+=3c+9
+-----END PGP SIGNATURE-----
diff --git a/sci-biology/bamtools/bamtools-9999.ebuild b/sci-biology/bamtools/bamtools-9999.ebuild
index 6448e0a00..e23dc3974 100644
--- a/sci-biology/bamtools/bamtools-9999.ebuild
+++ b/sci-biology/bamtools/bamtools-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=3
-inherit cmake-utils git
+inherit cmake-utils git-2
DESCRIPTION="BamTools provides a fast, flexible C++ API for reading and writing BAM files."
HOMEPAGE="http://sourceforge.net/projects/bamtools"
diff --git a/sci-biology/bedtools/ChangeLog b/sci-biology/bedtools/ChangeLog
new file mode 100644
index 000000000..3fd80712f
--- /dev/null
+++ b/sci-biology/bedtools/ChangeLog
@@ -0,0 +1,7 @@
+# ChangeLog for sci-biology/bedtools
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 24 Jun 2011; Justin Lecher <jlec@gentoo.org> bedtools-2.10.1.ebuild:
+ SOme ebuild cleaning
+
diff --git a/sci-biology/bedtools/Manifest b/sci-biology/bedtools/Manifest
index 7f721ba90..e3af7c57a 100644
--- a/sci-biology/bedtools/Manifest
+++ b/sci-biology/bedtools/Manifest
@@ -1,3 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
DIST BEDTools.v2.10.1.tar.gz 904396 RMD160 db6b9f103bff28a04479d243b05de7c8cb38c208 SHA1 67ece0f2747b6886de8ab9642365fa071d0fe32c SHA256 b128ee474827aad2a3bd8808aeaeca484120fc202ac5f1f7b805c21d0be76458
-EBUILD bedtools-2.10.1.ebuild 656 RMD160 618b0fa2740c6da5a3ace6300ce93d5199fe8edc SHA1 61f2299b782ab680895de9f3698142afe038f29f SHA256 b78bf69a0aa265139238ce3689cfdded2b3fd6c35007cbca1201e453c781a07b
-MISC metadata.xml 365 RMD160 97d6bbddf5c26e472d3c6c19ec50c2db87d88dda SHA1 8e10d068960e7e258db3e33397f679dc56bf0545 SHA256 0209b66105b6f3fd1059f6c16366807c71d96fe6021b80cd115adc745192981b
+EBUILD bedtools-2.10.1.ebuild 485 RMD160 039c6cbbceb4154a022fe95635bb00fac8e443fc SHA1 bacae16709812d7687b14a9f07fe6a4f680f38fa SHA256 efb1a05b1f80ac6a04747572380b6fe53827423cfa7c0a4e63f0f1228d4238ad
+MISC ChangeLog 216 RMD160 6779ba4504285979c47f966da1e0141322da629f SHA1 4fc8043870c49461873e220c9768396ea90376a3 SHA256 ebf9a0ba64734c49cad21cadb00c7c5633fc9680211dbf60975b5eb06a3a4907
+MISC metadata.xml 373 RMD160 492d63a640c8667cd2c3e48f9f79916348eaa425 SHA1 57afd5cc95b7a6fd4ed4ecdc8a2dd40f3036d6ba SHA256 9cd28401c75e322432ebbf23f9e9ba4c32154e951171de78c83668a33147e042
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4Ex3AACgkQgAnW8HDreRbomwCgwPWuLzeea794YNTaqD2BSnlJ
+lf0AoJ++a1yEa9u42KNdO7XvDohVFNbo
+=sZl+
+-----END PGP SIGNATURE-----
diff --git a/sci-biology/bedtools/bedtools-2.10.1.ebuild b/sci-biology/bedtools/bedtools-2.10.1.ebuild
index f03a4f761..541b05647 100644
--- a/sci-biology/bedtools/bedtools-2.10.1.ebuild
+++ b/sci-biology/bedtools/bedtools-2.10.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=3
+EAPI=4
-DESCRIPTION="BEDTools for manipulation and analysis of BED, GFF/GTF, VCF, and SAM/BAM file formats"
+DESCRIPTION="Tools for manipulation and analysis of BED, GFF/GTF, VCF, and SAM/BAM file formats"
HOMEPAGE="http://code.google.com/p/bedtools/"
SRC_URI="http://bedtools.googlecode.com/files/BEDTools.v${PV}.tar.gz"
@@ -13,16 +13,8 @@ SLOT="0"
KEYWORDS="~x86 ~amd64"
IUSE=""
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_compile(){
- cd BEDTools-Version-2.10.1 || die
- emake all || die
-}
+S="${WORKDIR}"BEDTools-Version-${PV}
src_install(){
- cd BEDTools-Version-2.10.1 || die
- mv bin/overlap bin/bt_ovelap # prevent file collision with sci-biology/wgs-assembler
- dobin bin/*
+ newbin bin/overlap bt_ovelap
}
diff --git a/sci-biology/caftools/Manifest b/sci-biology/caftools/Manifest
index c832cecf0..82c2f4fcc 100644
--- a/sci-biology/caftools/Manifest
+++ b/sci-biology/caftools/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX Makefile.in-2.0.2.patch 1619 RMD160 a36fc2e878424df24e4a2501769b5959d2997362 SHA1 255d22883c245bbbcb29cf1afaeafc08d067bd8f SHA256 4d24755beabe400afcfcdb987bbe85d117a2098ce6f05879cc813166448569c2
AUX Makefile.in.patch 1633 RMD160 2942a5da7112bfb9f9c6bbd40d26b85d6688265b SHA1 b96e4ebd6b3805c04f7690b240729ca5228dfd3e SHA256 c8bb87d532e664683b41ae0f46a08f9232e1724a574f8a03e658130b0e13d223
DIST caftools-2.0.2.tar.gz 2645554 RMD160 66ebb894e8899e10349742de1bae67a565a35a9c SHA1 071a170d265ddef46ae2f5effa478421e9cce6ff SHA256 7be5eafbd6817a7869f73c7540b5fdfe184b0be28624cc6ca9a01c52a140d4a2
DIST caftools-2.0.tar.gz 2644892 RMD160 29f389d0861f8c60efa137a53816abed5286214a SHA1 9ed7ed3d8be2bcde86aab8a79d4a61408cdc49f2 SHA256 b41f323ceb3fd260d6c2ecff1f285548f40301065cea54687eb96717534eaad9
EBUILD caftools-2.0.2.ebuild 1581 RMD160 bacc32349fcdcb76f6569db199385bd9fb51d6f5 SHA1 c5b411c13045623376779d615e310c4e375c0937 SHA256 3df664db4d5435f9b396fab721ec74cce26d997ced582028dbc662aac8d09b37
EBUILD caftools-2.0.ebuild 1068 RMD160 bdc6a4b5b423bfca1cf310f37db1f36ed5da9660 SHA1 0fde3ae97fda1cf06e2035e45f9cacefffa54c21 SHA256 613629e32ff2b43ca4f6ddc9428212542f1deccf69b868882a94ed20246d9e53
-MISC metadata.xml 531 RMD160 4e24b3b35b7b5399437676b65deb40c1533d7e15 SHA1 c0ac47f9d1d505bc7dddf2dbb5a2ef5e4905643d SHA256 8da1039b073c1c438b5a93089e469c9e35b7dc1297d6ac181e7d81809dee6049
+MISC metadata.xml 539 RMD160 811d93c4d63a12d2534865e7f848b41974c82a43 SHA1 5ddac4a5841b1c2e487f847d37e1a5e2dafa1c8f SHA256 84f5eb9ec596906c56f2e74dd64eba9d46895a45d1178e0b8c3bf7ff19bd8c36
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4Ex5oACgkQgAnW8HDreRbRtgCfaasNnmY98tewV7p1jbGiD0F4
+zXsAoMEJI0ipeTsvrhxZ6PDwE/jEfrLr
+=v2js
+-----END PGP SIGNATURE-----
diff --git a/sci-biology/cap3-bin/Manifest b/sci-biology/cap3-bin/Manifest
index e93a18b35..3148a591a 100644
--- a/sci-biology/cap3-bin/Manifest
+++ b/sci-biology/cap3-bin/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
DIST cap3.linux.i686_xeon64.tar 430080 RMD160 f5a5e6643747b35de14fa2dab3f5b0d6756abc8c SHA1 b1e06785286f3509a8d08cd2e3400e2abb9e7888 SHA256 fd7112a89dd349e0d11820d4bfab34c3556eb570828f71a8db18b68bd6aa1c2c
DIST cap3.linux.tar 409600 RMD160 a3e4fc661ac349791b2c9f1d5982d6b34f502122 SHA1 0de4f5de7fd3a4f6bae9d402f5bcd4937fe15ea2 SHA256 49916f0ac2dc7b6f28fd88e79f98eb097e059839bd9311593ef3fc6f77bc4648
-EBUILD cap3-bin-20071221.ebuild 1463 RMD160 cc06270e4c2e9fc0204296d552eb6f749a92c386 SHA1 ea015dee363244e53a16b771a161476e42ea0397 SHA256 b7adefe5ea1f7e31a9d3f7f420c3aa1bd7e3539bfabb2de884d562b3433c32a0
-MISC metadata.xml 391 RMD160 1af9555e8977c2e8b9bb8ba330498a8e5d050907 SHA1 0068e6453a108df09f7adb2875f61fec6c73140b SHA256 019499f4ccf9bcdf115a3ffff6af37bdf9a14ae2613d087f73149dfdc6eebdda
+EBUILD cap3-bin-20071221.ebuild 1479 RMD160 2c2726cbb00ad6596b4c2b44824e342256bf5ecf SHA1 a1f5a59778f37c78b4c2819f89edff08c727fa1f SHA256 1268644cbc1d0ee100906fecb4debbc11b239c6c5ba40503e12f35f1ab938fef
+MISC metadata.xml 399 RMD160 b4d8b61da12d50650bc9a7240664b2ccb11b4c3b SHA1 33c15e90cea2a4d530c4a4bc998bbad10f850edf SHA256 169911bbc957ca5de82f7f818e746c917a9698ade71b03d99e60a5912620c226
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4Ey3IACgkQgAnW8HDreRZdKQCfcQFotsJkMbnzcnXjXdgeVlXy
+XTUAoMigo6CG32wshx1VhQ/SgvaRIsr1
+=unOA
+-----END PGP SIGNATURE-----
diff --git a/sci-biology/cap3-bin/cap3-bin-20071221.ebuild b/sci-biology/cap3-bin/cap3-bin-20071221.ebuild
index fadedf7a9..cc6f5e30e 100644
--- a/sci-biology/cap3-bin/cap3-bin-20071221.ebuild
+++ b/sci-biology/cap3-bin/cap3-bin-20071221.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=3
+EAPI=4
DESCRIPTION="CAP3 is for small-scale assembly of EST sequences with or without quality value"
HOMEPAGE="http://seq.cs.iastate.edu"
@@ -18,25 +18,27 @@ HOMEPAGE="http://seq.cs.iastate.edu"
# http://seq.cs.iastate.edu/pub/CAP3/cap3.linux.itanium.tar
# http://seq.cs.iastate.edu/pub/CAP3/cap3.linux.powerpc32.tar
# http://seq.cs.iastate.edu/pub/CAP3/cap3.linux.powerpc64.tar
-SRC_URI="x86? ( http://seq.cs.iastate.edu/CAP3/cap3.linux.tar )
- amd64? ( http://seq.cs.iastate.edu/CAP3/cap3.linux.i686_xeon64.tar )"
+SRC_URI="
+ x86? ( http://seq.cs.iastate.edu/CAP3/cap3.linux.tar )
+ amd64? ( http://seq.cs.iastate.edu/CAP3/cap3.linux.i686_xeon64.tar )"
LICENSE="Artistic"
SLOT="0"
KEYWORDS="~x86 ~amd64"
IUSE=""
-DEPEND=""
-RDEPEND="${DEPEND}"
+S="${WORKDIR}/CAP3"
src_install() {
- cd "${WORKDIR}/CAP3" || die
- dobin cap3 formcon || die
- dodoc README || die
- newdoc doc cap3.txt || die
+ exeinto /opt/${PN}
+ doexe cap3 formcon
+ dosym ../${PN}/cap3 /opt/bin/cap3
+ dosym ../${PN}/formcon /opt/bin/formcon
+ dodoc README
+ newdoc doc cap3.txt
# other examples
# http://seq.cs.iastate.edu/pub/CAP3/data.tar
- dodir /usr/share/cap3/examples || die
- insinto /usr/share/cap3 || die
- doins -r example || die
+ dodir /usr/share/cap3/examples
+ insinto /usr/share/cap3
+ doins -r example
}
diff --git a/sci-biology/clover/Manifest b/sci-biology/clover/Manifest
index 74679997b..d19acf301 100644
--- a/sci-biology/clover/Manifest
+++ b/sci-biology/clover/Manifest
@@ -1,45 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-- -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
DIST clover-2010-02-19.tar.gz 15641 RMD160 aeeefc128976ce299e5ad65129cc0891104f0348 SHA1 ad30ac6440c6abfe53876ccc94149eec34e16b2f SHA256 f6de99b9ce5676af8b4179e12c4701f81f0b17ac5dadacfe7affa38ad2a585f5
DIST jaspar2005core 14913 RMD160 6fe43472cc1a2e0389ad9290801db56488773d3e SHA1 be8cdff62cf35f430c0c17f53564529b08000c9c SHA256 498a560c67411789106b50ccdfd9bc41f571d77c2fe9bfba7e95128c0a122fe4
-EBUILD clover-2010.02.19.ebuild 1068 RMD160 ee85f019c8e3914d41e7a902f1afd1b250c22b7f SHA1 056c74812ac0ee941c6975c706ad3e94c177a8ad SHA256 d13347e138e155e7d12588dfd15457510d2d8caecdf5f7bb26c82408572467f1
+EBUILD clover-2010.02.19.ebuild 1068 RMD160 33df8e6f80650fc17ce9d0fbda7d9ec318dfef7c SHA1 9763b5036cfc7feeeee887148cf962bf0404017c SHA256 514616a014b196e736d8f4b2f0f5b6df78ed4ab51498e92e05fa7d578f8420ce
MISC ChangeLog 670 RMD160 76fec21f730ded591f166b128cee5ad87730e387 SHA1 45db195b3b23a9f0da9dc81a33a8f23303770faa SHA256 446dad253d4a186f03678f0aef1d9b6f0c683bb7390814c1c7b27ed7c829a2f4
-MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
-- -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iQIcBAEBAgAGBQJMcsvnAAoJENwGBM22xffeL5sP/jDmo45oY5thDk+pt3owS+GP
-jX5BnheYpo1yRarTGbkYHflROiV5tuXMv/lKj6WFft/OlVIZfVyx0lpcie+OAppQ
-b3c3MOUOWRTQz4MYBZ/HbagJ3ArVWHfw3BArSI24lcsGfeMTxQt0E2TyCNNOnmO3
-HAR+KxaKKjdz3lKWPg1fVqbDYt+T6fhWtG8BcTONAzB72y78qYG7twKiO52AcWSp
-sEGyK7RlPqduJmeX2yyzJQcQRnI1kq7/FjVuzcw470BXQe4S1MGlPvKim8QLyoti
-1jh2Vt9hiSb4NLmothqEFs4dUwXOrclPzia1DfNJynCBFrhj3h/Qk4f+rIHLtp3I
-IhiRLHEawZzJNdeUfMwDCY6IuwWi7H9gLpVeJSiYIN47baCuUVjQDZ0NTa0/wuHU
-9IGyjn2XZGGzs9r/dJu3MVN8FJz/V+lmXKJQ/QPVJIjLosFM7yJBaeaPHKrAFlnV
-u6rRkDzIgyoqLxdSUdMHxIDSgKoI5NvnA02dnCK/I2ANM/18ku1UoyKK1N8LJcTD
-n8bAU4rWCt7+w+D1ltHeDvOa8eALT1aGGbqzJeAgtOZxp3USWwWj0wDG4vPb/SeO
-VTaNV1OprAZ8eC3uV806RaXRXHAqvBkcyBJdle38RQOuBw4bJ3PkXQv3JON/WcSI
-rZgPMzMkbwCkKnq9Ppro
-=7fhm
-- -----END PGP SIGNATURE-----
+MISC metadata.xml 225 RMD160 281076a863af4791e194c7c0b39ccd572e95d0f2 SHA1 62bd67899a22705ac2475b479d5b31a331cb26bf SHA256 fd7f5bfdfd9dce3dd874edd9ff9fd12dcd83aba1c73b0c62399e8aba52e435fc
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBAgAGBQJMcswRAAoJENwGBM22xffei/0P/14eh/3mDWL54PJMGPc38Wnv
-nl7rJDdeZJf2LdjhgRGS7a1VoP34Jmg+TFwA1LHNhqEcuxQV7z4oQGi/HLHYI5i9
-64r1+agm+RIk9+VhGgf/r22y5v6ZwqzBN+SxC29mHvSJuwbjw+jHvJdqzhKSDkvd
-caiFdE1oYwhGQ1qXiBrElTZkfprpaNwjwYRSOkyefj5P+FV7PFK3tzVsTq7m79Ab
-pNHyIc9zTYI2YhyQ9v3jFJhGJsDb9JqoEwqYHLtPda+b7/ekpv4frLBgNSajKJeu
-lHR6eVS4tA0WcCVnUHjCPAOJisCtOLQcao1c5ViftpvfofNs+BHtvmlBm7moPCvv
-sAB8JVbzBIZ4rcFwy/7mjYe7MZ1MsmiLZR2D3X71K0LmRp5UgjjaJjczTUQ0Fqtg
-9WbJOiDR7IPfxjhmfAZK4aeSnXD+rVjZ+MPOGRUuD2zplj9NuQK3PTgndCdI1Yo8
-jGSTkRNa5Civ4c2FEQW4UlCrKB+u35+ocyZsPniFkdP0hlN66eHfsOxIE562qaFU
-GkSvN4HWiW5yS4fdEcGh8EM/ojUnRQN/2T9flkA+JHdhAy/+6+ilVv10pVlJ0Ala
-af+rxjDbkPaeo+8kBYQvhSChVv84gQOBj72KSziBTmSgDWYXs4BFXPj3Pmx7Bwcr
-+MSjiUj5Bhc185SjfZOA
-=T+d9
+iEYEARECAAYFAk4Eh/gACgkQgAnW8HDreRY8tACgzJ1dGICxmztGGCVYJ05z+hba
+QMEAoKTiqkCsI+B26uZICnG+Z4Vy9jla
+=PGkq
-----END PGP SIGNATURE-----
diff --git a/sci-biology/clover/clover-2010.02.19.ebuild b/sci-biology/clover/clover-2010.02.19.ebuild
index f14b70a16..239cc30e4 100644
--- a/sci-biology/clover/clover-2010.02.19.ebuild
+++ b/sci-biology/clover/clover-2010.02.19.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-inherit versionator toolchain-funcs
+inherit toolchain-funcs versionator
MY_PV=$(replace_all_version_separators '-')
diff --git a/sci-biology/clover/metadata.xml b/sci-biology/clover/metadata.xml
index 7e3286984..9e64bf890 100644
--- a/sci-biology/clover/metadata.xml
+++ b/sci-biology/clover/metadata.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>maintainer-wanted</herd>
+<herd>sci</herd>
+<maintainer><email>maintainer-wanted@gentoo.org</email></maintainer>
</pkgmetadata>
diff --git a/sci-biology/codonw/Manifest b/sci-biology/codonw/Manifest
index eb2e90af1..5802e4d51 100644
--- a/sci-biology/codonw/Manifest
+++ b/sci-biology/codonw/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
DIST CodonWSourceCode_1_4_4.tar.gz 161908 RMD160 9e01d48525e5308e8719f89276a12a3909d64a09 SHA1 a440d1ebdca328ed1f5efa7342267b7a2e764b3b SHA256 951e2a686f7849e0fa225b83b09842d4cf822ecafd67bff0438fc815512183b8
-EBUILD codonw-1.4.4-r1.ebuild 928 RMD160 06354dac3504df4e4feccf6cf6261a0c1c8a6dfa SHA1 acd84fdeef62f055a8cdf6a033edfe7f883d8f10 SHA256 c99157862f6ee0a30e0c62888ac9d9d5977eee9e12cdd4fd650801eac9824e38
+EBUILD codonw-1.4.4-r1.ebuild 928 RMD160 c8c1a14377188542889d6ede54538223ee865223 SHA1 d98279ddd25dba4cb8c1c7d55ef492e0c5bf7270 SHA256 382bd0ffef52b148657497df54f58be47081dc2165478dc9180711a14e39f295
MISC ChangeLog 435 RMD160 be5677fe4fe3cce0464834389b5c02e1dfb06ff5 SHA1 6318f550aa8e0f901ac5f3b57a52e2f404aeba0b SHA256 9d4201e4ff6acccc66c516e3a970b415a4820f167010fa8fd3dc11c5217847ce
MISC metadata.xml 259 RMD160 d9d81b67d635fabd81aef8ae0edf971211ae9072 SHA1 8e32f751c67ff891fa35405a2cf6fb33752d6eb1 SHA256 541c3fbcf299d9a8ccf4132ee61f9e53a5d737cefdaa6fdc77764d8d4c7f3110
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4Eh/0ACgkQgAnW8HDreRb2gwCdEWq45ZAa7F0/PYnbNYE0DWSQ
+t18AoLHX5NDr2XRfGcckk5HnSCY1JMPu
+=+KUN
+-----END PGP SIGNATURE-----
diff --git a/sci-biology/codonw/codonw-1.4.4-r1.ebuild b/sci-biology/codonw/codonw-1.4.4-r1.ebuild
index 3563ddfab..05ed6ea14 100644
--- a/sci-biology/codonw/codonw-1.4.4-r1.ebuild
+++ b/sci-biology/codonw/codonw-1.4.4-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=2
-inherit versionator toolchain-funcs
+inherit toolchain-funcs versionator
MY_PV=$(replace_all_version_separators '_')
diff --git a/sci-biology/consed/Manifest b/sci-biology/consed/Manifest
index 73cf624e3..73899c6a7 100644
--- a/sci-biology/consed/Manifest
+++ b/sci-biology/consed/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX nLine.h.patch 237 RMD160 2fa26b40e186f5a5a840a244386484be17350edc SHA1 a842928142ca4228c8a94b1f7daca37ed77cc301 SHA256 376f61dbbd142b6927c2f0b1984d03499ad1e7ffc70b646bad46c5fe006e0350
AUX nextPhredPipeline.cpp.patch 439 RMD160 747bc2e640d04525e9e085e4aa33bc45ad1c3eb5 SHA1 5d658507a91af26fe4477608aeaf6db87bd6bc27 SHA256 3ac55169665cc74507ea5f405a67d43a37a3d2733d74b877f732674c4e2e8e82
DIST consed-20-linux.tar.gz 31407408 RMD160 8ab84f5216bb433884c75806738a6f7f20dea915 SHA1 9ccf1a2db890e30f042188d20e52098e1e37987a SHA256 ebde602163743d018ac8bf49f04ff0afbd0cccb3b7ef065a154943a68e95ad27
DIST consed-20-sources.tar.gz 7418118 RMD160 2dafda72027ecefd20333bddcec0b3e24d102412 SHA1 a222ef3a34c4940eabc8e0250ae88a86c5ee27b5 SHA256 8d12191e08d9dfc73c3284a057b7fd80d1aefe4a60d11a0de1db6ba9ce9ba4b7
-EBUILD consed-20-r1.ebuild 2495 RMD160 2a1832e72bbea1b782cbcea2cc98053dc3fbcbc6 SHA1 81dd87503c95c853464f6ce4100e8f8d3f499136 SHA256 7a84e27608e40ff07e49c488ab7d9754d30ff376541617ca5a529010708e9ad1
+EBUILD consed-20-r1.ebuild 2495 RMD160 41aca137feda9859a997dc2c8adc04790231bd76 SHA1 37228fa4128d4f091384d821f63001df368c275e SHA256 f7831b85683c057afbd48d7830147aca7c2f6d8e03485477948e3b323a9686ec
MISC metadata.xml 259 RMD160 d9d81b67d635fabd81aef8ae0edf971211ae9072 SHA1 8e32f751c67ff891fa35405a2cf6fb33752d6eb1 SHA256 541c3fbcf299d9a8ccf4132ee61f9e53a5d737cefdaa6fdc77764d8d4c7f3110
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4EiAIACgkQgAnW8HDreRYZQgCcDET079yuAcbfOjok/M99Uvzw
+Sk0AnRGjhAhntG3bxr5+HuCAWTJZ8h44
+=X0Ic
+-----END PGP SIGNATURE-----
diff --git a/sci-biology/consed/consed-20-r1.ebuild b/sci-biology/consed/consed-20-r1.ebuild
index 5c65e660b..0ddce15bc 100644
--- a/sci-biology/consed/consed-20-r1.ebuild
+++ b/sci-biology/consed/consed-20-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=3
-inherit toolchain-funcs eutils
+inherit eutils toolchain-funcs
DESCRIPTION="A genome sequence finishing program"
HOMEPAGE="http://bozeman.mbt.washington.edu/consed/consed.html"
diff --git a/sci-biology/dawg/ChangeLog b/sci-biology/dawg/ChangeLog
index ff3e5fed1..ad8b3b952 100644
--- a/sci-biology/dawg/ChangeLog
+++ b/sci-biology/dawg/ChangeLog
@@ -1,7 +1,10 @@
# ChangeLog for sci-biology/dawg
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 25 Jun 2011; Justin Lecher <jlec@gentoo.org> metadata.xml:
+ Fixed herd entry in metadata.xml
+
24 Jun 2008; weaver <weaver@gentoo.org> +files/dawg-1.1.1-gcc43.patch,
+dawg-1.1.1.ebuild:
New package
diff --git a/sci-biology/dawg/Manifest b/sci-biology/dawg/Manifest
index bac910e38..7c2b7c109 100644
--- a/sci-biology/dawg/Manifest
+++ b/sci-biology/dawg/Manifest
@@ -1,5 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX dawg-1.1.1-gcc43.patch 251 RMD160 432f37ab9d976958161cc05c8176aefca2d34047 SHA1 aa560bc5086e8ef17437d23d091be46044080f63 SHA256 85ac21adb231fa971d11597dc9e5f3725a7900889841e6665119ac1bf807722d
DIST dawg-1.1.1-release.tar.gz 213877 RMD160 d2be74cf13c5aecb30cc08f4404d954f6f4272c8 SHA1 fe2942ab9d73d22fd02a8dd06bd8874b7470d487 SHA256 dd621d7913fc1511b52ed2bdc5856e1e591464ddf8ee5c2e7eaa45ac81705286
EBUILD dawg-1.1.1.ebuild 607 RMD160 7832fc450b66ec3763bca33070ef6f6573f813c5 SHA1 c2b987a3e3c2a001eedf4fe01a265aaacc30a087 SHA256 33421468781252e7fff1a238b0ca30c7e2be9c433985e70986e82c5597866333
-MISC ChangeLog 227 RMD160 56af05e22cc08ee72a7bd7e75ab928b3c9e07e6a SHA1 83e5a13bbdd76547150cf934ae0ef2a043d18767 SHA256 3ae2b976f9eca9d456a198f01294bb489a03096c49021212216798be97b5cfd9
-MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
+MISC ChangeLog 324 RMD160 fa6ced37eca55f0a9b6a3009df761e83e59938e0 SHA1 d4f71cc8ba5e0f9944d181fc3d94e73f49e17f77 SHA256 7632e828e8ff7464d35516a70ee32cdb99e6f2d8956c88dfdb1565ce37b09ff6
+MISC metadata.xml 158 RMD160 9b441c987a00c5a66c06850c0d587a2abd70893c SHA1 7a8997eb2fc55fda167d3e95cdffb43c8f817fdf SHA256 dae7918daac89b300804812d32584889aa1c4e8b9edeced06006900494457a6d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4FkaIACgkQgAnW8HDreRacngCcCzOtR+z/0GLQ5EFv4EnHQT2r
+gbIAoKQnApG+KCVRKqKuAig2S0IuvX3o
+=fw2v
+-----END PGP SIGNATURE-----
diff --git a/sci-biology/dawg/metadata.xml b/sci-biology/dawg/metadata.xml
index 7e3286984..897aa2e6b 100644
--- a/sci-biology/dawg/metadata.xml
+++ b/sci-biology/dawg/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>maintainer-wanted</herd>
+ <herd>sci</herd>
</pkgmetadata>
diff --git a/sci-biology/embassy-cbstools/ChangeLog b/sci-biology/embassy-cbstools/ChangeLog
index f4ed9e2c6..5588b77aa 100644
--- a/sci-biology/embassy-cbstools/ChangeLog
+++ b/sci-biology/embassy-cbstools/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-cbstools/ChangeLog,v 1.5 2010/01/15 22:44:35 fauli Exp $
+ 25 Jun 2011; Justin Lecher <jlec@gentoo.org>
+ embassy-cbstools-1.0.0-r2.ebuild:
+ Dropped ~ppc due to missing keywording of sci-libs/plplot, #358035
+
19 Mar 2011; Justin Lecher <jlec@gentoo.org>
embassy-cbstools-1.0.0-r2.ebuild, files/embassy-cbstools-1.0.0-r2.patch:
Fixed for reviewed eclass
diff --git a/sci-biology/embassy-cbstools/Manifest b/sci-biology/embassy-cbstools/Manifest
index 4bd6e4a83..095dd6797 100644
--- a/sci-biology/embassy-cbstools/Manifest
+++ b/sci-biology/embassy-cbstools/Manifest
@@ -1,15 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
AUX embassy-cbstools-1.0.0-r2.patch 9656 RMD160 152ea616559e1d8377267ae6e5d8035e525e6e19 SHA1 8974cde7df8b76c99551760a93bd007211993986 SHA256 79a0b8fb574fe2d55bbcd8fca7ef2822c3c7e1e573565996c3656645f3b41845
DIST embassy-cbstools-1.0.0.tar.gz 389856 RMD160 019d278d482c621c1cecf75dac99493168a5de65 SHA1 c16abdf8c3d5b8a4e31fdcd20a556f35bdd671c6 SHA256 fd1c6a5f588d548791c98d2c31841705ac6971163a7f95345542932960080b5e
-EBUILD embassy-cbstools-1.0.0-r2.ebuild 383 RMD160 dd1457128ca42fb18d433650407f1debe4db1c48 SHA1 2a17d9167f913f6c53c8e5516a7ecba656ff749d SHA256 ed41ac5a77816c74b339ce80d3cea9a8edea0489a81aadc95925f5c3d188ff36
-MISC ChangeLog 1522 RMD160 9f1b5c8d47838c8764bf60677f0ce1e790192307 SHA1 bece2c6805129a8d404aad819da50c0749bf8fec SHA256 18976a4da34e830371ca4740038094e538e6b6401f5042c6c195ee9df871bb2f
+EBUILD embassy-cbstools-1.0.0-r2.ebuild 378 RMD160 279ff65e206230320b07b33d1cefe89341f2c152 SHA1 1dcee934c0e4b6009f0fba68622f7d3221808298 SHA256 a210592d8effa9a3c87000434bb7c083a2a697d5439b169bc9141464510504b5
+MISC ChangeLog 1675 RMD160 27a45eefb1bf4e2be1de18428b6dceb184ee5c01 SHA1 d214a352d09171307ca3dffdcf1f0e229e7daff2 SHA256 7d7467dc1a93ef7f0093ab1c988b47f7ddc720c344776783fe7b3dc9a463ecc0
MISC metadata.xml 165 RMD160 b247a16b6552b292d1249ff4e8ea5060ad2c4372 SHA1 a9f91a3a303f4c85430e21eca09913e1c9426366 SHA256 560c375768c8e164d954d61924f110da785b4771012cb830963eaa267a319132
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk2EopUACgkQgAnW8HDreRYUtwCdFuOfcGcCw2mPkyk8q6w+PwiV
-en8An2GIRROpmUwVBJKfBU7WYMPAKHo8
-=K1MY
+iEYEAREIAAYFAk4GAa4ACgkQgAnW8HDreRaMxwCeLAXLPbDyAloWfdMalhLVUIaa
+Lv0AoIyXED7qXOduh+ylvlzKOZNzty+m
+=gIH2
-----END PGP SIGNATURE-----
diff --git a/sci-biology/embassy-cbstools/embassy-cbstools-1.0.0-r2.ebuild b/sci-biology/embassy-cbstools/embassy-cbstools-1.0.0-r2.ebuild
index 4642b30c7..78c619eab 100644
--- a/sci-biology/embassy-cbstools/embassy-cbstools-1.0.0-r2.ebuild
+++ b/sci-biology/embassy-cbstools/embassy-cbstools-1.0.0-r2.ebuild
@@ -8,4 +8,4 @@ EBO_DESCRIPTION="applications from the CBS group"
inherit emboss
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
diff --git a/sci-biology/embassy-domainatrix/ChangeLog b/sci-biology/embassy-domainatrix/ChangeLog
index 819cf4f6b..9377854f3 100644
--- a/sci-biology/embassy-domainatrix/ChangeLog
+++ b/sci-biology/embassy-domainatrix/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-domainatrix/ChangeLog,v 1.29 2010/01/01 21:48:13 fauli Exp $
+ 25 Jun 2011; Justin Lecher <jlec@gentoo.org>
+ embassy-domainatrix-0.1.0-r5.ebuild:
+ Dropped ~ppc due to missing keywording of sci-libs/plplot, #358035
+
19 Mar 2011; Justin Lecher <jlec@gentoo.org>
embassy-domainatrix-0.1.0-r5.ebuild,
files/embassy-domainatrix-0.1.0-r5.patch:
diff --git a/sci-biology/embassy-domainatrix/Manifest b/sci-biology/embassy-domainatrix/Manifest
index c29621bf6..a93e8fe43 100644
--- a/sci-biology/embassy-domainatrix/Manifest
+++ b/sci-biology/embassy-domainatrix/Manifest
@@ -1,15 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
AUX embassy-domainatrix-0.1.0-r5.patch 9588 RMD160 51633db082a16f45274fb96371e6a384ce3a2fcf SHA1 afc886fc9f34cb71a66f2f09f3dd5b3ed3a448dc SHA256 818d81968350bae8d0492e4103ef7d4f41dd651321735c5d5dc04f4b35bfb8c4
DIST embassy-domainatrix-0.1.0.tar.gz 426218 RMD160 da6136665c4e951a6ca93362692fc299be2c05d2 SHA1 b7c9d14203fb1e9fff2fb7608c8edf87a346c133 SHA256 f6afe128cfb42dac7e734e979910d3bc7dd879ad1a677012f12f33572bd70989
-EBUILD embassy-domainatrix-0.1.0-r5.ebuild 383 RMD160 bc0f0c1b39241e06bd6a95d2859b0d2d4845bba3 SHA1 cbb23311c6b95338a5f9729e1ce4491406d19c62 SHA256 0ea008c9157a53bd78955754df81048975f887d1b06fac2b3e8c651046c68d06
-MISC ChangeLog 5357 RMD160 bc43bd64d16b91290adefb005d01ede07fd679fa SHA1 8ff260f7a1c872f443de4c2891d178875883a08a SHA256 6c12cccf3481e054a7aa36b84c96286c13ad236ba560481a3bf3a032eafaf691
+EBUILD embassy-domainatrix-0.1.0-r5.ebuild 378 RMD160 d8868e7626926173256b56b2fb638d454866b3e8 SHA1 b0a505534e84fd6c80b5b421987b577d71b7fbff SHA256 d01a3257f3af0d6b4fb47585634e3a188d7b7fe19f43c240e9c04f2c122a9895
+MISC ChangeLog 5513 RMD160 31a6d5ce03f35c9710701a5db981355b2c14e69f SHA1 2af219fff22fa4a1dd718adc4da9dd99335ce936 SHA256 af41911a9f76481c9b90f39bc24f3d4ca81a8893dde7093268a83944aacc66ed
MISC metadata.xml 165 RMD160 b247a16b6552b292d1249ff4e8ea5060ad2c4372 SHA1 a9f91a3a303f4c85430e21eca09913e1c9426366 SHA256 560c375768c8e164d954d61924f110da785b4771012cb830963eaa267a319132
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk2EpJYACgkQgAnW8HDreRapUwCdHO/9eJaP+C+s1nkSG/k/Izsb
-MS8AoIOouBCvYaN7202LceJGUXF2QP+P
-=6j4K
+iEYEAREIAAYFAk4GAcUACgkQgAnW8HDreRYImACgwoi57Dmd7C/3RU95IhaMwIYe
+eAMAn00tr+YqkE7Ra8IluzEMxzuxo/6W
+=15FX
-----END PGP SIGNATURE-----
diff --git a/sci-biology/embassy-domainatrix/embassy-domainatrix-0.1.0-r5.ebuild b/sci-biology/embassy-domainatrix/embassy-domainatrix-0.1.0-r5.ebuild
index 9ba3995ed..8892a8061 100644
--- a/sci-biology/embassy-domainatrix/embassy-domainatrix-0.1.0-r5.ebuild
+++ b/sci-biology/embassy-domainatrix/embassy-domainatrix-0.1.0-r5.ebuild
@@ -8,4 +8,4 @@ EBO_DESCRIPTION="Protein domain analysis add-on package"
inherit emboss
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos"
diff --git a/sci-biology/embassy-domalign/ChangeLog b/sci-biology/embassy-domalign/ChangeLog
index 5d5d4cdba..171f1a209 100644
--- a/sci-biology/embassy-domalign/ChangeLog
+++ b/sci-biology/embassy-domalign/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-domalign/ChangeLog,v 1.20 2010/01/01 21:51:36 fauli Exp $
+ 25 Jun 2011; Justin Lecher <jlec@gentoo.org>
+ embassy-domalign-0.1.0-r5.ebuild:
+ Dropped ~ppc due to missing keywording of sci-libs/plplot, #358035
+
19 Mar 2011; Justin Lecher <jlec@gentoo.org>
embassy-domalign-0.1.0-r5.ebuild, files/embassy-domalign-0.1.0-r5.patch:
Fixed for reviewed eclass
diff --git a/sci-biology/embassy-domalign/Manifest b/sci-biology/embassy-domalign/Manifest
index a4bbcaedf..10e364c4b 100644
--- a/sci-biology/embassy-domalign/Manifest
+++ b/sci-biology/embassy-domalign/Manifest
@@ -1,15 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
AUX embassy-domalign-0.1.0-r5.patch 9586 RMD160 60830ec72285bdafd6e36a3667bf9c8f38aa4796 SHA1 89516869d482d4a3540bcca8fda28da063478b0a SHA256 551e01c1c91596e9f8454e6a53015edca265d0d22eec3ec6e675c6e49eeb2b87
DIST embassy-domalign-0.1.0.tar.gz 441025 RMD160 ba356997be2baa4c526740f52f65d4bc016461ca SHA1 5260a40297f43633e68e1577325275b0a196c60a SHA256 345db267970cb9a8c9c41f53a5063185d36d13bf61dcc8941569d9bb2d18c567
-EBUILD embassy-domalign-0.1.0-r5.ebuild 378 RMD160 d295d835790077174b267bcd375ea18558704e94 SHA1 624c3144ed9ac1020e2ddd793431a26a9d707d7f SHA256 9d53dc57f4025cd13a56ad835bd48efaa5f36af6392454b83723ecd8ff05b684
-MISC ChangeLog 3495 RMD160 69c9e2bf25d7510826059ea6eb02e411259940ec SHA1 d8c9eff4cf959d5e15806ae97bffb5d83dee4868 SHA256 1451fbc4949551cbaae77e1170b64ac12ad34227c94a4a777b794b056c60d72a
+EBUILD embassy-domalign-0.1.0-r5.ebuild 373 RMD160 5c7e9a075f2b32e7c7ccdec112354742dcfa7a4b SHA1 43eafab9510280266add0d43cced378049c697dc SHA256 e44e64c7c79ba070270d9237a7a2d39d854e2d248c4fd7ab5486bbd319523518
+MISC ChangeLog 3648 RMD160 0aff0ada60e9ed7285f83ab5707f417bb890abef SHA1 13492eae0cbac60e10675c866fe0acc663a0e76c SHA256 3e704961800746684e8c2407b04a7155ad79523850ff0030ea86e47cb4d94b6e
MISC metadata.xml 165 RMD160 b247a16b6552b292d1249ff4e8ea5060ad2c4372 SHA1 a9f91a3a303f4c85430e21eca09913e1c9426366 SHA256 560c375768c8e164d954d61924f110da785b4771012cb830963eaa267a319132
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk2Ep5gACgkQgAnW8HDreRY9/wCgyI/ZyvRYyUmTG/brxelHWhRM
-FwUAoJE4IT9Yxj8XTgKYZ5RhIekpoRPT
-=3Dze
+iEYEAREIAAYFAk4GAdgACgkQgAnW8HDreRafSwCfSiAnnJawmlZ2G25XOHQzl0ZF
+ThAAnjsXPG3PeC6qzPWdorU18vwM2IkC
+=UGgf
-----END PGP SIGNATURE-----
diff --git a/sci-biology/embassy-domalign/embassy-domalign-0.1.0-r5.ebuild b/sci-biology/embassy-domalign/embassy-domalign-0.1.0-r5.ebuild
index b1d116394..4751d1fd8 100644
--- a/sci-biology/embassy-domalign/embassy-domalign-0.1.0-r5.ebuild
+++ b/sci-biology/embassy-domalign/embassy-domalign-0.1.0-r5.ebuild
@@ -8,4 +8,4 @@ EBO_DESCRIPTION="Protein domain alignment add-on package"
inherit emboss
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos"
diff --git a/sci-biology/embassy-domsearch/ChangeLog b/sci-biology/embassy-domsearch/ChangeLog
index 5a4cb2995..e206e653e 100644
--- a/sci-biology/embassy-domsearch/ChangeLog
+++ b/sci-biology/embassy-domsearch/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-domsearch/ChangeLog,v 1.19 2010/01/01 21:53:24 fauli Exp $
+ 25 Jun 2011; Justin Lecher <jlec@gentoo.org>
+ embassy-domsearch-0.1.0-r5.ebuild:
+ Dropped ~ppc due to missing keywording of sci-libs/plplot, #358035
+
19 Mar 2011; Justin Lecher <jlec@gentoo.org>
embassy-domsearch-0.1.0-r5.ebuild, files/embassy-domsearch-0.1.0-r5.patch:
Fixed for reviewed eclass
diff --git a/sci-biology/embassy-domsearch/Manifest b/sci-biology/embassy-domsearch/Manifest
index 149bc5139..2fa7e0c50 100644
--- a/sci-biology/embassy-domsearch/Manifest
+++ b/sci-biology/embassy-domsearch/Manifest
@@ -1,15 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
AUX embassy-domsearch-0.1.0-r5.patch 9557 RMD160 b4af6f43b44fd408e867034309c21a1fd847b3f4 SHA1 e4a20f94557dcda2ef3533e60c7c4b7b2e1c97df SHA256 4c69c017bc435c3aaedee62238d643d93c749344f1a0c6d3776ff890cb3c0afe
DIST embassy-domsearch-0.1.0.tar.gz 452787 RMD160 3a3b58bd700e1b4cb4ddf78ca944f9fff12262df SHA1 2f85959b2fe7314372d23b5f993af2a174a85997 SHA256 8f64eae467246389306196847f3428e848628a0b6e051d54bcf4659595f4aa75
-EBUILD embassy-domsearch-0.1.0-r5.ebuild 377 RMD160 28a9f1b73e72d6c6a9e92586bb070af2b04c5e10 SHA1 b090777e23aa2121dc339581fa6cd6ac7f2c1433 SHA256 d4c09ce57950316c31825f4bdb0a4d27192bbe74cd11ab2e14f3e57019a7c60d
-MISC ChangeLog 3432 RMD160 a279f1c1029b4993c8834d34930576c61848a3a2 SHA1 a4aba7565e390d5508c94b30c9360522fcbc7cc7 SHA256 943be6cb1a1dd33a7b16ccf736e4013c73299c04530dc2287235f980d8517ff0
+EBUILD embassy-domsearch-0.1.0-r5.ebuild 372 RMD160 32b82d2df1c34e131172251b985b6dd455d51951 SHA1 1e1ec3fa74cf64b65ad0e29fbe0ba9690c4e7f56 SHA256 0cb78f65aa00dd4a6160647b4c662e83b2fa8c5916b1ddd99f2b6b492fbcfcc1
+MISC ChangeLog 3586 RMD160 c19f6c3613d5b6b62538370346f4fadb48ae9b19 SHA1 27e8ba66d9601062b45ee52412332546c2ebe9ad SHA256 55035e184a7bacaf580222538854d055e58b3885664b56e876c926573197ad32
MISC metadata.xml 165 RMD160 b247a16b6552b292d1249ff4e8ea5060ad2c4372 SHA1 a9f91a3a303f4c85430e21eca09913e1c9426366 SHA256 560c375768c8e164d954d61924f110da785b4771012cb830963eaa267a319132
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk2FBfgACgkQgAnW8HDreRYKMwCfcj7s7+X9tk/vW9BydpnDyM27
-Hb8AnRLbC9ouyjwoTMeaOeN5ru6BJfLk
-=Tx4K
+iEYEAREIAAYFAk4GAh0ACgkQgAnW8HDreRb/1ACfUmPO6RawkId8RnI8aKqeGmr9
+huwAn2pionTN7GsFtH7XUJGUm388DkMq
+=z4Ki
-----END PGP SIGNATURE-----
diff --git a/sci-biology/embassy-domsearch/embassy-domsearch-0.1.0-r5.ebuild b/sci-biology/embassy-domsearch/embassy-domsearch-0.1.0-r5.ebuild
index 3deb535d7..56e828ce5 100644
--- a/sci-biology/embassy-domsearch/embassy-domsearch-0.1.0-r5.ebuild
+++ b/sci-biology/embassy-domsearch/embassy-domsearch-0.1.0-r5.ebuild
@@ -8,4 +8,4 @@ EBO_DESCRIPTION="Protein domain search add-on package"
inherit emboss
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos"
diff --git a/sci-biology/embassy-emnu/ChangeLog b/sci-biology/embassy-emnu/ChangeLog
index 6334ae1bc..94f00fd9f 100644
--- a/sci-biology/embassy-emnu/ChangeLog
+++ b/sci-biology/embassy-emnu/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-emnu/ChangeLog,v 1.29 2010/01/01 21:55:20 fauli Exp $
+ 25 Jun 2011; Justin Lecher <jlec@gentoo.org> embassy-emnu-1.05-r7.ebuild:
+ Dropped ~ppc due to missing keywording of sci-libs/plplot, #358035
+
20 Mar 2011; Justin Lecher <jlec@gentoo.org> embassy-emnu-1.05-r7.ebuild,
files/embassy-emnu-1.05-r7.patch:
Fixed for reviewed eclass
diff --git a/sci-biology/embassy-emnu/Manifest b/sci-biology/embassy-emnu/Manifest
index 176a2067b..5a09c1d7b 100644
--- a/sci-biology/embassy-emnu/Manifest
+++ b/sci-biology/embassy-emnu/Manifest
@@ -1,15 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
AUX embassy-emnu-1.05-r7.patch 10038 RMD160 4cbbe9c049346f8dddcbb0e2663a5a6bcec7eb85 SHA1 9c5970fac281da1bcd301f69bb1eda3f0e558b46 SHA256 ee578534c253c43078a03b7018b686157e9ad695dae654549a66348a46a12db7
DIST embassy-emnu-1.05.tar.gz 373798 RMD160 9844ed22591a7ee857920f2fd4eee5626de39ba6 SHA1 8c8781cf48a8d95aacc452d1edf5e77144a34987 SHA256 70568ed4f68c174706f17df27cfb3db05c9e0e0d3cf42029ea4fe96328588ca6
-EBUILD embassy-emnu-1.05-r7.ebuild 469 RMD160 311fc0e38196ab39662202405df455ec5b35849a SHA1 72866f2913cbbe147748902ca4dff070ecba83fc SHA256 69e268026d4b3efc10ccd6e5dac655338227e22f214cd85a92b3733a3130ff73
-MISC ChangeLog 4756 RMD160 f0db438642e887a45f7299c2f54efc7aaf13ba16 SHA1 b01fe739268f8f0882459afec6c6d54e3ef49803 SHA256 b409401952b3b7c483e7ed704c4bb13e639e7b869f2da6967df5bb8b7b81a574
+EBUILD embassy-emnu-1.05-r7.ebuild 464 RMD160 840d4d0699b90c315537e9262d1e8eb1739fe11a SHA1 aac132dd4babd270bd625931053259bdd70011cb SHA256 7bb1e373c7705f203e014dfd046081a94cd411e1da9b6c75eb0ab9f80c24caf1
+MISC ChangeLog 4902 RMD160 42e8d7ff1bee5eb0b5d22a1dacf08f4477cc350f SHA1 0bcdb16f557a205d33cfe64507a97ba630641cce SHA256 5272ed4038aa5d624fe95ebb88a702c96b15ec842c6cadb509070497df81de5f
MISC metadata.xml 165 RMD160 b247a16b6552b292d1249ff4e8ea5060ad2c4372 SHA1 a9f91a3a303f4c85430e21eca09913e1c9426366 SHA256 560c375768c8e164d954d61924f110da785b4771012cb830963eaa267a319132
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk2F4lQACgkQgAnW8HDreRa/MgCgi09tcMG3fsvH50XVyDAoMGRb
-p2wAoLOl5ylsIuxOCUTIkdeCMGeCnRBk
-=G5AP
+iEYEAREIAAYFAk4GAj4ACgkQgAnW8HDreRZBbACguK+C+YhKqKyR5oGGy73cXRIf
+xhgAoJAaFZvCpigtqzCjpEbd/yuVHbU6
+=R9Ct
-----END PGP SIGNATURE-----
diff --git a/sci-biology/embassy-emnu/embassy-emnu-1.05-r7.ebuild b/sci-biology/embassy-emnu/embassy-emnu-1.05-r7.ebuild
index 0bf55dc39..f4538cdf2 100644
--- a/sci-biology/embassy-emnu/embassy-emnu-1.05-r7.ebuild
+++ b/sci-biology/embassy-emnu/embassy-emnu-1.05-r7.ebuild
@@ -9,7 +9,7 @@ EBO_EXTRA_ECONF="$(use_with ncurses curses)"
inherit emboss
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos"
IUSE+=" ncurses"
RDEPEND+=" ncurses? ( sys-libs/ncurses )"
diff --git a/sci-biology/embassy-esim4/ChangeLog b/sci-biology/embassy-esim4/ChangeLog
index 0e7dd091e..5629297ac 100644
--- a/sci-biology/embassy-esim4/ChangeLog
+++ b/sci-biology/embassy-esim4/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-esim4/ChangeLog,v 1.28 2010/01/01 21:58:14 fauli Exp $
+ 25 Jun 2011; Justin Lecher <jlec@gentoo.org> embassy-esim4-1.0.0-r7.ebuild:
+ Dropped ~ppc due to missing keywording of sci-libs/plplot, #358035
+
20 Mar 2011; Justin Lecher <jlec@gentoo.org> embassy-esim4-1.0.0-r7.ebuild,
files/embassy-esim4-1.0.0-r7.patch:
Fixed for reviewed eclass
diff --git a/sci-biology/embassy-esim4/Manifest b/sci-biology/embassy-esim4/Manifest
index 7632db279..65a511896 100644
--- a/sci-biology/embassy-esim4/Manifest
+++ b/sci-biology/embassy-esim4/Manifest
@@ -1,15 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
AUX embassy-esim4-1.0.0-r7.patch 9399 RMD160 34b108e0ad6ee283ff8c5752fce3225ffbf16091 SHA1 d104d8d4c84ab4ac80e28df25ce8310c1ee04d33 SHA256 42277736c23d9bb66ef7033447b5509f8313293727661acc17cd53f4fef38ece
DIST embassy-esim4-1.0.0.tar.gz 415096 RMD160 9043eaaed74aab481b1a2e690a06932211421003 SHA1 76a2ea556a23241d94e17fdfdcc05bfa17dd8bfb SHA256 7abd69516d6e12ae58f568662db3bfa19bb3a15c03413db61ecda3f013b144f5
-EBUILD embassy-esim4-1.0.0-r7.ebuild 373 RMD160 a4b8e7a9425af8f41894f024b581529a9e65d76c SHA1 7844efd50e9002306cd98e8c0040f89a349aef3e SHA256 967f831aeac261c52c9bb7e217b32e64423180b419d115e04bd743da4f57dfd3
-MISC ChangeLog 4746 RMD160 a81634edd5ce8167ff9dd4748157359cf36ba7f6 SHA1 00a37eae5e7289b15a55629d70442c549bcc94d6 SHA256 cbc4902a8864403323771479866ceb373d61edf8d2f112a1139dae37a5e57c20
+EBUILD embassy-esim4-1.0.0-r7.ebuild 368 RMD160 69787846d2661b4267346554a6d65335f32245c8 SHA1 2140b8b390d30e8b08803e876b5f623a89a3d308 SHA256 4ca9027576eeb78a49cc6ce8c35ca5f8ba5caaf925bd82f6cdf39ee13568363e
+MISC ChangeLog 4894 RMD160 6fc8d939262883ed53ee63f506afffa89eaa0773 SHA1 ea898c2ee001a0ce17b43645916839ea4aa0a241 SHA256 89674c146a18b749f9a0dd0ea7b6d665c89daf03cada834e981e9629b096cb30
MISC metadata.xml 165 RMD160 b247a16b6552b292d1249ff4e8ea5060ad2c4372 SHA1 a9f91a3a303f4c85430e21eca09913e1c9426366 SHA256 560c375768c8e164d954d61924f110da785b4771012cb830963eaa267a319132
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk2F43oACgkQgAnW8HDreRYTyQCghtcrpiPBAeGNUfKJwSvSfxV9
-GAEAoIMuWbUohsePxwyN2TsxrAVpNkLJ
-=INXE
+iEYEAREIAAYFAk4GAlMACgkQgAnW8HDreRY9pgCfQOorfDkF+7V+EqLAcTcJ2/9v
+WAIAn2blUNlwv3Zioel2YOMVxpi6ZV9q
+=w9ca
-----END PGP SIGNATURE-----
diff --git a/sci-biology/embassy-esim4/embassy-esim4-1.0.0-r7.ebuild b/sci-biology/embassy-esim4/embassy-esim4-1.0.0-r7.ebuild
index 3662f65d5..eba377747 100644
--- a/sci-biology/embassy-esim4/embassy-esim4-1.0.0-r7.ebuild
+++ b/sci-biology/embassy-esim4/embassy-esim4-1.0.0-r7.ebuild
@@ -8,4 +8,4 @@ EBO_DESCRIPTION="sim4 - Alignment of cDNA and genomic DNA"
inherit emboss
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos"
diff --git a/sci-biology/embassy-hmmer/ChangeLog b/sci-biology/embassy-hmmer/ChangeLog
index 3979e4956..a24cbb09f 100644
--- a/sci-biology/embassy-hmmer/ChangeLog
+++ b/sci-biology/embassy-hmmer/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-hmmer/ChangeLog,v 1.30 2010/01/01 22:00:05 fauli Exp $
+ 25 Jun 2011; Justin Lecher <jlec@gentoo.org> embassy-hmmer-2.3.2-r4.ebuild:
+ Dropped ~ppc due to missing keywording of sci-libs/plplot, #358035
+
20 Mar 2011; Justin Lecher <jlec@gentoo.org> embassy-hmmer-2.3.2-r4.ebuild,
files/embassy-hmmer-2.3.2-r4.patch:
Fixed for reviewed eclass
diff --git a/sci-biology/embassy-hmmer/Manifest b/sci-biology/embassy-hmmer/Manifest
index 2527c1aa5..0382f8de2 100644
--- a/sci-biology/embassy-hmmer/Manifest
+++ b/sci-biology/embassy-hmmer/Manifest
@@ -1,15 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
AUX embassy-hmmer-2.3.2-r4.patch 9564 RMD160 01329277e61caee71a6ee2a2cce0645c87e62883 SHA1 da160acedea05872176894c3a95388cbaa66582c SHA256 373996ef3b99630663b0e414386f540548ac643be980fc724d87c0efdd7529d6
DIST embassy-hmmer-2.3.2.tar.gz 569581 RMD160 1c2fdbe0b2aa4e5d3de45d9177c9ae9833acc352 SHA1 0ec9d34dc2a137b5c1b21102bebbd5c28354ad37 SHA256 d4c5ec18f9bdd049be7de138d4c560b4bcb39d9a239f791c6713c0857ea29c89
-EBUILD embassy-hmmer-2.3.2-r4.ebuild 438 RMD160 687dc9e50b82233fa54fe00a201b669c4a9ce039 SHA1 1dce6dec2ad24058158a7ba25e239f64b3bae28a SHA256 4a4e3517749e22a9391a522e4c179dc267d3f8ce312af968a91be8d0c5bbb441
-MISC ChangeLog 5028 RMD160 e55d0237d1181f01a505a27f65034e05bdd65e43 SHA1 1a6f1389f199afdf4741d26e923c940340944b33 SHA256 5dad8124424a0617675d57285fc2a389894da746fab85dc4a2f57b06da465912
+EBUILD embassy-hmmer-2.3.2-r4.ebuild 433 RMD160 3d098505f659369304d1dce8dca1475e5b195659 SHA1 307187135386efbe5bd3c8616f399bf5d87dbaa6 SHA256 ad44710230173dc05223ebc54caf3570ed4eb0e453510d8243594e4310466c8e
+MISC ChangeLog 5176 RMD160 e046cd5b3cfdd827839187a496869161edb50dfb SHA1 4622688dcdcaec5b716c6144b87201b60aa1d147 SHA256 86ccd8f23cf30d2bb34cd694b2042f25f5753cfc3ae77ddf1ffaa6103dc4e557
MISC metadata.xml 165 RMD160 b247a16b6552b292d1249ff4e8ea5060ad2c4372 SHA1 a9f91a3a303f4c85430e21eca09913e1c9426366 SHA256 560c375768c8e164d954d61924f110da785b4771012cb830963eaa267a319132
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk2F4+4ACgkQgAnW8HDreRabeACglncH/YihlwLPOuQj9WyqYb4r
-/hUAniEEoL3cwAnF4uAtYE+Vt9itufGQ
-=fuCH
+iEYEAREIAAYFAk4GApMACgkQgAnW8HDreRauAQCeJHSZh6ySOVS0aq8FMjVfZhM9
+8B0An1Evv0Em8C8XgwOw8CgBBJ5ggSUZ
+=x0WC
-----END PGP SIGNATURE-----
diff --git a/sci-biology/embassy-hmmer/embassy-hmmer-2.3.2-r4.ebuild b/sci-biology/embassy-hmmer/embassy-hmmer-2.3.2-r4.ebuild
index 6bbdf10e9..21de3d660 100644
--- a/sci-biology/embassy-hmmer/embassy-hmmer-2.3.2-r4.ebuild
+++ b/sci-biology/embassy-hmmer/embassy-hmmer-2.3.2-r4.ebuild
@@ -8,6 +8,6 @@ EBO_DESCRIPTION="wrappers for HMMER - Biological sequence analysis with profile
inherit emboss
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos"
RDEPEND+=" ~sci-biology/hmmer-${PV}"
diff --git a/sci-biology/embassy-iprscan/ChangeLog b/sci-biology/embassy-iprscan/ChangeLog
index 5a00be37c..4bf1c83ff 100644
--- a/sci-biology/embassy-iprscan/ChangeLog
+++ b/sci-biology/embassy-iprscan/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-iprscan/ChangeLog,v 1.5 2010/01/15 22:45:28 fauli Exp $
+ 25 Jun 2011; Justin Lecher <jlec@gentoo.org> embassy-iprscan-4.3.1-r2.ebuild:
+ Dropped ~ppc due to missing keywording of sci-libs/plplot, #358035
+
20 Mar 2011; Justin Lecher <jlec@gentoo.org> embassy-iprscan-4.3.1-r2.ebuild,
files/embassy-iprscan-4.3.1-r2.patch:
Fixed for reviewed eclass
diff --git a/sci-biology/embassy-iprscan/Manifest b/sci-biology/embassy-iprscan/Manifest
index 16e26b40f..d2399b2b3 100644
--- a/sci-biology/embassy-iprscan/Manifest
+++ b/sci-biology/embassy-iprscan/Manifest
@@ -1,15 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
AUX embassy-iprscan-4.3.1-r2.patch 9581 RMD160 18a520e521ab8b71cf00085bcb98c4ecb7831da0 SHA1 91b9390317f08f92106c6d22b1d0928ff9d9f3f4 SHA256 b0a36e2aeaef63533b51ef04ca5837fbeb21a4a98b7918495ee9915d2a1012a7
DIST embassy-iprscan-4.3.1.tar.gz 350791 RMD160 d92db63278c489cab73e47634021f057437b89d7 SHA1 e69e55d296b518bab97de21c4dcc10e113dc6ada SHA256 07b1fcfba00af74387312ceaadd890e4ad1af0fdeba4055c88d3d02dc64ee9ca
-EBUILD embassy-iprscan-4.3.1-r2.ebuild 393 RMD160 c76fa1ffee5ba0af4fc224ebce59340dafde43b6 SHA1 9e2df1f415d065b5c386f8cc6adbbc99cff5848a SHA256 74a7a65ddc2593788ae1ba53e4f741bfce82a8f1da6d0927572f64b9c4293447
-MISC ChangeLog 1290 RMD160 aca04cd3cd6daee9873104a7bd7d96f967af71cb SHA1 0de1c10fc6ef68b0fc7b24bc987ca7d66de299c1 SHA256 545403fd49e98854da59f8ce52155a80da3a6d9d3989b752618e3b0aae5fd665
+EBUILD embassy-iprscan-4.3.1-r2.ebuild 388 RMD160 326aefc3b8b4b99bdfd27b5f21f42fc53b2f495c SHA1 71879e420064ee8e254e69f12b2ba223cb396de4 SHA256 a30a1ebad4eda4c68ae5bbb6ef31efd715907324dde38581e2437b1965cdde14
+MISC ChangeLog 1440 RMD160 95d8c31977f5018f02daf493896ece827ccc26e2 SHA1 2ec5225cb22266d3061859f750e7ad4fa28981e8 SHA256 30a2f848abb8d7aae9984412ba0d4c38dc62e5d10cb13cac0c862fe8d2017a7c
MISC metadata.xml 165 RMD160 b247a16b6552b292d1249ff4e8ea5060ad2c4372 SHA1 a9f91a3a303f4c85430e21eca09913e1c9426366 SHA256 560c375768c8e164d954d61924f110da785b4771012cb830963eaa267a319132
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk2F9D0ACgkQgAnW8HDreRbzsgCgw1Gt3VHE8mbtLmpw8744iUEr
-sNkAnjbD1vxqf+kaT8vAoutaDeso0POG
-=+azL
+iEYEAREIAAYFAk4GArkACgkQgAnW8HDreRbNmACfcZdkfUT73Zf7+HFe4uzWpkCb
+ejQAn1QO0sjxSlCm9UnQYV/+0dM4uEFa
+=pE3G
-----END PGP SIGNATURE-----
diff --git a/sci-biology/embassy-iprscan/embassy-iprscan-4.3.1-r2.ebuild b/sci-biology/embassy-iprscan/embassy-iprscan-4.3.1-r2.ebuild
index c69c12518..90b800037 100644
--- a/sci-biology/embassy-iprscan/embassy-iprscan-4.3.1-r2.ebuild
+++ b/sci-biology/embassy-iprscan/embassy-iprscan-4.3.1-r2.ebuild
@@ -8,4 +8,4 @@ EBO_DESCRIPTION="InterProScan motif detection add-on package"
inherit emboss
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
diff --git a/sci-biology/embassy-memenew/ChangeLog b/sci-biology/embassy-memenew/ChangeLog
index ed3b3d9a7..aabfabe81 100644
--- a/sci-biology/embassy-memenew/ChangeLog
+++ b/sci-biology/embassy-memenew/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-memenew/ChangeLog,v 1.11 2010/01/01 22:03:00 fauli Exp $
+ 25 Jun 2011; Justin Lecher <jlec@gentoo.org> embassy-memenew-4.0.0-r1.ebuild:
+ Dropped ~ppc due to missing keywording of sci-libs/plplot, #358035
+
20 Mar 2011; Justin Lecher <jlec@gentoo.org> embassy-memenew-4.0.0-r1.ebuild,
files/embassy-memenew-4.0.0-r1.patch:
Fixed for reviewed eclass
diff --git a/sci-biology/embassy-memenew/Manifest b/sci-biology/embassy-memenew/Manifest
index 03273a037..ee13424ad 100644
--- a/sci-biology/embassy-memenew/Manifest
+++ b/sci-biology/embassy-memenew/Manifest
@@ -1,15 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
AUX embassy-memenew-4.0.0-r1.patch 9463 RMD160 20ff4a767e97e953877f9d37f99dee1eac9d45cc SHA1 df9e617534516f5718cbde59e410335949a18925 SHA256 1146c80e4ca91ef9c245b8f7a40be18b399e7c3d84a5cc8573c930832b4083ab
DIST embassy-memenew-4.0.0.tar.gz 513418 RMD160 7072d182479a726e568b0bc2a4c7757ed1c6c087 SHA1 d382f39d1302f1b0799d5b6cb02cd9cfbecee972 SHA256 2192d33b5ee1147742f51416b0504812dfeb13b3b8ec0bfb62fd729e703a19c3
-EBUILD embassy-memenew-4.0.0-r1.ebuild 374 RMD160 62df7bc95f5c641cbed4c4974204850d0d50b8e4 SHA1 0e92818381e83cabf6c1aee7a6ce03c5c6e054e3 SHA256 f866cb71fff542644feef2ee276178cc8f6525087d6e34c92734d74a5e48cec2
-MISC ChangeLog 2082 RMD160 e72ab8d451eef69164411a24d3f9c038f710b3bf SHA1 bb0e0adb92139641df2657519c3d98267ae1256b SHA256 475b7025ccf640ed4d55647657ac28d8f92d55feb87266b6ea9a042d5cd8cdad
+EBUILD embassy-memenew-4.0.0-r1.ebuild 369 RMD160 d54ebb68ddb2c73b8d79f11a9975e17a02876aeb SHA1 9638bb3bd6d16f48c8347581691a1efd69b7e2da SHA256 c437d23c97bca6ed61d02a9694d23c3e96d39f2701b50efcd4a75f2832f1e1fe
+MISC ChangeLog 2232 RMD160 600b4b0585825d38dd1d8f1ee7650e59a200b657 SHA1 ac1be46f939ecd1b3df9e399226ca880779815eb SHA256 a95ade39fbda61bdcf24ba3736e80d95b053cda4bd9787cb8c8adc76b6ca9446
MISC metadata.xml 165 RMD160 b247a16b6552b292d1249ff4e8ea5060ad2c4372 SHA1 a9f91a3a303f4c85430e21eca09913e1c9426366 SHA256 560c375768c8e164d954d61924f110da785b4771012cb830963eaa267a319132
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk2F9aEACgkQgAnW8HDreRYC7QCeJGvbS5ghAizYSzH0sX4BqCDb
-opgAn2ypusu9HZWVtMlibmd04yvcdIwV
-=wUKc
+iEYEAREIAAYFAk4GAt4ACgkQgAnW8HDreRYIzQCeMASsMM/k4TrLsaYIGCaIsc7O
+lhEAoNMHBdobQy5oiLVJCYMR1gwU8qQF
+=CJlw
-----END PGP SIGNATURE-----
diff --git a/sci-biology/embassy-memenew/embassy-memenew-4.0.0-r1.ebuild b/sci-biology/embassy-memenew/embassy-memenew-4.0.0-r1.ebuild
index 1bb7a8f21..caa114b63 100644
--- a/sci-biology/embassy-memenew/embassy-memenew-4.0.0-r1.ebuild
+++ b/sci-biology/embassy-memenew/embassy-memenew-4.0.0-r1.ebuild
@@ -8,4 +8,4 @@ EBO_DESCRIPTION="MEME - Multiple Em for Motif Elicitation"
inherit emboss
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos"
diff --git a/sci-biology/embassy-mira/ChangeLog b/sci-biology/embassy-mira/ChangeLog
index 3376be216..18606d7b2 100644
--- a/sci-biology/embassy-mira/ChangeLog
+++ b/sci-biology/embassy-mira/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-mira/ChangeLog,v 1.5 2010/01/15 22:46:25 fauli Exp $
+ 25 Jun 2011; Justin Lecher <jlec@gentoo.org> embassy-mira-2.8.2-r2.ebuild:
+ Dropped ~ppc due to missing keywording of sci-libs/plplot, #358035
+
20 Mar 2011; Justin Lecher <jlec@gentoo.org> embassy-mira-2.8.2-r2.ebuild,
files/embassy-mira-2.8.2-r2.patch:
Fixed for reviewed eclass
diff --git a/sci-biology/embassy-mira/Manifest b/sci-biology/embassy-mira/Manifest
index 8313029b6..a27a55b0d 100644
--- a/sci-biology/embassy-mira/Manifest
+++ b/sci-biology/embassy-mira/Manifest
@@ -1,15 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
AUX embassy-mira-2.8.2-r2.patch 9423 RMD160 b9365ecedfc60214dd28e30ea18fe26c425ae011 SHA1 590e8e0c693a0323e9817bd4542f442a01047b63 SHA256 246850c658980eb99ace5525d0f1ebcefd78b1a4f0f40d7b1c44d14502b50f57
DIST embassy-mira-2.8.2.tar.gz 823636 RMD160 2df2b3102671bc74db93602d7c8ecaaf4f83435a SHA1 a87f51f1ad31d419b634a9e04e985a42f7cae4c2 SHA256 82a57cd526a4348a7456947e5ffc225fc42684bc21b5ec6996d99100f86d31ec
-EBUILD embassy-mira-2.8.2-r2.ebuild 377 RMD160 ed50a51cc36d286adfb69c80240ad66d3a0977d0 SHA1 98fe62b9e2e650b7cf22d18e8aaab8fcfdae7b7f SHA256 ca7df07746c0120871cd3622384c257088c1ef5325b0d8cb8375e43dbdbe3de4
-MISC ChangeLog 1456 RMD160 1fc5bc800ea82e7422fa361221d93e80e9166859 SHA1 ba885827be8d691446989cdb5336d24d3e6c24fa SHA256 d47c1e2717426c48c3aea633325a675fd0fa7b91a01a673096aef516fc912e29
+EBUILD embassy-mira-2.8.2-r2.ebuild 372 RMD160 eb6f2b4c0e8cbb2e55af13abcf1e15937b87628f SHA1 685e20d4db697420a8b543e0447daabde5b5c8d1 SHA256 ba38a67f3fb106e571e65a0daf878034acc8daba7e51273f90a1230ac4995339
+MISC ChangeLog 1603 RMD160 0999a452469a08de19c034de11a26dd55116dbb1 SHA1 aee5f16ea3bacda045fc745dac963af12ccea19c SHA256 6c14bde979e50dcc293a643b1bfb6ee6d1ff8016c035fb8cc62091b7e136e1d2
MISC metadata.xml 165 RMD160 b247a16b6552b292d1249ff4e8ea5060ad2c4372 SHA1 a9f91a3a303f4c85430e21eca09913e1c9426366 SHA256 560c375768c8e164d954d61924f110da785b4771012cb830963eaa267a319132
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk2F9n0ACgkQgAnW8HDreRZb0gCgktn50/6fkfzIDoxuuZAfWTnj
-6FQAn092q1Xz09WZ9R5S2MfQ8BY7JcOX
-=NXPa
+iEYEAREIAAYFAk4GAvAACgkQgAnW8HDreRbOPQCgpjSxLn/J5uk2m/FHLNBFosmX
+79sAoLbRJN9H7GPg8Hr1S1ocfz9vWmRR
+=ji/h
-----END PGP SIGNATURE-----
diff --git a/sci-biology/embassy-mira/embassy-mira-2.8.2-r2.ebuild b/sci-biology/embassy-mira/embassy-mira-2.8.2-r2.ebuild
index 30fb46cb3..2ed8a9fe9 100644
--- a/sci-biology/embassy-mira/embassy-mira-2.8.2-r2.ebuild
+++ b/sci-biology/embassy-mira/embassy-mira-2.8.2-r2.ebuild
@@ -8,4 +8,4 @@ EBOV_DESCRIPTION="Fragment assembly add-on package"
inherit emboss
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
diff --git a/sci-biology/embassy-mse/ChangeLog b/sci-biology/embassy-mse/ChangeLog
index 986307764..0d60fafd8 100644
--- a/sci-biology/embassy-mse/ChangeLog
+++ b/sci-biology/embassy-mse/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-mse/ChangeLog,v 1.35 2010/01/01 22:05:28 fauli Exp $
+ 25 Jun 2011; Justin Lecher <jlec@gentoo.org> embassy-mse-3.0.0.ebuild:
+ Dropped ~ppc due to missing keywording of sci-libs/plplot, #358035
+
20 Mar 2011; Justin Lecher <jlec@gentoo.org> embassy-mse-3.0.0.ebuild,
files/embassy-mse-3.0.0.patch:
Fixed for reviewed eclass
diff --git a/sci-biology/embassy-mse/Manifest b/sci-biology/embassy-mse/Manifest
index ae991627e..c47861b82 100644
--- a/sci-biology/embassy-mse/Manifest
+++ b/sci-biology/embassy-mse/Manifest
@@ -1,15 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
AUX embassy-mse-3.0.0.patch 10900 RMD160 171a943e032522e6de380e699c9a917c634d7fc7 SHA1 28d39621f0b0924bf4c5982a5b50376453d6410f SHA256 1d900f8fb9d6d45f160a33faeb41ba5dc10413c5034d0ee0dcb020a5414bb5ce
DIST embassy-mse-3.0.0.tar.gz 435315 RMD160 9e94bdc1cbff5b684a6d7f33a7a95de33c1b910e SHA1 bae84ef0154f444037653df322fb605d013dca0c SHA256 f3bb205b197d4cc4ad7d6ee8e3696eb59d84a8b60a8369d4a645871d0c9619c3
-EBUILD embassy-mse-3.0.0.ebuild 547 RMD160 5949b0db7f8addc9dafca3b3f08b5eda51824e18 SHA1 da9045e9c1c5cf5a0d5e805613c2a0243cb99bc8 SHA256 236230400b07988f6a06de2c73e4913612fc6934339120a79d9fad1cf18ee4b9
-MISC ChangeLog 5598 RMD160 cd7c8a60b5413e0bbb0b12a2f80b8f70082ea099 SHA1 f4076a406c8e947ce68f53a751b5d3dede0da448 SHA256 b27312004ed0af85916da8c9708b3174da48f0a0055d23c493b533f423477932
+EBUILD embassy-mse-3.0.0.ebuild 542 RMD160 f519ac8277e5100da25dae0d36786977f67768f4 SHA1 78d82b15444c953b6ed3c75f612bf8a1dde3c82b SHA256 93bd99eecc5d4b1d9f8032067e664785217729bc107bbc6d37a80bfd421d0161
+MISC ChangeLog 5741 RMD160 a71180e4544aa4d85fbecedd927b905b0aeb9070 SHA1 90c869530f6fcec35ec1359d9b4894b1b1699aaa SHA256 8bd4a2e45a88ef282c2975ef1b8ba0f94ab9700127865e770d2c05ceda041f90
MISC metadata.xml 165 RMD160 b247a16b6552b292d1249ff4e8ea5060ad2c4372 SHA1 a9f91a3a303f4c85430e21eca09913e1c9426366 SHA256 560c375768c8e164d954d61924f110da785b4771012cb830963eaa267a319132
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk2F+L4ACgkQgAnW8HDreRYFjQCdHmwyYJP/PHR0fJ1l1YZvvsrh
-gtEAn3p6LUF1syBnnokCmBkqPPU0HYiy
-=BiI2
+iEYEAREIAAYFAk4GAwQACgkQgAnW8HDreRYgEACgyKU8ESvF1rlyKi0Gk4EdwgYW
+yOUAn3i6RJmUPE/3Pzir3sgbn4zRsMn/
+=eGWh
-----END PGP SIGNATURE-----
diff --git a/sci-biology/embassy-mse/embassy-mse-3.0.0.ebuild b/sci-biology/embassy-mse/embassy-mse-3.0.0.ebuild
index dd6a473f0..e8bf5541f 100644
--- a/sci-biology/embassy-mse/embassy-mse-3.0.0.ebuild
+++ b/sci-biology/embassy-mse/embassy-mse-3.0.0.ebuild
@@ -8,7 +8,7 @@ EBO_DESCRIPTION="MSE - Multiple Sequence Screen Editor"
inherit emboss
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos"
IUSE+=" ncurses"
diff --git a/sci-biology/embassy-phylipnew/ChangeLog b/sci-biology/embassy-phylipnew/ChangeLog
index 048d0bd1f..4053bf0b3 100644
--- a/sci-biology/embassy-phylipnew/ChangeLog
+++ b/sci-biology/embassy-phylipnew/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-phylipnew/ChangeLog,v 1.12 2010/01/01 22:02:06 fauli Exp $
+ 25 Jun 2011; Justin Lecher <jlec@gentoo.org> embassy-phylipnew-3.69.ebuild:
+ Dropped ~ppc due to missing keywording of sci-libs/plplot, #358035
+
20 Mar 2011; Justin Lecher <jlec@gentoo.org> embassy-phylipnew-3.69.ebuild,
files/embassy-phylipnew-3.69.patch:
Fixed for reviewed eclass
diff --git a/sci-biology/embassy-phylipnew/Manifest b/sci-biology/embassy-phylipnew/Manifest
index 12722791a..1dd10e35e 100644
--- a/sci-biology/embassy-phylipnew/Manifest
+++ b/sci-biology/embassy-phylipnew/Manifest
@@ -1,15 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
AUX embassy-phylipnew-3.69.patch 9615 RMD160 3933c0479d9bee7b725c7783e652334c1d634d9b SHA1 a8ad42aea033cc3949972a7a5299e551617a9587 SHA256 8b918547f1916c4c8d9127a349714388cfe923c0fa5f65994011c44246bff4d0
DIST embassy-phylipnew-3.69.tar.gz 1667760 RMD160 8cb425f8e7af99d0081d2014403de74ad8e84feb SHA1 65e265190873b14c7449f6d53cc017ea90b612b6 SHA256 2e74ce4f70ad5421ea81e84c199a08bfb4a236e2cf2769be4f309c4badd1302b
-EBUILD embassy-phylipnew-3.69.ebuild 390 RMD160 f234e4a08a8ee873f1fca5c2a71d8a685c04959c SHA1 673343e393d6eac17de1cad71184290030cf8b81 SHA256 4ed839a310d8d029858e67aab6aa23ba9d9f9a8756e6881011c834250ec209e8
-MISC ChangeLog 2376 RMD160 e25cdc29505bb478e7b20f76559a5674e481fee1 SHA1 9f73f185f2c2aabcd5208ab919bbdb8f2d51598e SHA256 befa96d493e676d006232875c710abccc88e7a55f958a5dea886e89cd81818f8
+EBUILD embassy-phylipnew-3.69.ebuild 385 RMD160 99fe0e4c52cf4c2aa52f54bace2e3a41b1ed2172 SHA1 85471ce1481cd41592b925833e87eb1055b7b018 SHA256 1c75892670b87492e53e6b3004cebefb21c4a2b52d5c0be0995755cb9ba29542
+MISC ChangeLog 2524 RMD160 45961c99f77705ac0af8d8833ba2f23c7d46feb2 SHA1 e50c3ba423e3675086d63056833150bdb1a44dba SHA256 888f40b1dc771f9e4d0bd7fae9da8e2a538454ca13ef011044f7c963d2e02bf9
MISC metadata.xml 165 RMD160 b247a16b6552b292d1249ff4e8ea5060ad2c4372 SHA1 a9f91a3a303f4c85430e21eca09913e1c9426366 SHA256 560c375768c8e164d954d61924f110da785b4771012cb830963eaa267a319132
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk2F+joACgkQgAnW8HDreRaRGgCfd3+F9IEe7f120C+q0EmPVY43
-hwAAoKzU7TnMVj8gw5X8XHYVayXX/xmD
-=kuSG
+iEYEAREIAAYFAk4GAyUACgkQgAnW8HDreRb+9wCeMWpXq2DOLHuGXsCEwLIHyEIV
+8eUAoK4HYQ9U/KiJkhb06FIMRBh3cgmF
+=ZZ/w
-----END PGP SIGNATURE-----
diff --git a/sci-biology/embassy-phylipnew/embassy-phylipnew-3.69.ebuild b/sci-biology/embassy-phylipnew/embassy-phylipnew-3.69.ebuild
index 6767ae7bf..34691a5ef 100644
--- a/sci-biology/embassy-phylipnew/embassy-phylipnew-3.69.ebuild
+++ b/sci-biology/embassy-phylipnew/embassy-phylipnew-3.69.ebuild
@@ -10,4 +10,4 @@ inherit emboss
LICENSE+=" freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos"
diff --git a/sci-biology/embassy-signature/ChangeLog b/sci-biology/embassy-signature/ChangeLog
index b541cb909..9bfed99ea 100644
--- a/sci-biology/embassy-signature/ChangeLog
+++ b/sci-biology/embassy-signature/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-signature/ChangeLog,v 1.19 2010/01/01 21:59:44 fauli Exp $
+ 25 Jun 2011; Justin Lecher <jlec@gentoo.org>
+ embassy-signature-0.1.0-r5.ebuild:
+ Dropped ~ppc due to missing keywording of sci-libs/plplot, #358035
+
20 Mar 2011; Justin Lecher <jlec@gentoo.org>
embassy-signature-0.1.0-r5.ebuild, files/embassy-signature-0.1.0-r5.patch:
Fixed for reviewed eclass
diff --git a/sci-biology/embassy-signature/Manifest b/sci-biology/embassy-signature/Manifest
index aee7759ba..1cbf4bde6 100644
--- a/sci-biology/embassy-signature/Manifest
+++ b/sci-biology/embassy-signature/Manifest
@@ -1,15 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
AUX embassy-signature-0.1.0-r5.patch 9515 RMD160 d49cc11f72e7538feeb2326846a30cc902c789d8 SHA1 a208e5469d61c77a10b2e729e729782ba08cd97b SHA256 2a6d31d71cc2b3206e88fd21ff69714d2fa97695285f69a6033c9416eb7da4cf
DIST embassy-signature-0.1.0.tar.gz 571008 RMD160 d69cbdeb8461d4f5596546dad9d1b7afc14df672 SHA1 bd9834fe0aeb7b6f6fd1a46550adc6be06d74566 SHA256 feaec1c3d3a8a2b98bb691137aa5ac099f7cef6579150fdb1429fcfc5db01024
-EBUILD embassy-signature-0.1.0-r5.ebuild 373 RMD160 239bf7f85b665e3e673768af1a93241e2786ec5c SHA1 3b23acc995d315a71192ec99512112a4f6067759 SHA256 14410def1ecf2e1c48dfaf0fd7124f9af64555c62f216a8e551e7eda67e8084f
-MISC ChangeLog 3461 RMD160 ac4a7335f4d3e829ae7a0873dc6ceb191c53bfbc SHA1 f7066903c1ff313981f088665d7c602df5848f9a SHA256 e5ee2628e7fc82f59374369d9eb72090f555e6181345456d5e6cb6dbd13beb1c
+EBUILD embassy-signature-0.1.0-r5.ebuild 368 RMD160 d189d471bf91102c82e851c88d7958258513fe9d SHA1 4f9cb575a53614c50eb02f2b5f6e31d09562010a SHA256 9bb72ba36fa13d2bdd427afbcc875f399f93f498c13da7209fe6cea3bf2235c4
+MISC ChangeLog 3615 RMD160 a7579b01318721b2d095af930f710436562bc49f SHA1 4fc57225fca7d622545a6851c844dd4989adc22c SHA256 be033c1257bb9284fd768df472301b9ffa51983c36ea9f8ab48aa3970bd4db78
MISC metadata.xml 165 RMD160 b247a16b6552b292d1249ff4e8ea5060ad2c4372 SHA1 a9f91a3a303f4c85430e21eca09913e1c9426366 SHA256 560c375768c8e164d954d61924f110da785b4771012cb830963eaa267a319132
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk2F+8oACgkQgAnW8HDreRbvSwCfXEik12rFDZ7o2XrbWi/44jCA
-eMIAn0sBel1PQpltnAH+iwwgh+uZx0VD
-=Ec7L
+iEYEAREIAAYFAk4GA18ACgkQgAnW8HDreRZggACgrFL9oLCRLQplQkq7dZiG16oS
+XekAoI9u0kMvGam+ETBTM/StG0qhj9ly
+=NIgo
-----END PGP SIGNATURE-----
diff --git a/sci-biology/embassy-signature/embassy-signature-0.1.0-r5.ebuild b/sci-biology/embassy-signature/embassy-signature-0.1.0-r5.ebuild
index de1c6abcf..77aefb434 100644
--- a/sci-biology/embassy-signature/embassy-signature-0.1.0-r5.ebuild
+++ b/sci-biology/embassy-signature/embassy-signature-0.1.0-r5.ebuild
@@ -8,4 +8,4 @@ EBO_DESCRIPTION="Protein signature add-on package"
inherit emboss
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos"
diff --git a/sci-biology/embassy-structure/ChangeLog b/sci-biology/embassy-structure/ChangeLog
index 4fe54066c..7afd64dc4 100644
--- a/sci-biology/embassy-structure/ChangeLog
+++ b/sci-biology/embassy-structure/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-structure/ChangeLog,v 1.19 2010/01/01 21:57:51 fauli Exp $
+ 25 Jun 2011; Justin Lecher <jlec@gentoo.org>
+ embassy-structure-0.1.0-r5.ebuild:
+ Dropped ~ppc due to missing keywording of sci-libs/plplot, #358035
+
20 Mar 2011; Justin Lecher <jlec@gentoo.org>
embassy-structure-0.1.0-r5.ebuild, files/embassy-structure-0.1.0-r5.patch:
Fixed for reviewed eclass
diff --git a/sci-biology/embassy-structure/Manifest b/sci-biology/embassy-structure/Manifest
index db9211988..4da8e216c 100644
--- a/sci-biology/embassy-structure/Manifest
+++ b/sci-biology/embassy-structure/Manifest
@@ -1,15 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
AUX embassy-structure-0.1.0-r5.patch 9522 RMD160 e89d1f49221585e6e25f60aa625ca50727c61da4 SHA1 bf3cc5df2e00f76acfd38fdb555330022b87098f SHA256 106dec75227d9708ec61c0ef9ed5d453e0b1b22dbe3df8443f1c3c27961a6a88
DIST embassy-structure-0.1.0.tar.gz 531604 RMD160 33d351f0b107637d59c1623a9cbd6e97e1f3f17a SHA1 ec19fd6c69e7ed3be894c588fecdd77b98bcb0b8 SHA256 df2dc789544e61f695438e3117921ecef78739963169672e80c3394659720afa
-EBUILD embassy-structure-0.1.0-r5.ebuild 373 RMD160 739d25d4a3e8cda97ace59a335a03e72e426b50f SHA1 dfe56ad9090bde5cac1cb06ebfd011236c631845 SHA256 7823fb3b96a2cbf4d55a7061a13e07c187a941640d155ba36d19012e02d3b264
-MISC ChangeLog 3461 RMD160 8515547b3d7b6a2c69387a7f85ecd7120b3911ed SHA1 5057daf1ba8c69a89a55d1d8eb9863373f0d7052 SHA256 2317c7e53ff660fcc4edaf3e8813c9a61e97cf1d952d8fd87492175fdb9396e9
+EBUILD embassy-structure-0.1.0-r5.ebuild 368 RMD160 82400a4204df48c7626351eb58e4f7fd649d123e SHA1 31d3ea026687f378534138b5bd2937671d5a9a1f SHA256 8a8f9eea06d4c795ee65be4bf19224bbdf05dcff6a9410dea2e614d7649f9c3a
+MISC ChangeLog 3615 RMD160 20a720b90a2f6f12cb1c2adc90427d06bfe3c8cc SHA1 ee8c349ec0dce53279316fe40511097f2fedcd92 SHA256 99fe3e9e66b374ae2916a5ea372caedaba92bf698efa217eec78d78b577e37ee
MISC metadata.xml 165 RMD160 b247a16b6552b292d1249ff4e8ea5060ad2c4372 SHA1 a9f91a3a303f4c85430e21eca09913e1c9426366 SHA256 560c375768c8e164d954d61924f110da785b4771012cb830963eaa267a319132
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk2F/DIACgkQgAnW8HDreRYFpACfciQyXDUM2jBuWVCNX+J8vcSz
-cjsAoMFM5gfZF/jx7dJBxqHA9weRfqa4
-=6ipH
+iEYEAREIAAYFAk4GA3oACgkQgAnW8HDreRZnyQCfTSTEatJJCkBw8KhZVkeQfbAm
+AjsAoLlJFz161oJYtulYWE3yqZfhb6Ql
+=Z80J
-----END PGP SIGNATURE-----
diff --git a/sci-biology/embassy-structure/embassy-structure-0.1.0-r5.ebuild b/sci-biology/embassy-structure/embassy-structure-0.1.0-r5.ebuild
index 4af39271b..ac6658955 100644
--- a/sci-biology/embassy-structure/embassy-structure-0.1.0-r5.ebuild
+++ b/sci-biology/embassy-structure/embassy-structure-0.1.0-r5.ebuild
@@ -8,4 +8,4 @@ EBO_DESCRIPTION="Protein structure add-on package"
inherit emboss
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos"
diff --git a/sci-biology/embassy-topo/ChangeLog b/sci-biology/embassy-topo/ChangeLog
index bc25e4ebd..5ad2bc721 100644
--- a/sci-biology/embassy-topo/ChangeLog
+++ b/sci-biology/embassy-topo/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-topo/ChangeLog,v 1.29 2010/01/01 21:54:52 fauli Exp $
+ 25 Jun 2011; Justin Lecher <jlec@gentoo.org> embassy-topo-2.0.0.ebuild:
+ Dropped ~ppc due to missing keywording of sci-libs/plplot, #358035
+
20 Mar 2011; Justin Lecher <jlec@gentoo.org> embassy-topo-2.0.0.ebuild,
files/embassy-topo-2.0.0.patch:
Fixed for reviewed eclass
diff --git a/sci-biology/embassy-topo/Manifest b/sci-biology/embassy-topo/Manifest
index cd50c3164..6bce89048 100644
--- a/sci-biology/embassy-topo/Manifest
+++ b/sci-biology/embassy-topo/Manifest
@@ -1,15 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
AUX embassy-topo-2.0.0.patch 9416 RMD160 fdaed3604e8a8d041a189291067332358ed9d349 SHA1 26768d5f14221a40e315b2ed99bc2cd73bc219b2 SHA256 d6c7b9bfd31487b14a608f758e38698a2ace3cad57b8c321fd8d69c1f5d75672
DIST embassy-topo-2.0.0.tar.gz 386287 RMD160 d25cdde9ea76253c088754f1633389ce87e79866 SHA1 c6373211ed36866497ad54a6f8bf9bc0aa4733bc SHA256 023e1f1e92e0372c4029c9e19043af0416d0e294440bb368d30126c5ed330691
-EBUILD embassy-topo-2.0.0.ebuild 373 RMD160 6c3eb53aa44a640807cf562541a574749223da63 SHA1 737062a13b260b7cf1123526aad06112e7f4d20f SHA256 654f9f4ff5929f2ab6f94b1a3fd7c3f6fea696a80be610fccb84e78f8fa73d79
-MISC ChangeLog 4778 RMD160 dc4832b8a5a100c6034a1dc8e6e9b821334a7524 SHA1 d3301ecf66f677a5dd408e61c43135172da5f8df SHA256 8ac4f880d19be2a42e48325c3994391a7cab3a84d231b9a8a0d5976469b3245f
+EBUILD embassy-topo-2.0.0.ebuild 368 RMD160 26cc07ab59586b39677492099bc8a5765eb2ade0 SHA1 c6ca98799deb4db707234a2bed49762bc0186ebd SHA256 4d4ab09f8f138533669553a1890a0bbcc025f2c1d3c58e6bb3785997c2b30ecd
+MISC ChangeLog 4922 RMD160 8eb2223000309a5e863c613fe4604fcf26870aa3 SHA1 679e45de2387f0abe20536da5e4f94228cb09b21 SHA256 f2baeba6ee08d2dd039329c196b6f64ca4c3ece5b06e175b02aa128ed7533698
MISC metadata.xml 165 RMD160 b247a16b6552b292d1249ff4e8ea5060ad2c4372 SHA1 a9f91a3a303f4c85430e21eca09913e1c9426366 SHA256 560c375768c8e164d954d61924f110da785b4771012cb830963eaa267a319132
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk2F/PsACgkQgAnW8HDreRZDhgCfSaIUXc8dw4Funmc3tlTtlHZ5
-LiMAoKeN9DAY7CRN1N06tGiYXXwtDO6D
-=XtB0
+iEYEAREIAAYFAk4GA5MACgkQgAnW8HDreRZcUQCfXEESoX45eJJV0tbSXobJvHPc
+hcIAnAtw8YGpdrVOOVpzHpl7iMf6p6Ec
+=2kVI
-----END PGP SIGNATURE-----
diff --git a/sci-biology/embassy-topo/embassy-topo-2.0.0.ebuild b/sci-biology/embassy-topo/embassy-topo-2.0.0.ebuild
index 3090d47a6..02244e6f4 100644
--- a/sci-biology/embassy-topo/embassy-topo-2.0.0.ebuild
+++ b/sci-biology/embassy-topo/embassy-topo-2.0.0.ebuild
@@ -8,4 +8,4 @@ EBO_DESCRIPTION="Transmembrane protein display"
inherit emboss
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
diff --git a/sci-biology/embassy-vienna/ChangeLog b/sci-biology/embassy-vienna/ChangeLog
index 7df53c061..3d15b99f9 100644
--- a/sci-biology/embassy-vienna/ChangeLog
+++ b/sci-biology/embassy-vienna/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy-vienna/ChangeLog,v 1.8 2010/01/15 22:47:16 fauli Exp $
+ 25 Jun 2011; Justin Lecher <jlec@gentoo.org> embassy-vienna-1.7.2-r2.ebuild:
+ Dropped ~ppc due to missing keywording of sci-libs/plplot, #358035
+
20 Mar 2011; Justin Lecher <jlec@gentoo.org> embassy-vienna-1.7.2-r2.ebuild,
files/embassy-vienna-1.7.2-r2.patch:
Fixed for reviewed eclass
diff --git a/sci-biology/embassy-vienna/Manifest b/sci-biology/embassy-vienna/Manifest
index 1d018c5d5..066106a0a 100644
--- a/sci-biology/embassy-vienna/Manifest
+++ b/sci-biology/embassy-vienna/Manifest
@@ -1,15 +1,15 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
AUX embassy-vienna-1.7.2-r2.patch 9731 RMD160 5cda4d8a04c252051a8affb85706648de8fa91a5 SHA1 e7a6d11b6ab4c8f353a530c42d6c677457e15389 SHA256 c5de170aaf19f0339780120132f97a5f26a48b26d739a5bdb772fdb6d26e3bce
DIST embassy-vienna-1.7.2.tar.gz 652433 RMD160 753b37bfaa8f362ebc46fb96955537fd82c627c4 SHA1 4eb8f80c9579a96b198c35ec3dba4b93821789f8 SHA256 61c60e4335a716cbc80e6fab47268de64c6c377c0a052686cd98822cf7270d7c
-EBUILD embassy-vienna-1.7.2-r2.ebuild 380 RMD160 9105a9723b81e1dce6ccfde70784b4e31970795e SHA1 b44cb11627eca23df2ddcaa922f03f3ff0913808 SHA256 0d56b3ca1f4015a0649eccc94e8ca3ba12a7000036156d537e0ec8a24794bea1
-MISC ChangeLog 1873 RMD160 3633f62b4770438afc5afe6f3171f2f05778bbbb SHA1 a3cd44496536a20d1138c4bd80edaa11605fb48a SHA256 c3ff48d00893aac7fa9fd323eaf58a8a86d8379db26aef358151bf5212fdbce2
+EBUILD embassy-vienna-1.7.2-r2.ebuild 375 RMD160 ce51a1e63695d6286034c08d3cbf2a8d02f61b2f SHA1 3052730952a478de52507eb3dd327a8b0fd9d710 SHA256 fbe5d6d1d1743f1a35f249856e07058d3188dec495ce225479888c202f547b8f
+MISC ChangeLog 2022 RMD160 98a74e8684854f45e144475f5ff89d4e443f72be SHA1 e858b3aff5806edfec90760e7e8dea8f24e28b21 SHA256 f7dbc9853c89e650518217552092bad9aa20c27ab8e343db50ebde31bb1c85fa
MISC metadata.xml 165 RMD160 b247a16b6552b292d1249ff4e8ea5060ad2c4372 SHA1 a9f91a3a303f4c85430e21eca09913e1c9426366 SHA256 560c375768c8e164d954d61924f110da785b4771012cb830963eaa267a319132
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk2F/poACgkQgAnW8HDreRYkigCeJpDVnreI/Rv26tHmb9NbhXq8
-AtkAnR5NrTa5En7RKtyNQK+QIM9hWbRj
-=gOG8
+iEYEAREIAAYFAk4GA6QACgkQgAnW8HDreRa+ZwCcC+aDA2QRFokUmI+h52ofAMCe
+WegAn1aNcFddrtJ2wh1SJVoZ7UKqdBBx
+=iToN
-----END PGP SIGNATURE-----
diff --git a/sci-biology/embassy-vienna/embassy-vienna-1.7.2-r2.ebuild b/sci-biology/embassy-vienna/embassy-vienna-1.7.2-r2.ebuild
index 9a7b8e53c..594278f81 100644
--- a/sci-biology/embassy-vienna/embassy-vienna-1.7.2-r2.ebuild
+++ b/sci-biology/embassy-vienna/embassy-vienna-1.7.2-r2.ebuild
@@ -8,4 +8,4 @@ EBO_DESCRIPTION="Vienna RNA package - RNA folding"
inherit emboss
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
diff --git a/sci-biology/embassy/ChangeLog b/sci-biology/embassy/ChangeLog
index a08d9efbe..445246a8e 100644
--- a/sci-biology/embassy/ChangeLog
+++ b/sci-biology/embassy/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-biology/embassy/ChangeLog,v 1.33 2010/01/01 21:35:29 fauli Exp $
+ 25 Jun 2011; Justin Lecher <jlec@gentoo.org> embassy-6.3.1.ebuild:
+ Dropped ~ppc due to missing keywording of sci-libs/plplot, #358035
+
21 Mar 2011; Justin Lecher <jlec@gentoo.org> embassy-6.3.1.ebuild:
Fixed for reviewed eclass
diff --git a/sci-biology/embassy/Manifest b/sci-biology/embassy/Manifest
index 0ee4f05b5..6432e5073 100644
--- a/sci-biology/embassy/Manifest
+++ b/sci-biology/embassy/Manifest
@@ -1,13 +1,13 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
-EBUILD embassy-6.3.1.ebuild 1104 RMD160 e1332acc8a61e2be31c5bf1957caa983b63e011c SHA1 ba3effa2b9c800f9d29d001e6c4c537f4eae2b7b SHA256 d7a587d1110d29faa63903106edf31faa067dc075d38de5fccb2664207f56dd6
-MISC ChangeLog 5213 RMD160 77f058ea7c5e40d5e101eeaae41e1c93f3b96f4e SHA1 82af9df083283693de75a856497f4bdbce85aba1 SHA256 1fdaa89b82ca06e9c892c9e003f565e4d1a5cd8f4fdf8ecc2a5392e20c2ac834
+EBUILD embassy-6.3.1.ebuild 1099 RMD160 dba540412b7ce2f9b0266facfc37e4ef95e28b58 SHA1 efabf268999265a10e37a7103887bd376c181a7d SHA256 4e30ae47578b0016d495816bb6ebb83bdd8e388b291feaa621214b1580cd8135
+MISC ChangeLog 5352 RMD160 3630f8fee437d95096271e1add960c3ae900b9a1 SHA1 861164d561f325c35e0b0db79892780e1eda3a80 SHA256 6afc7b4a2b9be3b73c648b5e1a2d00c604a39efd3813df7c4a2c0a1ec0f3eae3
MISC metadata.xml 165 RMD160 b247a16b6552b292d1249ff4e8ea5060ad2c4372 SHA1 a9f91a3a303f4c85430e21eca09913e1c9426366 SHA256 560c375768c8e164d954d61924f110da785b4771012cb830963eaa267a319132
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk2HQLUACgkQgAnW8HDreRb48ACeNzOEItkFGpd2DSSlkqjUw8iq
-FLEAnRD2A6r4lrH0ikbZFJTkrIr1jcPx
-=0Chi
+iEYEAREIAAYFAk4GAZgACgkQgAnW8HDreRbDwACfVEAGTczIYp6yJQ1dVJKxsdpg
+wZMAoJicRtMe/NclSS+wz5SLObdgUjH1
+=S7it
-----END PGP SIGNATURE-----
diff --git a/sci-biology/embassy/embassy-6.3.1.ebuild b/sci-biology/embassy/embassy-6.3.1.ebuild
index 0cceb185c..38ad021a2 100644
--- a/sci-biology/embassy/embassy-6.3.1.ebuild
+++ b/sci-biology/embassy/embassy-6.3.1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="A meta-package for installing all EMBASSY packages (EMBOSS add-ons)
SRC_URI=""
LICENSE+=" freedist"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos"
RDEPEND+="
=sci-biology/embassy-cbstools-1.0.0-r2
diff --git a/sci-biology/est2uni/Manifest b/sci-biology/est2uni/Manifest
index 29191fd2c..211a599bd 100644
--- a/sci-biology/est2uni/Manifest
+++ b/sci-biology/est2uni/Manifest
@@ -1,5 +1,6 @@
-AUX 9999-est_clustering.pm.patch 1276 RMD160 4a54b28c9a67ae8476255a4063768a1c7b466357 SHA1 1d255394dad2f608bd91f6064232a3cd431e368d SHA256 c289866a862a18a9385db9931c3c0c9175334e829819f075cc7fbf7e8bbd83ce
-AUX 9999-pipe_db.pm.patch 534 RMD160 8b2a5ef4de3a2c65eb65476cbb4decdad3eb8a74 SHA1 46509d05f01ae53764b4947ddb663edbb3bfee9d SHA256 11aa489e406bceabdd3b7d532fbca69ede1c0a116cc7a38ae9ea32dafc41f54c
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX 99est2uni 82 RMD160 4171612511e63f41fa57aa743a435e4e5ca811d1 SHA1 a51b17f763855cda65e3bf5f401dccab231e1593 SHA256 4317ba1309d2506682d5146f7fb52f388b368bfd2ab33b4a2cf95ec8b117341e
AUX est2uni 82 RMD160 4171612511e63f41fa57aa743a435e4e5ca811d1 SHA1 a51b17f763855cda65e3bf5f401dccab231e1593 SHA256 4317ba1309d2506682d5146f7fb52f388b368bfd2ab33b4a2cf95ec8b117341e
AUX est_annot.pm.patch 19656 RMD160 83c75544edf45b7dffe92b97ec1935ec4774241d SHA1 f6051670594093ba89cb259cb0427222bf4a3f02 SHA256 fdfb19e711a05b02016ffbe57f5d68f5d7b8746690445aafa2cab6ebf8ddd058
@@ -16,9 +17,14 @@ AUX tgicl_files.patch 865 RMD160 cc782fcdf0ae723b69e2b9d7135ad7236a960dc7 SHA1 0
DIST GO.terms_and_ids 1773108 RMD160 6df24848cedea76de66bbebf7eaa5eadd58e016c SHA1 e73465e4c1606245be723417adf9bcdc5c454965 SHA256 8a6d670f4ecdfa81a609abdd959d13fb9f695132eb08a2b412a8d80b50fd7e64
DIST UniVec 1062966 RMD160 ef634cd9e8996d8e3dc6e5fdbabb09ee4f5df2c3 SHA1 c599178ef9e6c6865fd531018145ed43851e5e01 SHA256 6fc0e3644a2ecb59705801416d76d7d74aa8fa5788e955a024b2d9614376f425
DIST UniVec_Core 542650 RMD160 a8cf42b9015622a8ac52839c7b794bbad4c1f92a SHA1 6ebaa99115661302125bd5b15a7caace264f2cda SHA256 7456353d072da508538052286c82ff5fec740a6ceac5621f68fd4eb35bdff9ef
-DIST est2uni.tar.gz 10251279 RMD160 a208295065d68e4d68804b0b5c840f877111c0d6 SHA1 f10adac451f739f0ef97aea153eb4ea2066c8229 SHA256 347f668d8a18bedafe8644fe2bcd7d184dd77f1c98aabfbfab70767ceb819874
DIST est2uni_0.27.tar.gz 4616613 RMD160 06ec260f79fe11f7779b75aad825e665f421d4eb SHA1 5ee9b5dc51f4829c5ed0d4ddd47bb68e7f3c43ee SHA256 33d2f2981ca70fa6707d3a2f310c0492cd12a430b6bb9b7ad8697a8fc3305cd4
DIST gene_ontology.obo 19990996 RMD160 b3584271ab0a05909cde9a92e6eb635b08fe23be SHA1 bdb9d396d4320bf639be310cf6f93b08b25ef0e9 SHA256 7f70c7a1dd4b75f6055f05c5e5445a49ecf20fed8172d54ec2d04722842ff19b
-EBUILD est2uni-0.27.ebuild 3258 RMD160 4cb0a29cfaaef9573f4e35dbcc649233b7f15563 SHA1 1b9d7ef1df4164e48f7d1dc0fce6367e29049f68 SHA256 0e9fb1acb658babb5de052910db4f86ae1dcd7108ca6aa11a03d150ad0f90838
-EBUILD est2uni-9999.ebuild 3351 RMD160 2a5eb12cb460e76c2bdea8f011e40b67e4a1a62a SHA1 8a422f75cf307669056b947a70126b8bacd9e46c SHA256 9816a7d559440e3cee5dd1e6c8cd423be330f32c9aa700d1d674d1d303277ad6
+EBUILD est2uni-0.27.ebuild 3292 RMD160 d676915e49ef8f3ec04da0391945441fd47028f1 SHA1 a349fbd92f6ec096f5cad8dbabb2769594531111 SHA256 e47c997ced2b2b01e4abc509349e389e9f1e3b272e696c606aa9d010984f2821
MISC metadata.xml 269 RMD160 53c242e331b0a82669ca7913da16dac854ab8dca SHA1 bc75ba3b0f5607ac5f396d3e8a99daf5ded5a7de SHA256 13472fd0615d2b381dbe36666fe1bbf3b1c34770aa409c6101b38741b4586f85
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4EiSQACgkQgAnW8HDreRaZuwCfYMccT5NROdxtN7jg0sFQZ4vh
+QE4AoLcFDH3moqCaBR2DMkuxrBu4i9NL
+=ZlWM
+-----END PGP SIGNATURE-----
diff --git a/sci-biology/est2uni/est2uni-0.27.ebuild b/sci-biology/est2uni/est2uni-0.27.ebuild
index 45eaf4290..7252b2f8a 100644
--- a/sci-biology/est2uni/est2uni-0.27.ebuild
+++ b/sci-biology/est2uni/est2uni-0.27.ebuild
@@ -4,16 +4,18 @@
EAPI=3
-inherit webapp eutils perl-module
+inherit eutils perl-module webapp
DESCRIPTION="EST assembly+annotation: a perl-based analysis pipeline including php-based web interface"
HOMEPAGE="http://cichlid.umd.edu/est2uni/download.php"
-SRC_URI="http://cichlid.umd.edu/est2uni/est2uni_0.27.tar.gz
- ftp://ftp.ncbi.nih.gov/pub/UniVec/UniVec
- ftp://ftp.ncbi.nih.gov/pub/UniVec/UniVec_Core
- http://www.geneontology.org/ontology/gene_ontology.obo
- http://www.geneontology.org/doc/GO.terms_and_ids"
-
+SRC_URI="
+ http://cichlid.umd.edu/est2uni/est2uni_0.27.tar.gz
+ ftp://ftp.ncbi.nih.gov/pub/UniVec/UniVec
+ ftp://ftp.ncbi.nih.gov/pub/UniVec/UniVec_Core
+ http://www.geneontology.org/ontology/gene_ontology.obo
+ http://www.geneontology.org/doc/GO.terms_and_ids"
+
+SLOT="0"
LICENSE="GPL-3"
KEYWORDS="~amd64 ~x86"
IUSE=""
@@ -31,10 +33,10 @@ RDEPEND="${DEPEND}
sci-biology/ncbi-tools
sci-biology/bioperl
sci-biology/exonerate
- perl-gcpan/go-perl
www-servers/apache
>=dev-db/mysql-4.1
<dev-lang/php-5.3"
+# perl-gcpan/go-perl
S="${WORKDIR}"/est2uni
@@ -45,7 +47,7 @@ src_prepare(){
}
src_compile(){
- "$(tc-getCC)" external_software/sputnik/sputnik.c -o external_software/sputnik/sputnik
+ $(tc-getCC) ${CFLAGS} ${LDFLAGS} external_software/sputnik/sputnik.c -o external_software/sputnik/sputnik || die
}
src_install(){
diff --git a/sci-biology/estscan/ChangeLog b/sci-biology/estscan/ChangeLog
new file mode 100644
index 000000000..ff0f2e4b0
--- /dev/null
+++ b/sci-biology/estscan/ChangeLog
@@ -0,0 +1,12 @@
+# ChangeLog for sci-biology/estscan
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 23 Jun 2011; Justin Lecher <jlec@gentoo.org> estscan-3.0.3.ebuild,
+ metadata.xml:
+ Streamlined fortran-2 eclass usage
+
+ 21 Jun 2011; Justin Lecher <jlec@gentoo.org> estscan-3.0.3.ebuild,
+ metadata.xml:
+ Added fortran-2.eclass support
+
diff --git a/sci-biology/estscan/Manifest b/sci-biology/estscan/Manifest
index 843cd8426..e41936f81 100644
--- a/sci-biology/estscan/Manifest
+++ b/sci-biology/estscan/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
DIST At.smat.gz 32314 RMD160 5c66e467d20e1ce43dce35cf20540649bbcf2879 SHA1 bd3e2d87be468e7d9c46557bce68e94bdd3f1aa2 SHA256 7f41329858b19ea13809becf58c7262b48dd8070dc38894b8ad7c55adcdd4c2a
DIST BTLib-0.19.tar.gz 36283 RMD160 14ae4a24c81a381e9a75ddcde7552a1f9dc301b8 SHA1 7a0545cb64976ee61e76a80a9ee1a87eb1747078 SHA256 0acd6446031222b8fd5bd11eb3ec6c3164bc50491feef765c052689d9c3ee302
DIST Dm.smat.gz 31711 RMD160 1e77b7f743ea9198108dff3dec2e8fd64ba8751c SHA1 6dd589a2dac0d4ea51ad085a835a5100b5eab8e1 SHA256 1f741836aa2b4ed96ab9ea6adb883eaa4d8d95610bd7a1ac484193ab30afca1d
@@ -7,5 +10,13 @@ DIST Mm.smat.gz 62711 RMD160 30cf8dd0d944afcae7dd05b30bc08820e303c7c4 SHA1 2d0d5
DIST Rn.smat.gz 32388 RMD160 4ff99c8502aa914c85aeaf19f98bc7362ab70cb0 SHA1 060e66141a19302e805323322ab219d990cf4592 SHA256 2e0a9b3347a8d216a026f98e38243d207e683bc50ac5be35c4c24f5ee1803cb8
DIST estscan-3.0.3.tar.gz 46412 RMD160 dc5e12e8196837585c405163f643e2da0c84bd79 SHA1 8af2128aaa02c50d1d3cfa75188fac038381975c SHA256 037dc8770681ed12406a789ea292462a4ce5d89b0e906a1a3340aa4debc71e2f
DIST user_guide_fev_07.pdf 327005 RMD160 99f838a2c61c82a5078fb49e06ab8c8a7a8c1509 SHA1 335b3bacf0af8947db57324a702d335e72d58abd SHA256 416998f9fc282a53679fd56585b468ccebc4463e61ee5e989d9b426ed6f725fd
-EBUILD estscan-3.0.3.ebuild 3959 RMD160 1e0db12b467d3d7cece9b5c3247214c702d783ce SHA1 aac4d9d5d39a9b239bf1d3b16567b9aa2469f5c5 SHA256 14e60176ea0493ec0e28ebca0e8b7165363b70e1165357c29ea6a49d804cb886
-MISC metadata.xml 269 RMD160 53c242e331b0a82669ca7913da16dac854ab8dca SHA1 bc75ba3b0f5607ac5f396d3e8a99daf5ded5a7de SHA256 13472fd0615d2b381dbe36666fe1bbf3b1c34770aa409c6101b38741b4586f85
+EBUILD estscan-3.0.3.ebuild 3627 RMD160 04e489ba6db85e382a3d55adbab168e46f09e791 SHA1 3412b7e3aa90ee4392a48b59fc3cd5712f0c3a1e SHA256 64c25c435fdaa15c814707ed13d3ad42ca7cac6f5cbb29d1d52ff432359aa4cc
+MISC ChangeLog 362 RMD160 fd6d014788fd1c68fd8e1e58b37c2ac0585fdb4d SHA1 5079e398e369900824f8b7f4d3ed176df88a1fd2 SHA256 96f00043d927fffa618ad23bc67589ce75caff6294afd1f4e16795cb47b09082
+MISC metadata.xml 326 RMD160 cdc20d05766f861cff6889339611ca1c22579631 SHA1 dddeeb441b46d5437d1883f7c44ea26ad704344e SHA256 530e03907f86440fdc52832f744b709dde2ee85492cad7b8a263544a93ea0bea
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4DAxcACgkQgAnW8HDreRYbrQCfRdlKYlwAQQu22Y741J7tR7t6
+jp0AoIpbBVtLAlueTxY2BLymUs2wbbGz
+=zCkB
+-----END PGP SIGNATURE-----
diff --git a/sci-biology/estscan/estscan-3.0.3.ebuild b/sci-biology/estscan/estscan-3.0.3.ebuild
index ed573427a..d2828605a 100644
--- a/sci-biology/estscan/estscan-3.0.3.ebuild
+++ b/sci-biology/estscan/estscan-3.0.3.ebuild
@@ -1,49 +1,54 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=3
+EAPI=4
-inherit eutils toolchain-funcs perl-module
+inherit eutils fortran-2 perl-module toolchain-funcs
-DESCRIPTION="Predict coding regions in DNA/RNA sequences even in low-quality reads with frameshift-causing errors (supersedes ESTscan and ESTscan2)"
+DESCRIPTION="Prediction of coding regions in DNA/RNA sequences"
HOMEPAGE="http://sourceforge.net/projects/estscan/"
-SRC_URI="http://downloads.sourceforge.net/estscan/estscan-3.0.3.tar.gz
- http://downloads.sourceforge.net/estscan/At.smat.gz
- http://downloads.sourceforge.net/estscan/Dm.smat.gz
- http://downloads.sourceforge.net/estscan/Dr.smat.gz
- http://downloads.sourceforge.net/estscan/Hs.smat.gz
- http://downloads.sourceforge.net/estscan/Mm.smat.gz
- http://downloads.sourceforge.net/estscan/Rn.smat.gz
- http://downloads.sourceforge.net/estscan/user_guide_fev_07.pdf
- http://downloads.sourceforge.net/estscan/BTLib-0.19.tar.gz"
+SRC_URI="
+ http://downloads.sourceforge.net/estscan/estscan-3.0.3.tar.gz
+ http://downloads.sourceforge.net/estscan/At.smat.gz
+ http://downloads.sourceforge.net/estscan/Dm.smat.gz
+ http://downloads.sourceforge.net/estscan/Dr.smat.gz
+ http://downloads.sourceforge.net/estscan/Hs.smat.gz
+ http://downloads.sourceforge.net/estscan/Mm.smat.gz
+ http://downloads.sourceforge.net/estscan/Rn.smat.gz
+ http://downloads.sourceforge.net/estscan/user_guide_fev_07.pdf
+ http://downloads.sourceforge.net/estscan/BTLib-0.19.tar.gz"
-LICENSE="estscan"
SLOT="0"
+LICENSE="estscan"
KEYWORDS="~x86 ~amd64"
-IUSE="icc ifc"
+IUSE="intel"
-DEPEND="icc? ( dev-lang/icc )
- ifc? ( dev-lang/ifc )"
-
-RDEPEND=""
+DEPEND="
+ virtual/fortran
+ intel? (
+ dev-lang/icc
+ dev-lang/ifc )"
+RDEPEND="${DEPEND}"
S="${WORKDIR}"
-src_compile() {
- #
- sed -e 's/\\rm -f/rm -rf/' \
- -e 's/^ LDFLAGS = -lm/LDFLAGS = -lm/' -i "${P}"/Makefile || die "failed to edit Makefile"
+src_prepare() {
+ sed \
+ -e 's/\\rm -f/rm -rf/' \
+ -e 's/^ LDFLAGS = -lm/LDFLAGS = -lm/' \
+ -i "${P}"/Makefile || die "failed to edit Makefile"
# fix hard-coded paths
sed -e 's+/usr/molbio/share/ESTScan+/usr/share/ESTscan+' -i "${P}"/estscan.c || die
sed -e 's+/usr/molbio/share/ESTScan+/usr/share/ESTscan+' -i "${P}"/estscan.spec || die
if ! use icc; then
- sed -e 's/^ CFLAGS = -O2/#CFLAGS = ${CFLAGS}/' \
+ sed \
+ -e 's/^ CFLAGS = -O2/#CFLAGS = ${CFLAGS}/' \
-e 's/^ FFLAGS = -O2/#FFLAGS = ${FFLAGS}/' \
-e "s/^ F77 = g77/F77 = $(tc-getF77)/" -i "${P}"/Makefile \
- || die "blah"
+ || die
else
# FIXME: I would use $(tc-getCC) instead of hard-coded icc but it gives
# me gcc instead, same for $(tc-getF77)
@@ -54,49 +59,55 @@ src_compile() {
# FIXME: below as a dirty hack I force gfortran instead of ifort for
# my testing purposes. Didn't ebuild contain "PROVIDES" line?
# Same for FFLAGS.
- sed -e "s:^# CC = icc:CC = icc:" \
- -e "s:^# CFLAGS = -O3 -ipo -axP:#CFLAGS = -O3 -ipo -axP:" \
+ sed \
+ -e "s:^# CC = icc:CC = icc:" \
+ -e "s:^# CFLAGS = -O3 -ipo -axP:#CFLAGS = -O3 -ipo -axP:" \
-e "s:^# FFLAGS = -O3 -ipo -axP:#FFLAGS = -O3 -ipo -axP:" \
-e "s/^ CFLAGS = -O2/#CFLAGS = -O2/" \
-e "s/^# F77 = ifort/F77 = gfortran/" \
-e "s/^ FFLAGS = -O2/#FFLAGS = -O2/" \
-e "s/^ CC = gcc/# CC = gcc/" \
- -e "s/^ F77 = g77/# F77 = g77/" -i "${P}"/Makefile || die "sed failed to fix CFLAGS, FFLAGS, CC, F77"
+ -e "s/^ F77 = g77/# F77 = g77/" \
+ -i "${P}"/Makefile || die "sed failed to fix CFLAGS, FFLAGS, CC, F77"
fi
- cd "${P}" || die "chdir "${P}" failed"
- emake || die "emake failed"
+}
+
+src_compile() {
+ emake -C ${P}
- cd ../BTLib-0.19 || die "cd ../BTLib-0.19 failed"
+ cd ../BTLib-0.19
perl Makefile.PL || die "perl Makefile.PL failed"
}
src_install() {
# FIXME: Some kind of documentation is in {P}/estscan.spec
- cd "${P}"
- dobin build_model estscan evaluate_model extract_EST extract_UG_EST extract_mRNA makesmat maskred prepare_data winsegshuffle || die "dobin failed"
+ cd ${P}
+ dobin \
+ build_model estscan evaluate_model extract_EST extract_UG_EST \
+ extract_mRNA makesmat maskred prepare_data winsegshuffle
# the file build_model_utils.pl should go into some PERL site-packages dir
# see {P}/estscan.spec
# install the doc (but is not in ${WORKDIR} because src_UNPACK() failed on it
- cd "${WORKDIR}" || die
+ cd "${WORKDIR}"
insinto /usr/share/doc/ESTscan
# grab the file directly from ../distdir/
- doins ../distdir/user_guide_fev_07.pdf || die "failed to install user_guide_fev_07.pdf"
+ doins ../distdir/user_guide_fev_07.pdf
# install the default precomputed matrices
- cd "${WORKDIR}" || die
+ cd "${WORKDIR}"
insinto /usr/share/ESTscan
- doins *.smat || die "Failed to install matrices"
+ doins *.smat
# install BTlib (in perl)
cd BTLib-0.19 || die
- dobin fetch indexer netfetch || die "dobin failed"
+ dobin fetch indexer netfetch
insinto /usr/share/ESTscan/
- doins fetch.conf || die "Failed to install fetch.conf"
+ doins fetch.conf
# FIXME: install the *.pm files from BTLib-0.19
myinst="DESTDIR=${D}"
- perl-module_src_install || die "perl-module_src_install failed"
+ perl-module_src_install
einfo "Please edit /usr/share/ESTscan/fetch.conf to fit your local database layout."
einfo "Also create your own scoring matrices and place them into /usr/share/ESTscan/."
diff --git a/sci-biology/estscan/metadata.xml b/sci-biology/estscan/metadata.xml
index 07b525505..a68ccd86c 100644
--- a/sci-biology/estscan/metadata.xml
+++ b/sci-biology/estscan/metadata.xml
@@ -6,4 +6,5 @@
<email>mmokrejs@fold.natur.cuni.cz</email>
<name>Martin Mokrejs</name>
</maintainer>
+<use><flag name='intel'> Use intel compiler</flag></use>
</pkgmetadata>
diff --git a/sci-biology/gap2caf/Manifest b/sci-biology/gap2caf/Manifest
index 20729601e..124d0831e 100644
--- a/sci-biology/gap2caf/Manifest
+++ b/sci-biology/gap2caf/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
DIST gap2caf-2.1.0.tar.gz 92905 RMD160 8b19963ca9e845d9bae2e7fb8253cb77bae78857 SHA1 fdbffcd159caf75d95207e54cab3c8b8270cc8e8 SHA256 1fd237cf1e83c3c4c3b67d2d35c9f059cc7eda9f6ac7886fab994e2386283b9a
DIST staden-2.0.0b8.tar.gz 4312143 RMD160 68b91a80fae29e0bf8f7e6ca1c0781591113684c SHA1 742092ff7bfb5acd3376ac85d5ab50507d1dd02f SHA256 c13aa0c22dcac6b10d13501dcb630efad51d7c171968e0bb30113667b49cfa9d
-EBUILD gap2caf-2.1.0.ebuild 2821 RMD160 adbdb532f4294ffe925b3aa11a56d0d0665d24c6 SHA1 63295defe7ff7529e7227e06177bc11045399d91 SHA256 e1ed6dd95796da36e4dca7c6128646685fca722093f7125ca4ebcbf7746ef27d
+EBUILD gap2caf-2.1.0.ebuild 2821 RMD160 ed85b15b7b8ed22673cedc4cd152e7ee1f849a37 SHA1 3f4f14dc652a405f84c505f60257328dd7a93c5b SHA256 0879da8f69fc4f0b5edcd0f8d8f34541f91dc47f824e2963e40a553fb6f17e53
MISC metadata.xml 269 RMD160 53c242e331b0a82669ca7913da16dac854ab8dca SHA1 bc75ba3b0f5607ac5f396d3e8a99daf5ded5a7de SHA256 13472fd0615d2b381dbe36666fe1bbf3b1c34770aa409c6101b38741b4586f85
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4EiSkACgkQgAnW8HDreRZ76wCeJr8TpFUJ0uDHlsOp7OWTId7f
+qDoAnRKBm+3GzKuz/fgyA2iDPVwcKS2K
+=7T4s
+-----END PGP SIGNATURE-----
diff --git a/sci-biology/gap2caf/gap2caf-2.1.0.ebuild b/sci-biology/gap2caf/gap2caf-2.1.0.ebuild
index 5aae263fd..861bbc8f0 100644
--- a/sci-biology/gap2caf/gap2caf-2.1.0.ebuild
+++ b/sci-biology/gap2caf/gap2caf-2.1.0.ebuild
@@ -4,7 +4,7 @@
EAPI=3
-inherit eutils autotools
+inherit autotools eutils
DESCRIPTION="GAP4 file format to CAF v2 format converter for genomic assembly data"
HOMEPAGE="http://www.sanger.ac.uk/resources/software/caf/"
diff --git a/sci-biology/gbrowse/ChangeLog b/sci-biology/gbrowse/ChangeLog
index 8024f81e1..e36ad4701 100644
--- a/sci-biology/gbrowse/ChangeLog
+++ b/sci-biology/gbrowse/ChangeLog
@@ -1,7 +1,20 @@
-# ChangeLog for sci-biology/generic-genome-browser
-# Copyright 2000-2010 Gentoo Foundation; Distributed under the GPL v2
+# ChangeLog for sci-biology/gbrowse
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-biology/generic-genome-browser/ChangeLog,v 1.10 2007/07/29 17:07:38 phreak Exp $
+*gbrowse-2.38 (26 Jun 2011)
+
+ 26 Jun 2011; Justin Lecher <jlec@gentoo.org> -gbrowse-2.26.ebuild,
+ -files/GBrowseInstall.pm-2.26.patch,
+ -files/GBrowseInstall.pm-disable-gbrowse_metadb_config.pl.pm-2.26.patch,
+ -gbrowse-2.33.ebuild, -files/GBrowseInstall.pm-2.33.patch,
+ +gbrowse-2.38.ebuild, +files/GBrowseInstall.pm-2.38.patch:
+ Version Bump
+
+ 25 Jun 2011; Justin Lecher <jlec@gentoo.org> -gbrowse-1.70.ebuild,
+ -gbrowse-2.00.ebuild, gbrowse-2.26.ebuild, gbrowse-2.33.ebuild:
+ Cleaned ebuild, 'http://search.cpan.org/CPAN' found in thirdpartymirrors
+
05 Feb 2010; Andrey Kislyuk <weaver@gentoo.org> ChangeLog:
Version bump
diff --git a/sci-biology/gbrowse/Manifest b/sci-biology/gbrowse/Manifest
index 96f87cdb3..101b58a14 100644
--- a/sci-biology/gbrowse/Manifest
+++ b/sci-biology/gbrowse/Manifest
@@ -1,13 +1,11 @@
-AUX GBrowseInstall.pm-2.26.patch 2647 RMD160 5acd26d95bf0c26edb0f816e840b43ef99a88ea3 SHA1 39362a38cff41097ead8c49de5eaf94d77c59f02 SHA256 1aee7359bc1b036f5d214975a5ea2395a507f04b0ee839ed3a1543a0ab4fb3c6
-AUX GBrowseInstall.pm-2.33.patch 1278 RMD160 96c7f2c66537c6e01cf2619018f608607c0927dc SHA1 a3cb874018d2c7a5acf34381971cc09d83a13f73 SHA256 5a1018f582c2e0ffca034d04ce73f678dd879d90932e4e89ea664c7c113f4b7c
-AUX GBrowseInstall.pm-disable-gbrowse_metadb_config.pl.pm-2.26.patch 1001 RMD160 6784a8d01714be237247d56df13de96681f3aea5 SHA1 55c3eac7eb1e11c766b8d430c7dd36336347ef50 SHA256 a25f49dba6609a25c799d0290713038b608f8aef1a4275eff5f1f12e5225a19a
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX GBrowseInstall.pm-2.38.patch 1278 RMD160 96c7f2c66537c6e01cf2619018f608607c0927dc SHA1 a3cb874018d2c7a5acf34381971cc09d83a13f73 SHA256 5a1018f582c2e0ffca034d04ce73f678dd879d90932e4e89ea664c7c113f4b7c
AUX gbrowse-slave.default 210 RMD160 77245190ab0d3a543f3103bb6f21864f73ea1cde SHA1 a19d60edd3fdc1f059ed8fa58f7e91fc47ec92dc SHA256 e4e6d68ade29681f442b2e1c7f8abbc7ff3255b3b8db3c59ed6368ba561d7d66
AUX gbrowse-slave.init.d 2196 RMD160 8b565d1be23c89cbae0f9fd5cd2201f47a564b94 SHA1 738bc8f06486a0e6caa72642f79f9b7dbb356524 SHA256 de511a92757153ee648eb6cd39e3c69c1e30fa2c2ed406f24c08571c72609219
AUX gbrowse.conf.vhosts.d 740 RMD160 e24f5132e37a84dd0bb9a39e2de99cd11d260844 SHA1 2c44fdcf04bef92eb6210d4e6667b994e5643a13 SHA256 8acd5a067ab3dd42cff0ab7cb0d783b2409ccb872590eba32ea55d4929f65f21
-DIST GBrowse-2.00.tar.gz 3844690 RMD160 f3856ca620d8adc10172d8dfb644dfbbd25cbf88 SHA1 9d78393ca21d2569a975cfff7588cb7fe62d1082 SHA256 62c96ae1c6c1494ff67fbea1fde0d80d5051705c22167a55db317a0d33b1b8ea
-DIST GBrowse-2.26.tar.gz 11937473 RMD160 c2c9d988e3183637b0a97f00e8de1387ad107eab SHA1 3153afc0ef7e6ea8ca6879343028673fdb062501 SHA256 4ac5c0fd87c5ab64b3c52ebb51f51433cb8c6062fd80a56d3de91f24594d3a3f
-DIST GBrowse-2.33.tar.gz 11915644 RMD160 0e2f054b4bcc2748895a856620af7e50f5e15038 SHA1 f31cbe960904b5a2ea4b7eae7a9d78baaf29fce0 SHA256 063114b844776a9500528437fb3dbc60f47a8ac380d910bd6b3148ec7cc0cc4b
-DIST Generic-Genome-Browser-1.70.tar.gz 3331393 RMD160 056f72fc17bdbf803fce7e6bdde406566a80c204 SHA1 7a83abaedc4d2b061e1247972036025a713a845f SHA256 e08ef0d1ffff8186bffd30177808ad3dd7991a99abf3ea6350c8d487ba835486
+DIST GBrowse-2.38.tar.gz 11966992 RMD160 dde50d49ee1b228103dffc9701e450ac9e3be3cd SHA1 4228a4938cbdbc409ddb23f81cd3186cdf15391d SHA256 acf7d3d0f32d0138640b2773ed580572ff63d646d4538f354dec8986607aa275
DIST README-gff-files 5309 RMD160 8ba184fa8a6b921f925143cf53de06e3da353023 SHA1 ad2d2b3133c73a05ace4a0107ff1a3a4221bc8f8 SHA256 21f4f026b212698c5aac0e82045670f8397ab50fdfe74b938fcbc71a1d36c82a
DIST Refseq_Genome_TBLASTX.tar.gz 56482234 RMD160 e188d9dfe12bed3fd299be4625f7e658f54bb8c4 SHA1 72ec3de9b9ca0e10c2dd8dcda24f9be74f98cf09 SHA256 7036bdd9aefbf44e384df83f4c1e973c1ab3eac8fe74b37499c4a3f1c55a18af
DIST fly.fasta.gz 37349852 RMD160 4bedfcc5d0ea3d325f3d3e446713251a8ce34ca3 SHA1 8f2c7a2f24dbab0f27c73009fe51efb8f41d6769 SHA256 892ed03e17edd3469f1ed00cb9967fb905bbac57c1cb7858667381f34a6bfeea
@@ -18,9 +16,13 @@ DIST worm.fasta.gz 30593662 RMD160 674ef3d09cdfaa5d748f18c0e769f0a5ca3d48cf SHA1
DIST worm.gff.gz 65789458 RMD160 ddced7c965963ce41a10bdecae949731ed305121 SHA1 ccfb0f287e27ff7849b099c81d811f468a7e617c SHA256 afd63c65c3fdb0ba8a1cf455bd4477a2d5d27d5b0e88c6a5a10d156d0567374f
DIST yeast.fasta.gz 3801757 RMD160 5545054cf6ffa5381c7992141144107076fdf62e SHA1 c36fddc5fd2c79e01292f66644088654304bc438 SHA256 bf51cbced31aa6a30bca43cc72fdb53194fbb403407e2ebb9d70c901ab072e6d
DIST yeast.gff.gz 249814 RMD160 64538d18de23d930915938bd00ae4a94a52f3960 SHA1 ec753b1ae409e1377f568531a53be8985a7bfa2e SHA256 20c93e6ba9457896a693d13e8fd8fa00d77acbb55aee9b19a31c2b29c4b7e9b1
-EBUILD gbrowse-1.70.ebuild 1670 RMD160 e9bf6980abebabc6ff807ea3c682a3988d0a5f14 SHA1 0413b93216348184e79b3feea36cd68618bed688 SHA256 ecb0b9290e48b82a0d29520d8418593db7baa564bb3731ed7ed808f1b4b5ff3f
-EBUILD gbrowse-2.00.ebuild 1932 RMD160 5a0d15a10c2f6f9e4ac1f60ce048efcd2311cdb4 SHA1 186d5a91fbae9b6894091ac376addb84784d6a03 SHA256 21b035ef921900bc893a4de0fe123b6192860265e0594b73723c24b03dd5a23c
-EBUILD gbrowse-2.26.ebuild 6959 RMD160 a3b966bad08410ea7e619b4cb6497a78836c6094 SHA1 ec109df87df0cfc0d72c35a1c662b2c85f495a10 SHA256 3020b2c5953e7bc02ed1e1e98a8b63bb69feda55101725d019201e748394e5b6
-EBUILD gbrowse-2.33.ebuild 6207 RMD160 20e3780fe421c5b83add7a52d4629a9e169994f0 SHA1 cb5c80a5e6f558f41b71a832e4384501a846271d SHA256 1dfe2823194c4ac30ffd2530d96c04c4a533592fbd1a6931584c0af74422cca3
-MISC ChangeLog 1985 RMD160 9695d7522c6165b842087b67938629377f9cc82b SHA1 3edd2e74f9b26289d95ad7609b838edb3ccb9561 SHA256 76c1d0553f09390397af4354dc653677f25d06828e42e57a60b2f35a869222ac
+EBUILD gbrowse-2.38.ebuild 6136 RMD160 9da72299772f44f80f9a653840fa167d04c1d3e5 SHA1 9a65efd853905e653b5a781128e45cc0e00e611a SHA256 db0cc819ad165d509c935e4cef5be3ee1f47d0e0a0a1ecb697ef6290b7259ad5
+MISC ChangeLog 2531 RMD160 a666bbe4d2aa432f678eb56d321db77686990b45 SHA1 d4950185a71e503373f25af3466fd876d2996249 SHA256 2c805b6e02263dfaf7b2c87ed68e8da2a8cbc1d23409968c36037105338038da
MISC metadata.xml 572 RMD160 bc941571413238acb3d77e61d49b959737ed4f5a SHA1 0c05303509c0e2dd21b37fc93c936809db49e530 SHA256 89b9964a9404a95dbb622a91735348da8e66d34d7dd7e7f144ed8c0159c43e31
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEAREIAAYFAk4G56MACgkQgAnW8HDreRaXVQCgwiv8qpUdbIu7rc522SjTi/lq
+cQ4AoMbh/D6qOR+v7qwowOCzPKmTktJb
+=+CVr
+-----END PGP SIGNATURE-----
diff --git a/sci-biology/gbrowse/files/GBrowseInstall.pm-2.26.patch b/sci-biology/gbrowse/files/GBrowseInstall.pm-2.26.patch
deleted file mode 100644
index 4c17f8d9a..000000000
--- a/sci-biology/gbrowse/files/GBrowseInstall.pm-2.26.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- install_util/GBrowseInstall.pm.ori 2010-11-27 12:01:58.000000000 +0100
-+++ install_util/GBrowseInstall.pm 2010-11-27 12:02:15.000000000 +0100
-@@ -436,8 +436,8 @@
- $self->ownership_warning($databases,$user);
- }
-
-- chmod 0755,File::Spec->catfile($self->install_path->{'etc'},'init.d','gbrowse-slave');
-- $self->fix_selinux;
-+ # chmod 0755,File::Spec->catfile($self->install_path->{'etc'},'init.d','gbrowse-slave');
-+ # $self->fix_selinux;
-
- my $base = basename($self->install_path->{htdocs});
-
---- install_util/GBrowseInstall.pm.ori 2011-02-14 13:39:46.000000000 +0100
-+++ install_util/GBrowseInstall.pm 2011-02-14 13:41:50.000000000 +0100
-@@ -438,25 +438,25 @@
- $gid =~ /^(\d+)$/;
- $gid = $1;
-
-- unless (chown $uid,$gid,$tmp) {
-- $self->ownership_warning($tmp,$user);
-- }
-+# unless (chown $uid,$gid,$tmp) {
-+# $self->ownership_warning($tmp,$user);
-+# }
-
- my $htdocs_i = File::Spec->catfile($self->install_path->{htdocs},'i');
- my $images = File::Spec->catfile($tmp,'images');
- my $htdocs = $self->install_path->{htdocs};
-- chown $uid,-1,$htdocs;
-- {
-- local $> = $uid;
-- symlink($images,$htdocs_i); # so symlinkifowner match works!
-- }
-- chown $>,-1,$self->install_path->{htdocs};
-+# chown $uid,-1,$htdocs;
-+# {
-+# local $> = $uid;
-+# symlink($images,$htdocs_i); # so symlinkifowner match works!
-+# }
-+# chown $>,-1,$self->install_path->{htdocs};
-
- my $databases = $self->install_path->{'databases'};
-
-- unless (chown $uid,$gid,glob(File::Spec->catfile($databases,'').'*')) {
-- $self->ownership_warning($databases,$user);
-- }
-+# unless (chown $uid,$gid,glob(File::Spec->catfile($databases,'').'*')) {
-+# $self->ownership_warning($databases,$user);
-+# }
-
- # chmod 0755,File::Spec->catfile($self->install_path->{'etc'},'init.d','gbrowse-slave');
- # $self->fix_selinux;
---- install_util/GBrowseInstall.pm.ori 2011-02-14 13:50:41.000000000 +0100
-+++ install_util/GBrowseInstall.pm 2011-02-14 13:51:46.000000000 +0100
-@@ -470,11 +470,11 @@
- my @inc = map{"-I$_"} split ':',$self->added_to_INC;
- system $perl,@inc,$metadb_script;
-
-- if (Module::Build->y_n(
-- "It is recommended that you restart Apache. Shall I try this for you?",'y'
-- )) {
-- system "sudo /etc/init.d/apache2 restart";
-- }
-+# if (Module::Build->y_n(
-+# "It is recommended that you restart Apache. Shall I try this for you?",'y'
-+# )) {
-+# system "sudo /etc/init.d/apache2 restart";
-+# }
-
- print STDERR "\n***INSTALLATION COMPLETE***\n";
- print STDERR "Load http://localhost/$base for demo and documentation.\n";
diff --git a/sci-biology/gbrowse/files/GBrowseInstall.pm-2.33.patch b/sci-biology/gbrowse/files/GBrowseInstall.pm-2.38.patch
index e91fe1634..e91fe1634 100644
--- a/sci-biology/gbrowse/files/GBrowseInstall.pm-2.33.patch
+++ b/sci-biology/gbrowse/files/GBrowseInstall.pm-2.38.patch
diff --git a/sci-biology/gbrowse/files/GBrowseInstall.pm-disable-gbrowse_metadb_config.pl.pm-2.26.patch b/sci-biology/gbrowse/files/GBrowseInstall.pm-disable-gbrowse_metadb_config.pl.pm-2.26.patch
deleted file mode 100644
index 0dde70406..000000000
--- a/sci-biology/gbrowse/files/GBrowseInstall.pm-disable-gbrowse_metadb_config.pl.pm-2.26.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- install_util/GBrowseInstall.pm.ori 2011-05-11 04:10:08.000000000 +0200
-+++ install_util/GBrowseInstall.pm 2011-05-11 04:10:26.000000000 +0200
-@@ -463,12 +463,12 @@
-
- my $base = basename($self->install_path->{htdocs});
-
-- # Configure the databases, if needed.
-- print STDERR "Updating user account database...\n";
-- my $metadb_script = File::Spec->catfile("bin", "gbrowse_metadb_config.pl");
-- my $perl = $self->perl;
-- my @inc = map{"-I$_"} split ':',$self->added_to_INC;
-- system $perl,@inc,$metadb_script;
-+# # Configure the databases, if needed.
-+# print STDERR "Updating user account database...\n";
-+# my $metadb_script = File::Spec->catfile("bin", "gbrowse_metadb_config.pl");
-+# my $perl = $self->perl;
-+# my @inc = map{"-I$_"} split ':',$self->added_to_INC;
-+# system $perl,@inc,$metadb_script;
-
- # if (Module::Build->y_n(
- # "It is recommended that you restart Apache. Shall I try this for you?",'y'
diff --git a/sci-biology/gbrowse/gbrowse-1.70.ebuild b/sci-biology/gbrowse/gbrowse-1.70.ebuild
deleted file mode 100644
index 9bf0f47ce..000000000
--- a/sci-biology/gbrowse/gbrowse-1.70.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/generic-genome-browser/generic-genome-browser-1.58.ebuild,v 1.9 2007/07/29 17:07:38 phreak Exp $
-
-EAPI="2"
-
-inherit perl-module webapp
-
-MY_P="Generic-Genome-Browser-${PV}"
-
-DESCRIPTION="The generic genome browser provides a display of genomic annotations on interactive web pages"
-HOMEPAGE="http://gmod.org"
-SRC_URI="mirror://sourceforge/gmod/${MY_P}.tar.gz"
-
-LICENSE="Artistic"
-# webapp ebuilds do not set SLOT
-KEYWORDS="~x86 ~amd64"
-IUSE="-minimal" # lwp moby scf
-
-S="${WORKDIR}/${MY_P}"
-
-# TODO: dev-perl/MOBY, dev-perl/Bio-SCF, dev-perl/libwww-perl, LWP
-DEPEND=">=dev-lang/perl-5.8.8
- >=sci-biology/bioperl-1.6
- >=dev-perl/GD-2.07
- dev-perl/IO-String
- virtual/perl-Digest-MD5
- >=dev-perl/CGI-Session-4.03
- dev-perl/Statistics-Descriptive
- >=dev-perl/Bio-Graphics-1.97"
-RDEPEND="${DEPEND}
- >=www-servers/apache-2.0.47
- >=virtual/perl-CGI-2.56
- dev-perl/DBI
- dev-perl/DBD-mysql
- dev-perl/Class-Base
- dev-perl/Text-Shellwords
- !minimal? (
- dev-perl/XML-Parser
- dev-perl/XML-Writer
- dev-perl/XML-Twig
- dev-perl/XML-DOM
- dev-perl/GD-SVG
- dev-perl/Bio-Das
- )"
-
-src_configure() {
- webapp_src_preinst
- perl Makefile.PL \
- HTDOCS="${D}/${MY_HTDOCSDIR}" \
- CGIBIN="${D}/${MY_HTDOCSDIR}/cgi-bin" \
- CONF="${D}/etc" \
- PREFIX="${D}/usr" \
- PACKAGE_DIR="${D}" \
- INSTALLDIRS=vendor \
- GBROWSE_ROOT=gbrowse \
- DESTDIR="${ROOT}" \
- || die
-}
-
-src_install() {
- mydoc="Changes README TODO INSTALL"
- perl-module_src_install
-
- # TODO: write our own readme
- webapp_postinst_txt en "${S}/INSTALL"
- webapp_src_install
-}
diff --git a/sci-biology/gbrowse/gbrowse-2.00.ebuild b/sci-biology/gbrowse/gbrowse-2.00.ebuild
deleted file mode 100644
index cce42a39b..000000000
--- a/sci-biology/gbrowse/gbrowse-2.00.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/generic-genome-browser/generic-genome-browser-1.58.ebuild,v 1.9 2007/07/29 17:07:38 phreak Exp $
-
-EAPI="2"
-
-inherit perl-module webapp
-
-MY_P="GBrowse-${PV}"
-
-DESCRIPTION="The generic genome browser provides a display of genomic annotations on interactive web pages"
-HOMEPAGE="http://gmod.org"
-SRC_URI="mirror://sourceforge/gmod/${MY_P}.tar.gz"
-
-LICENSE="Artistic"
-# webapp ebuilds do not set SLOT
-KEYWORDS="~x86 ~amd64"
-IUSE="-minimal" # lwp moby scf
-
-S="${WORKDIR}/${MY_P}"
-
-# TODO: dev-perl/MOBY, dev-perl/Bio-SCF, dev-perl/Safe-World (not compatible w/perl-5.10)
-DEPEND=">=dev-lang/perl-5.8.8
- >=sci-biology/bioperl-1.6
- >=dev-perl/GD-2.07
- dev-perl/IO-String
- virtual/perl-Digest-MD5
- >=dev-perl/CGI-Session-4.03
- dev-perl/Statistics-Descriptive
- >=dev-perl/Bio-Graphics-1.97
- dev-perl/JSON
- dev-perl/libwww-perl"
-RDEPEND="${DEPEND}
- >=www-servers/apache-2.0.47
- dev-perl/DBI
- || ( dev-perl/DBD-Pg dev-perl/DBD-mysql )
- !minimal? (
- dev-perl/File-NFSLock
- dev-perl/FCGI
- perl-core/Math-BigInt
- dev-perl/Digest-SHA1
- dev-perl/Crypt-SSLeay
- dev-perl/Net-SMTP-SSL
- dev-perl/GD-SVG
- dev-perl/Net-OpenID-Consumer
- virtual/perl-DB_File
- dev-perl/DB_File-Lock
- )"
-
-src_prepare() {
- sed -i 's/return unless -t STDIN/return/' install_util/GBrowseInstall.pm || die
-}
-
-src_configure() {
- webapp_src_preinst
- perl Makefile.PL \
- HTDOCS="${D}/${MY_HTDOCSDIR}" \
- CGIBIN="${D}/${MY_HTDOCSDIR}/cgi-bin" \
- CONF="${D}/etc" \
- PREFIX="${D}/usr" \
- PACKAGE_DIR="${D}" \
- INSTALLDIRS=vendor \
- GBROWSE_ROOT=gbrowse \
- DESTDIR="${ROOT}" \
- || die
-}
-
-src_install() {
- mydoc="Changes README TODO INSTALL"
- perl-module_src_install
-
- # TODO: write our own readme
- webapp_postinst_txt en "${S}/INSTALL"
- webapp_src_install
-# find "${D}" -type f | xargs sed -i "s|${D}||" || die
-}
diff --git a/sci-biology/gbrowse/gbrowse-2.26.ebuild b/sci-biology/gbrowse/gbrowse-2.26.ebuild
deleted file mode 100644
index 89000cfd4..000000000
--- a/sci-biology/gbrowse/gbrowse-2.26.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-EAPI="2"
-
-inherit perl-module webapp
-
-MY_P="GBrowse-${PV}"
-
-DESCRIPTION="The generic genome browser provides a display of genomic annotations on interactive web pages"
-HOMEPAGE="http://gmod.org"
-SRC_URI="mirror://sourceforge/gmod/${MY_P}.tar.gz
- test? ( http://sourceforge.net/projects/gmod/files/Generic%20Genome%20Browser/Sample%20Data%20Files/saccharomyces_cerevisiae.gff.bz2
- http://sourceforge.net/projects/gmod/files/Generic%20Genome%20Browser/Sample%20Data%20Files/Refseq_Genome_TBLASTX.tar.gz
- http://sourceforge.net/projects/gmod/files/Generic%20Genome%20Browser/Sample%20Data%20Files/README-gff-files
- http://sourceforge.net/projects/gmod/files/Generic%20Genome%20Browser/Sample%20Data%20Files/human.gff.tar.gz
- http://sourceforge.net/projects/gmod/files/Generic%20Genome%20Browser/Sample%20Data%20Files/yeast.fasta.gz
- http://sourceforge.net/projects/gmod/files/Generic%20Genome%20Browser/Sample%20Data%20Files/yeast.gff.gz
- http://sourceforge.net/projects/gmod/files/Generic%20Genome%20Browser/Sample%20Data%20Files/worm.fasta.gz
- http://sourceforge.net/projects/gmod/files/Generic%20Genome%20Browser/Sample%20Data%20Files/worm.gff.gz
- http://sourceforge.net/projects/gmod/files/Generic%20Genome%20Browser/Sample%20Data%20Files/fly.fasta.gz
- http://sourceforge.net/projects/gmod/files/Generic%20Genome%20Browser/Sample%20Data%20Files/fly.gff.gz )"
-
-LICENSE="Artistic"
-# webapp ebuilds do not set SLOT
-KEYWORDS="~x86 ~amd64"
-IUSE="-minimal svg test" # lwp moby scf
-
-S="${WORKDIR}/${MY_P}"
-
-# TODO: dev-perl/MOBY, dev-perl/Bio-SCF, dev-perl/Safe-World (not compatible w/perl-5.10)
-# TODO: make sure www-servers/apache +cgi
-DEPEND=">=dev-lang/perl-5.8.8
- dev-perl/Capture-Tiny
- >=sci-biology/bioperl-1.6
- >=dev-perl/GD-2.07
- dev-perl/IO-String
- virtual/perl-Digest-MD5
- >=dev-perl/CGI-Session-4.03
- dev-perl/Statistics-Descriptive
- >=dev-perl/Bio-Graphics-1.97
- dev-perl/JSON
- dev-perl/libwww-perl
- svg? ( dev-perl/GD-SVG )"
-
-# TODO: based on the following message in apache/error_log the list of deps should be longer
-# GBROWSE NOTICE: To enable PDF generation, please enter the directory "/home/httpd" and run the commands: "sudo mkdir .inkscape .gnome2" and "sudo chown apache .inkscape .gnome2". To turn off this message add "generate pdf = 0" to the [GENERAL] section of your GBrowse.conf configuration file., referer: http://127.0.0.1/gbrowse/cgi-bin/gbrowse_details/yeast?ref=chrII;start=90739;end=92028;name=YBL069W;class=Sequence;feature_id=881;db_id=annotations%3Adatabase
-
-# * Bio::DB::BigFile is not installed
-# * Bio::DB::Sam is not installed
-# * DBD::Pg is not installed
-
-RDEPEND="${DEPEND}
- >=www-servers/apache-2.0.47
- www-apache/mod_fastcgi
- dev-perl/DBI
- || ( dev-perl/DBD-Pg dev-perl/DBD-mysql )
- !minimal? (
- dev-perl/File-NFSLock
- dev-perl/FCGI
- perl-core/Math-BigInt
- perl-core/Math-BigInt-FastCalc
- dev-perl/Math-BigInt-GMP
- dev-perl/Digest-SHA1
- dev-perl/Crypt-SSLeay
- dev-perl/Net-SMTP-SSL
- dev-perl/Net-OpenID-Consumer
- virtual/perl-DB_File
- dev-perl/DB_File-Lock
- dev-perl/GD-SVG
- dev-perl/Text-Shellwords
- dev-perl/XML-Twig
- dev-perl/XML-DOM
- dev-perl/XML-Writer
- dev-perl/XML-Parser
- dev-perl/Bio-Das
- dev-perl/Text-Shellwords
- )"
-
-src_prepare() {
- sed -i 's/return unless -t STDIN/return/' install_util/GBrowseInstall.pm || die
- sed -i 's/process_/bp_process_/g' INSTALL || die
- epatch "${FILESDIR}"/GBrowseInstall.pm-"${PV}".patch || die "Failed to patch"
- epatch "${FILESDIR}"/GBrowseInstall.pm-disable-gbrowse_metadb_config.pl"${PV}".pm.patch || die "Failed to patch"
-}
-
-src_configure() {
- # GBROWSE_ROOT is the root path in SRC_URI to be prepended
- # /usr/share/webapps/gbrowse/2.03/htdocs/etc/gbrowse/GBrowse.conf
-
- # if we use CONF="${D}${MY_HTDOCSDIR}"/etc/gbrowse the the install process
- # will not find currently installed config files and therefore place *.conf
- # files into "{$S}"/blib/conf/*.conf instead of creating "{$S}"/blib/conf/*.conf.new
- webapp_src_preinst
- perl Makefile.PL \
- HTDOCS="${MY_HTDOCSDIR}" \
- CGIBIN="${MY_HTDOCSDIR}"/cgi-bin \
- CONF="${MY_HTDOCSDIR}"/etc/gbrowse \
- PACKAGE_DIR="${D}" \
- INSTALLDIRS=vendor \
- GBROWSE_ROOT="gbrowse" \
- DESTDIR="${D}" \
- DATABASES="/var/www/gbrowse2/databases/" \
- TMP="/var/tmp/gbrowse2" \
- INSTALLETC="n" \
- INSTALLCONF="n" \
- WWWUSER="apache" \
- DO_XS=1 \
- NONROOT=1 \
- || die
-
- #sed -i 's#DBI:SQLite:#DBI:SQLite:'${D}'#' "${S}"/install_util/GBrowseInstall.pm || die
- #sed -i 's#DBI:SQLite:#DBI:SQLite:'${D}'#' "${S}"/conf/GBrowse.conf || die
- #sed -i 's#/var/www/gbrowse2/databases/#'${D}'/var/www/gbrowse2/databases/#' "${S}"/_build/build_params
- #sed -i 's#/var/www/gbrowse2/databases/#'${D}'/var/www/gbrowse2/databases/#' "${S}"/_build/config_data
- #sed -i 's#/var/www/gbrowse2/databases/#'${D}'/var/www/gbrowse2/databases/#' "${S}"/_build/runtime_params
-}
-
-src_install() {
- mydoc="Changes README TODO INSTALL"
- perl-module_src_install
-
- # TODO: write our own readme
- webapp_src_preinst
- webapp_postinst_txt en "${S}"/INSTALL || die
- webapp_src_install
-
- # should create a /etc/init.d/ startup script based on this
- # /var/tmp/portage/sci-biology/gbrowse-2.03/work/GBrowse-2.03/etc/init.d/gbrowse-slave
-
- # pre-create the directory so we can force its owner later on
- mkdir -p "${D}"/var/www/gbrowse2/databases || die
- chown -R apache.apache "${D}"/var/www/gbrowse2/databases || die
- mkdir -p "${D}"/var/www/localhost/htdocs/gbrowse || die
-
- ln -s "${D}"/var/tmp/gbrowse2/images "${D}"/var/www/localhost/htdocs/gbrowse/i || die
-
- einfo "Probably you want to install a cron job to remove the generated temporary images:"
- einfo "find /var/tmp/gbrowse2/images -type f -atime +20 -print -exec rm {}"
-
- einfo "Make sure you compiled apache with +cgi and copy ${FILESDIR}/gbrowse.conf.vhosts.d to /etc/apache2/vhosts.d/"
-
- sed -i "s#"${D}"##g" "${S}"/install_util/GBrowseInstall.pm || die
- sed -i "s#"${D}"##" "${S}"/blib/conf/GBrowse.conf*
- sed -i 's#DBI:SQLite:'${D}'/var/www/gbrowse2/databases/#DBI:SQLite:/var/www/gbrowse2/databases/#' "${S}"/install_util/GBrowseInstall.pm || die
-}
-
-pkg_postinst() {
- webapp_pkg_postinst || die "webapp_pkg_postinst failed"
-
- einfo "Please run gbrowse_metadb_config.pl to upate SQlite flatfiles or the live database"
- einfo "This was disabled by "${FILESDIR}"/GBrowseInstall.pm-disable-gbrowse_metadb_config.pl.pm.patch"
-}
-
-src_test() {
- mysql -uroot -p password -e 'create database yeast'
- mysql -uroot -p password -e 'grant all privileges on yeast.* to gbrowse@localhost'
- mysql -uroot -p password -e 'grant file on *.* to gbrowse@localhost'
- mysql -uroot -p password -e 'grant select on yeast.* to nobody@localhost'
-
- cd /usr/portage/distfiles || die
- gzip -d yeast.fasta.gz || die
- gzip -d yeast.gff.gz || die
- #gzip -d fly.fasta.gz
- #gzip -d fly.gff.gz
- bp_bulk_load_gff.pl -d yeast -fasta yeast.fasta yeast.gff || die
-}
diff --git a/sci-biology/gbrowse/gbrowse-2.33.ebuild b/sci-biology/gbrowse/gbrowse-2.38.ebuild
index e2bcfc3be..9cc3ce479 100644
--- a/sci-biology/gbrowse/gbrowse-2.33.ebuild
+++ b/sci-biology/gbrowse/gbrowse-2.38.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
@@ -7,21 +7,23 @@ inherit perl-module webapp
MY_P="GBrowse-${PV}"
-DESCRIPTION="The generic genome browser provides a display of genomic annotations on interactive web pages"
-HOMEPAGE="http://gmod.org"
+DESCRIPTION="Display of genomic annotations on interactive web pages"
+HOMEPAGE="http://gmod.org/"
# mirror://sourceforge/gmod/${MY_P}.tar.gz
-# http://search.cpan.org/CPAN/authors/id/L/LD/LDS/GBrowse-2.33.tar.gz
-SRC_URI="http://search.cpan.org/CPAN/authors/id/L/LD/LDS/${MY_P}.tar.gz
- test? ( http://sourceforge.net/projects/gmod/files/Generic%20Genome%20Browser/Sample%20Data%20Files/saccharomyces_cerevisiae.gff.bz2
- http://sourceforge.net/projects/gmod/files/Generic%20Genome%20Browser/Sample%20Data%20Files/Refseq_Genome_TBLASTX.tar.gz
- http://sourceforge.net/projects/gmod/files/Generic%20Genome%20Browser/Sample%20Data%20Files/README-gff-files
- http://sourceforge.net/projects/gmod/files/Generic%20Genome%20Browser/Sample%20Data%20Files/human.gff.tar.gz
- http://sourceforge.net/projects/gmod/files/Generic%20Genome%20Browser/Sample%20Data%20Files/yeast.fasta.gz
- http://sourceforge.net/projects/gmod/files/Generic%20Genome%20Browser/Sample%20Data%20Files/yeast.gff.gz
- http://sourceforge.net/projects/gmod/files/Generic%20Genome%20Browser/Sample%20Data%20Files/worm.fasta.gz
- http://sourceforge.net/projects/gmod/files/Generic%20Genome%20Browser/Sample%20Data%20Files/worm.gff.gz
- http://sourceforge.net/projects/gmod/files/Generic%20Genome%20Browser/Sample%20Data%20Files/fly.fasta.gz
- http://sourceforge.net/projects/gmod/files/Generic%20Genome%20Browser/Sample%20Data%20Files/fly.gff.gz )"
+# mirror://cpan/authors/id/L/LD/LDS/GBrowse-2.33.tar.gz
+SRC_URI="
+ mirror://cpan/authors/id/L/LD/LDS/${MY_P}.tar.gz
+ test? (
+ http://sourceforge.net/projects/gmod/files/Generic%20Genome%20Browser/Sample%20Data%20Files/saccharomyces_cerevisiae.gff.bz2
+ http://sourceforge.net/projects/gmod/files/Generic%20Genome%20Browser/Sample%20Data%20Files/Refseq_Genome_TBLASTX.tar.gz
+ http://sourceforge.net/projects/gmod/files/Generic%20Genome%20Browser/Sample%20Data%20Files/README-gff-files
+ http://sourceforge.net/projects/gmod/files/Generic%20Genome%20Browser/Sample%20Data%20Files/human.gff.tar.gz
+ http://sourceforge.net/projects/gmod/files/Generic%20Genome%20Browser/Sample%20Data%20Files/yeast.fasta.gz
+ http://sourceforge.net/projects/gmod/files/Generic%20Genome%20Browser/Sample%20Data%20Files/yeast.gff.gz
+ http://sourceforge.net/projects/gmod/files/Generic%20Genome%20Browser/Sample%20Data%20Files/worm.fasta.gz
+ http://sourceforge.net/projects/gmod/files/Generic%20Genome%20Browser/Sample%20Data%20Files/worm.gff.gz
+ http://sourceforge.net/projects/gmod/files/Generic%20Genome%20Browser/Sample%20Data%20Files/fly.fasta.gz
+ http://sourceforge.net/projects/gmod/files/Generic%20Genome%20Browser/Sample%20Data%20Files/fly.gff.gz )"
LICENSE="Artistic"
# webapp ebuilds do not set SLOT
@@ -54,7 +56,6 @@ DEPEND="
# * Bio::DB::Sam is not installed
# * DBD::Pg is not installed
-
RDEPEND="${DEPEND}
>=www-servers/apache-2.0.47
www-apache/mod_fastcgi
diff --git a/sci-biology/mira/Manifest b/sci-biology/mira/Manifest
index f0061cf81..18b89f258 100644
--- a/sci-biology/mira/Manifest
+++ b/sci-biology/mira/Manifest
@@ -1,8 +1,11 @@
+AUX libtool.m4.patch 355 RMD160 3c6386ced352747fa274c1a6f70e5cff9969a050 SHA1 dddbed5cd51bb86209e6108d542fdb13c0481341 SHA256 58065ce386008c4843ea42e30d406257e25656ae7870c6e6f65735f1a84326ed
AUX mira-3.0.0-asneeded.patch 1468 RMD160 5ad66bd3a1861ef984af4fb2b527755fd8901440 SHA1 f17e537e98f77eeaaf7502894f8383dd96c588bc SHA256 17dec784921baccf2c515f7c269209b5cdeb23143b3412e8ad967e74682ee71f
AUX mira_left_clip.readpool.C.patch 1036 RMD160 ed1fb66fb936958df8fb5ffe830bd367e2a68a19 SHA1 8a3f0cd92c86adf6131dc5a8e52ab9de5bbbb6e0 SHA256 63e027658e7ce7418641477294af473a7c9253c20374e6918254f8e2404d1212
DIST mira-3.2.1.17.tar.bz2 9611305 RMD160 b9a124c572763fa8923c1b1ee5b12e54b881b67c SHA1 a2731ba4da5af9f0c575ff355a481ea0190dd898 SHA256 2d79ebbbfc6801ff500cabd79cd63358e50296fbdcd1aed4028ea52503d76f8c
+DIST mira-3.2.1.18.tar.bz2 9614978 RMD160 39e7afc6dfe1b97b5b7b2201b7b970ca9eb3222a SHA1 07d8c98c7234919411f55e915d1f8f483eb1e883 SHA256 9e05870da7828981a265fa79b717858959538593b4985cd4244fe4b16ebf709a
DIST mira-3.2.1.tar.bz2 9626154 RMD160 b998226fe4ea0efbe6023dac8b073af1782167b9 SHA1 432d1ecd2acb62a8584f29a10b55943165cd0586 SHA256 86a2c00d182573008ef41f7725aec72ea69756ea9f3dc7e798a7d253a47f8bd7
DIST mira_3rdparty_17-04-2010.tar.bz2 31296 RMD160 888a38f865963b3109d3a331604e079010b55d81 SHA1 5f2fbe3e2e1bb5c5de44d414963e57b8dbcf760c SHA256 ec2c77508d75b7c28d3d26137ab69648b1ed653af93d486245ad0e4624e332b2
-EBUILD mira-3.2.1-r2.ebuild 1625 RMD160 0cbe968caf227b01a11d1c96ffb5f4706d47a542 SHA1 446130eb9a3a900147ae4d01cbe821f007987814 SHA256 659a3a9c1a9d60c64c990e9899e8d571676dd3aafc648867d49846fe04fe43e2
-EBUILD mira-3.2.1.17-r1.ebuild 1985 RMD160 58d00d38cee873a88779206cf6813a0be759756e SHA1 7649c28cd3f21b5eca0233686efbc9833268ef04 SHA256 dc47d01298cc48d80698869fade197462f2e7ed319d7fe70c5e932838288acc8
+EBUILD mira-3.2.1-r2.ebuild 1664 RMD160 be0cc98203c14df172ceeaa8594ba81a9dda8040 SHA1 2742271c780c73dd05e0549486e63bea1683631c SHA256 fbd24bad5133e64bc38055b038ae6093b2fcc024d66c04dffa2ca2f5d067d39c
+EBUILD mira-3.2.1.17-r1.ebuild 1751 RMD160 02c62d754aac7173934f587ffe3bb005c893b5cd SHA1 269b9c4dd37e4568b9c3506c2e12fdb3d56dd12b SHA256 f80038926310bb16f9f9d6bf99e662b96a0f53195462bd59ea6130b76393ae06
+EBUILD mira-3.2.1.18.ebuild 1788 RMD160 ab3617a08c3daf04ccb737588856952dec8ee593 SHA1 bdecda83ee1cf7185b1b98c38fd8497a3dbfa1ce SHA256 535493e9bf59476570cd979176d58a2a03d25b5776459ad61eaa82113415efaa
MISC metadata.xml 269 RMD160 53c242e331b0a82669ca7913da16dac854ab8dca SHA1 bc75ba3b0f5607ac5f396d3e8a99daf5ded5a7de SHA256 13472fd0615d2b381dbe36666fe1bbf3b1c34770aa409c6101b38741b4586f85
diff --git a/sci-biology/mira/files/libtool.m4.patch b/sci-biology/mira/files/libtool.m4.patch
new file mode 100644
index 000000000..9cfaeef09
--- /dev/null
+++ b/sci-biology/mira/files/libtool.m4.patch
@@ -0,0 +1,13 @@
+--- config/m4/libtool.m4.ori 2011-06-22 12:28:14.000000000 +0200
++++ config/m4/libtool.m4 2011-06-22 12:28:39.000000000 +0200
+@@ -88,10 +88,6 @@
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ltmain"
+