summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2010-01-28 19:00:48 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2010-01-28 19:00:48 +0000
commit18aee0b2bbbe63630318a8450a24eeff99c05cd7 (patch)
tree82974194bb4d256237526ea019d4b923a87d22d7 /sci-libs/pgplot
parentVersion bump. Dropped old. amd64/x86 stable, bug #198632. (diff)
downloadhistorical-18aee0b2bbbe63630318a8450a24eeff99c05cd7.tar.gz
historical-18aee0b2bbbe63630318a8450a24eeff99c05cd7.tar.bz2
historical-18aee0b2bbbe63630318a8450a24eeff99c05cd7.zip
Fixed some orders in the linking process
Package-Manager: portage-2.2_rc61/cvs/Linux x86_64
Diffstat (limited to 'sci-libs/pgplot')
-rw-r--r--sci-libs/pgplot/Manifest12
-rw-r--r--sci-libs/pgplot/files/pgplot-compile-setup.patch4
-rw-r--r--sci-libs/pgplot/files/pgplot-makemake.patch8
3 files changed, 12 insertions, 12 deletions
diff --git a/sci-libs/pgplot/Manifest b/sci-libs/pgplot/Manifest
index c8cb07eb5320..7ca8aafdf99a 100644
--- a/sci-libs/pgplot/Manifest
+++ b/sci-libs/pgplot/Manifest
@@ -1,19 +1,19 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-AUX pgplot-compile-setup.patch 3078 RMD160 657603774f58429b889dfcdeb814812f8499dfc4 SHA1 6835488ea7427b9c029c3df40b14c7d2f99fcd1d SHA256 840bb9977cd61705a459a9c11d0b7c53440539132d3e3538d901c4a441d1909f
+AUX pgplot-compile-setup.patch 3034 RMD160 bb694b1a549b285144ae8e197423d412d123bf3d SHA1 3c72b4c09c68f43865ef03ac92313c124f9827db SHA256 d42ec9479298e8a4a2acb0165d457422fa484a700ac05e53b90dde786c1a044f
AUX pgplot-drivers.patch 7431 RMD160 d300ecf9d5ed3b3117465330e4c235a3f17d0540 SHA1 d1cd686dd0f93b7550affe1e0d4d36f0a336b440 SHA256 19cabb29fd05c2c44cbb0492167ee3e45ab8890390b1e98de672f2ca2588baed
AUX pgplot-headers.patch 2716 RMD160 aaad73bfbea9b4f731346a02c390e0adc318f8d0 SHA1 e6b95497b519a5450a24bb5997e18019c73e33eb SHA256 e92a07e38fff278218c09b84453d5c75be663576bdbe19ed9259615bd7a0be7c
-AUX pgplot-makemake.patch 4417 RMD160 1048def60e9d1bbab675e58269d0cc4fef78cda6 SHA1 b00da00521863239f1c32df5d48012cf89777eb3 SHA256 2e9515c5154da98cb385e8d56b9b106c0415aed268ce5d366d37b12a97ade4aa
+AUX pgplot-makemake.patch 4455 RMD160 5535ad4a42795d3395a79bbea5fd5dbe6357cd5f SHA1 e16937eebade8ae14d8242c9c37715f1dc260163 SHA256 c1a02f579910b793dcd6c9da606c0091ba6ff2f4f36a5a1661c9793371501bb4
AUX pgplot-pgdisp.patch 332 RMD160 1bd3c2ed7770bb60be19c50c4610c35d67bf92e9 SHA1 891475823d011156aa919fc2b844d1786ae6d85f SHA256 3aac6127d35f4039023a13182553b24e1902d6e1b46530fbd68e034357d0b078
DIST pgplot522.tar.gz 1197397 RMD160 4c21cad6613772f4104c65ac3d8d9a42e3c4afe1 SHA1 1f1c9aa17eeec9a2fb23fd15a0e4a91dcc49ddc1 SHA256 a5799ff719a510d84d26df4ae7409ae61fe66477e3f1e8820422a9a4727a5be4
EBUILD pgplot-5.2.2-r3.ebuild 4627 RMD160 6d5cbf17459e80bbf381e14daab537ff3fb75ec2 SHA1 86b289e8050b10651f2d23e25989af8a92f4e1ac SHA256 e72eacdc34ab065b9e5fb8f6b291fce8628b340e1f766edb293642c82a59e1c6
MISC ChangeLog 3367 RMD160 d4df7ce789961fa11f5f7928bce02d348f4c5c50 SHA1 19af82d8f8ae6d61f782a47aa87a44ee9e43c5c0 SHA256 a20511e71691aad51e48a0df9141807097b814a1e0b7246398e16b47a32bb4cf
MISC metadata.xml 517 RMD160 27e91597c28b40b94a27548baeb7d1c6768eff77 SHA1 cabae2f60e330d39b41be431df8cf8b4ff84c642 SHA256 c0a4ba04ced31cde679aa0a17c19d313bbe9a5d4cd0771ba9b4af968c92c79f1
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
-iEYEARECAAYFAkmi3UcACgkQ1ycZbhPLE2D0ngCff5FH8i39CZnKefv8JUAE5B6Q
-tcgAoI+ez5lByeEbB1yq/u3XW1VOjnAJ
-=lE3W
+iEYEARECAAYFAkth3ukACgkQ1ycZbhPLE2BR2QCgl2IfettO3Pxe9NMCWoebF3+w
+yZsAoK4Td758v4Mtce0N/2rEDrTIF93S
+=Egyn
-----END PGP SIGNATURE-----
diff --git a/sci-libs/pgplot/files/pgplot-compile-setup.patch b/sci-libs/pgplot/files/pgplot-compile-setup.patch
index e6eecbc54bd9..f1709c333f4f 100644
--- a/sci-libs/pgplot/files/pgplot-compile-setup.patch
+++ b/sci-libs/pgplot/files/pgplot-compile-setup.patch
@@ -77,9 +77,9 @@
# How to create a shared library from a trailing list of object files.
- SHARED_LD="gcc -shared -o $SHARED_LIB"
-+ SHARED_LD_PGPLOT_OPTS="-o $SHARED_LIB -Wl,-soname,$SHARED_LIB $LDFLAGS"
++ SHARED_LD_PGPLOT_OPTS="$LDFLAGS -Wl,-soname,$SHARED_LIB"
+
-+ SHARED_LD_CPGPLOT_OPTS="-o $SHARED_CLIB -Wl,-soname,$SHARED_CLIB -L. -lpgplot $LDFLAGS"
++ SHARED_LD_CPGPLOT_OPTS="$LDFLAGS -Wl,-soname,$SHARED_CLIB"
+
+ SHARED_LD="$FCOMPL -shared"
diff --git a/sci-libs/pgplot/files/pgplot-makemake.patch b/sci-libs/pgplot/files/pgplot-makemake.patch
index 667ce2f1ee86..f1fed866ecd6 100644
--- a/sci-libs/pgplot/files/pgplot-makemake.patch
+++ b/sci-libs/pgplot/files/pgplot-makemake.patch
@@ -1,5 +1,5 @@
---- makemake.orig 2008-11-07 12:53:03.000000000 +0000
-+++ makemake 2008-11-07 12:52:33.000000000 +0000
+--- makemake.orig 2010-01-28 18:57:25.000000000 +0000
++++ makemake 2010-01-28 18:59:06.000000000 +0000
@@ -73,7 +73,7 @@
# List the default make targets.
@@ -81,7 +81,7 @@
+ $(GR_ROUTINES) $(DISPATCH_ROUTINE) $(DRIVERS) $(SYSTEM_ROUTINES)
+ $(SHARED_LD) $(SHARED_LD_PGPLOT_OPTS) `ls $(PG_ROUTINES) \
+ $(PG_NON_STANDARD) $(GR_ROUTINES) $(DISPATCH_ROUTINE) \
-+ $(DRIVERS) $(SYSTEM_ROUTINES) | sort | uniq` $(SHARED_LIB_LIBS)
++ $(DRIVERS) $(SYSTEM_ROUTINES) | sort | uniq` -o $(SHARED_LIB) $(SHARED_LIB_LIBS)
+ ln -s $(SHARED_LIB) libpgplot.so
EOD
@@ -134,7 +134,7 @@
+ ./pgbind $(PGBIND_FLAGS) -w $(PG_SOURCE)
+ $(CCOMPL) -c $(CFLAGC) cpg*.c
+ rm -f cpg*.c
-+ $(SHARED_LD) $(SHARED_LD_CPGPLOT_OPTS) cpg*.o -lpgplot $(SHARED_LIB_LIBS)
++ $(SHARED_LD) $(SHARED_LD_CPGPLOT_OPTS) cpg*.o -o $(SHARED_CLIB) -L. -lpgplot $(SHARED_LIB_LIBS)
+ ln -s $(SHARED_CLIB) libcpgplot.so
+ rm -f cpg*.o
+