diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2011-01-20 20:07:25 +0100 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2011-01-20 20:07:25 +0100 |
| commit | afc18d22720c5f46c8574a710046ec2a742e4dae (patch) | |
| tree | 5436caa5a704c5cb71787176d858a2ea50d34197 /sci-chemistry/nmrpipe/Manifest | |
| parent | Added missing variable installation in revbump (diff) | |
| parent | sys-cluster/ceph-0.24.1 version bump (diff) | |
| download | sci-afc18d22720c5f46c8574a710046ec2a742e4dae.tar.gz sci-afc18d22720c5f46c8574a710046ec2a742e4dae.tar.bz2 sci-afc18d22720c5f46c8574a710046ec2a742e4dae.zip | |
Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/sci
* 'master' of git+ssh://git.overlays.gentoo.org/proj/sci: (36 commits)
sys-cluster/ceph-0.24.1 version bump
The conditional use of several configure options tweaked to actually work even if a USE flag is unset. Reported by Jérôme Borme <jerome.borme@gmail.com>
Fixing categories, #351818
Corrected the sources location. Thanks to jerome.borme@laposte.net from bug 329429.
[sci-chemistry/gromacs] qa fixes
A libxc ebuild for sci-physics/abinit
A FoX ebuild for sci-physics/abinit
An ETSF IO ebuild for sci-physics/abinit
A bigDFT ebuild for sci-physics/abinit; not the latest version but the abinit compatible one.
An ebuild for abinit-6.4.2 using external dependencies as proper Gentoo packages. Based on bug 249493, still work in progress. With USE="smp" compiles, but crashes.
A wannier90 ebuild for sci-physics/abinit
An ebuild for abinit-6.4.2 using external dependencies as proper Gentoo packages. Based on bug 249493, still work in progress. With USE="smp" compiles, but crashes.
[sys-cluster/pacemaker] cib needs to build before pengine
[sys-cluster/pacemaker] further fixes
Also get rid of valpha.tar during installation
Update manifest
[sys-cluster/pacemaker] add bits missed in previous commit
[sys-cluster/pacemaker] fix lib ordering wrt #351329. Thanks to Rafał Mużyło <galtgendo@o2.pl> for suggestion.
[sys-cluster/pacemaker] fix autotools issues, patch send upstream
[dev-vcs/mercurial-server] InCVS
...
Conflicts:
sci-chemistry/coot/ChangeLog
sci-chemistry/coot/Manifest
sci-chemistry/coot/coot-9999.ebuild
sci-chemistry/coot/files/9999-goocanvas.patch
sci-chemistry/nmrpipe/ChangeLog
sci-chemistry/nmrpipe/Manifest
Diffstat (limited to 'sci-chemistry/nmrpipe/Manifest')
| -rw-r--r-- | sci-chemistry/nmrpipe/Manifest | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sci-chemistry/nmrpipe/Manifest b/sci-chemistry/nmrpipe/Manifest index 298e9444f..b65f6bc43 100644 --- a/sci-chemistry/nmrpipe/Manifest +++ b/sci-chemistry/nmrpipe/Manifest @@ -10,13 +10,24 @@ DIST dyn.tZ 136682639 RMD160 0d6bc9fdf55bc6a8da43b1f4d0f972f36d09d2de SHA1 ea233 DIST install.com 36668 RMD160 ece053299c38a5acc892166b045f6e6aa43ce987 SHA1 39d386a06c478d4d3a5ca79cf3b5cb621114a61a SHA256 4b983b222bf2e777de2779c0d872c9ecf5f3ea13f7dc6b768b615be3b4ae1dd2 DIST talos.tZ 48960469 RMD160 d3b73c7b05f227b4c4062cca2ad5dfe7c5db5416 SHA1 04905120b4d4a10d549e07f0186abf73d3f81099 SHA256 ada4c026ea971d5f5be03611f3226a708dd48a95448ef48f694f2581685e546b DIST valpha_all.tar 699166720 RMD160 75ebf0a84524212cd25d62ba33f6a5edca05dd20 SHA1 a8be07ac97a826e44ed240946217a50fd3e8ba1e SHA256 3f2ff243e1d0e2508f20ec1ab6108eb986bcc1bc4c9ec79b4ff8ce6584805b0a +<<<<<<< HEAD EBUILD nmrpipe-5.5.2011.004.17.58-r1.ebuild 5458 RMD160 7c910c0e0082c6c2f8a0a05c4bb8d5db3929ef54 SHA1 48d7df08d666aa453327dd5693e66adc53689d52 SHA256 1c9d82ab889b63b112572a4693e71864d1f163874a1297fdc448fac772d01d5a MISC ChangeLog 8928 RMD160 9572636730c9eca060c0269403bf5ede04c022c1 SHA1 ff49cbb2bf90fb8f52dd875607b4c45d30b0d385 SHA256 e9f3ab5bd8bd8ed1e7b05e3eee190c7a352150110eca1d0a520c6171d13a3c10 +======= +EBUILD nmrpipe-5.5.2011.004.17.58.ebuild 5469 RMD160 40bd9d71fcae5622d867aa0a6ff27fd99e717f87 SHA1 df884ab7d786a60d154b06dd87a0f7e9febf328f SHA256 528486af2eae4a2560cb45b5638789f805685c65e0c34d22702f7c79bf0f20d5 +MISC ChangeLog 8817 RMD160 5dc8f7c4961c92b70ad0935b9cce04a32c3a8776 SHA1 2fa4f5bb1c40adb812e35dd734f1ed518330907d SHA256 943db1637fecbbe1202a880d590f68cce55587419554467c957d3c48a7588202 +>>>>>>> ba2535e41dc66bb7c69216eb6050b608f8af8482 MISC metadata.xml 249 RMD160 789eca813b850a4619f671586826b824098ec47b SHA1 554c0cc8335f6d6410f6f504bf032a7c6de36c89 SHA256 c3f71fe107b700acc3c21923ed360604cfd47ac3181d9ed7605a0472250a8064 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) +<<<<<<< HEAD iEYEARECAAYFAk04hwgACgkQgAnW8HDreRYxlwCZASaUlHr0HWiKX8FS+z4U03IH QdoAnjNlRqm7ktIy25GTo//i+kfvz6sA =6GQJ +======= +iEYEARECAAYFAk0xglgACgkQgAnW8HDreRZlGgCgnJNpjG0RKo48N4YP6MSoFtv8 +D8cAoIcKLs/WIzJCkQbuhihkRglx9OqC +=J3yi +>>>>>>> ba2535e41dc66bb7c69216eb6050b608f8af8482 -----END PGP SIGNATURE----- |