diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2010-07-03 09:25:03 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2010-07-03 09:25:03 +0000 |
| commit | a808a9fd2c2464c44b6629cb5666ce375d97f865 (patch) | |
| tree | 9de788f3faebe1024dec17f61bd47b3531f240d8 /sci-libs | |
| parent | Strip CFLAGS from qmake wrt bug #312689 (diff) | |
| download | historical-a808a9fd2c2464c44b6629cb5666ce375d97f865.tar.gz historical-a808a9fd2c2464c44b6629cb5666ce375d97f865.tar.bz2 historical-a808a9fd2c2464c44b6629cb5666ce375d97f865.zip | |
Fixed file collision
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'sci-libs')
| -rw-r--r-- | sci-libs/ccp4-libs/Manifest | 8 | ||||
| -rw-r--r-- | sci-libs/ccp4-libs/files/6.1.3-noinstall.patch | 10 |
2 files changed, 10 insertions, 8 deletions
diff --git a/sci-libs/ccp4-libs/Manifest b/sci-libs/ccp4-libs/Manifest index 6e0abe8a7bcf..46267e2c3e8f 100644 --- a/sci-libs/ccp4-libs/Manifest +++ b/sci-libs/ccp4-libs/Manifest @@ -7,7 +7,7 @@ AUX 6.1.3-dont-build-mmdb.patch 749 RMD160 2f4b04d07095d464f00522a935cb93c2dae40 AUX 6.1.3-dont-make-dirs-in-configure.patch 2866 RMD160 ba49e45ab609a42a2d93b96f55af913bf9625610 SHA1 36c9329c3768c08687ef062c9ab649d32833b422 SHA256 1b5997f17526a4fd60ffa9eccf4b765aadf3a78c9394657000e0454f364240ca AUX 6.1.3-glibc2.10.patch 1018 RMD160 577ee4a6174df36bb8bac82738523f5c757df4b9 SHA1 48ad6d0d024c43d64277e4decba420d51e75a510 SHA256 d2a2ddf2a66738d94723b50797e279f64c8e057a3e584e33f9eb9c8d7ea0e532 AUX 6.1.3-link-proberly.patch 8282 RMD160 c45d3d1931e6a083c0c96b819aff3f67873659b8 SHA1 b1be6f1f7162616a60f3e12fe02dbe4dd426e990 SHA256 f6623dfb0d270e5fbffe03f95b23c967ec8da34b3d0a1c5262941979a965f9ea -AUX 6.1.3-noinstall.patch 5107 RMD160 aa46bf2511627656aebdf9b7da864fde1ae8956f SHA1 4bdf82c46b917c73dd36ceddc1a40ce1f32164f1 SHA256 01c3a769e4dbbbad0f5a5ce6452fe12fee464f0aa3e981c06a0c2fd2bc20b61c +AUX 6.1.3-noinstall.patch 5188 RMD160 d3b22f11d7c27b37243b003f03615af377c8e632 SHA1 d75402e7b23d3aa15e67cda6cec8c93864d509c2 SHA256 22d96aea9d3d5e6e090713e610b35bdb34eaff9157c41687b47294f0d62ccff7 AUX 6.1.3-unbundle-libs.patch 9063 RMD160 326af0e6990134546fb2607dae707b94d4588149 SHA1 ef929532e45c12fb168e5fca4eb7fa8c857c376a SHA256 7e5fc919b5204e2d9141f7715afdd8a8b4e3e2a96e2bf95aa00fbd56046f1aa4 DIST ccp4-6.1.3-core-src.tar.gz 242134076 RMD160 e9b7deb0766fb95d5e8946881f20e086f0896fe9 SHA1 ee5ada892694db5dc9b2d7d2330b4ac694f56580 SHA256 1e529c660e7f390ec0feca9d45caa00a2813d23156c10a2747c427117293c324 EBUILD ccp4-libs-6.1.3-r1.ebuild 6141 RMD160 7b49aedef260644eb31dc5581bffa58f2b452479 SHA1 70c015dc857ee9afc19bdfb8189bcae3c1f57e61 SHA256 54c6997a9ef747c29ae6e1497e83c1f2465ecb9c75cdb73b578caeb89b17dabf @@ -19,7 +19,7 @@ MISC metadata.xml 306 RMD160 57ba72f54388a666851bda87e52d313d618084e3 SHA1 7d2f5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkwu74cACgkQgAnW8HDreRZ7ogCfVl01+pkstM8ahNiYAszRIGNM -BcsAoIvjXWlPuHFUEYztYooc27GXt0cG -=Nph7 +iEYEARECAAYFAkwvAfQACgkQgAnW8HDreRYx/QCcD5hqly9BfRsGkHc9DWnfFzjW +9TcAoJ+YhtIYXjZB5RR+BY8DF9BoHrK2 +=4/tV -----END PGP SIGNATURE----- diff --git a/sci-libs/ccp4-libs/files/6.1.3-noinstall.patch b/sci-libs/ccp4-libs/files/6.1.3-noinstall.patch index 37bf77c27796..c1479f2b1155 100644 --- a/sci-libs/ccp4-libs/files/6.1.3-noinstall.patch +++ b/sci-libs/ccp4-libs/files/6.1.3-noinstall.patch @@ -74,7 +74,7 @@ index 975f1d9..75eda9f 100755 uninstall : diff --git a/lib/data/Makefile.in b/lib/data/Makefile.in -index cc25c5c..f51ccbe 100755 +index cc25c5c..017502d 100755 --- a/lib/data/Makefile.in +++ b/lib/data/Makefile.in @@ -30,9 +30,9 @@ font84.dat : fontpack $(srcdir)/font84.ascii @@ -91,7 +91,7 @@ index cc25c5c..f51ccbe 100755 uninstall : -rm -f $(libdir)/font84.dat diff --git a/lib/src/Makefile.in b/lib/src/Makefile.in -index b32dd1e..cfa8852 100755 +index b32dd1e..6aa107d 100755 --- a/lib/src/Makefile.in +++ b/lib/src/Makefile.in @@ -685,7 +685,7 @@ testlib : $(srcdir)/testlib.f $(LF) @@ -103,14 +103,16 @@ index b32dd1e..cfa8852 100755 @list='$(ccp4_HEADERS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ -@@ -717,10 +717,10 @@ uninstall-mmdbHEADERS: +@@ -716,11 +716,11 @@ uninstall-mmdbHEADERS: + rm -f $(DESTDIR)$(includedir)/mmdb/$$f; \ done - install : all install-ccp4HEADERS install-mmdbHEADERS +-install : all install-ccp4HEADERS install-mmdbHEADERS - $(INSTALL_DATA) `pwd`/$(LC) $(libdir)/$(LC) - $(INSTALL_DATA) `pwd`/$(LF) $(libdir)/$(LF) - $(RANLIB) $(libdir)/$(LC) - $(RANLIB) $(libdir)/$(LF) ++install : all install-ccp4HEADERS + $(RANLIB) $(LC) + $(RANLIB) $(LF) + $(INSTALL_DATA) `pwd`/$(LC) $(DESTDIR)/$(libdir)/$(LC) |