diff options
| author |   Justin Lecher (jlec) <jlec@j-schmitz.net> | 2009-12-02 15:07:30 +0100 |
|---|---|---|
| committer | Justin Lecher (jlec) <jlec@j-schmitz.net> | 2009-12-02 15:07:30 +0100 |
| commit | f1fca4959fbcb656c7c778c544da90518b66381e (patch) | |
| tree | 0c077e707797241ca914035aac10b5b5138d8d15 /sci-chemistry | |
| parent | sci-chemistry/probe Imported fron dberkholz overlay (diff) | |
| download | sci-f1fca4959fbcb656c7c778c544da90518b66381e.tar.gz sci-f1fca4959fbcb656c7c778c544da90518b66381e.tar.bz2 sci-f1fca4959fbcb656c7c778c544da90518b66381e.zip | |
sci-chemistry/probe Everything fixed
(Portage version: 2.2_rc54/git/Linux i686)
(Signed Manifest commit)
Diffstat (limited to 'sci-chemistry')
| -rw-r--r-- | sci-chemistry/prekin/Manifest | 12 | ||||
| -rw-r--r-- | sci-chemistry/prekin/files/6.51.081122-Makefile.patch | 8 | ||||
| -rw-r--r-- | sci-chemistry/prekin/metadata.xml | 3 | ||||
| -rw-r--r-- | sci-chemistry/prekin/prekin-6.51.081122.ebuild | 10 |
4 files changed, 19 insertions, 14 deletions
diff --git a/sci-chemistry/prekin/Manifest b/sci-chemistry/prekin/Manifest index b1665a08d..93ed00334 100644 --- a/sci-chemistry/prekin/Manifest +++ b/sci-chemistry/prekin/Manifest @@ -1,15 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX 6.51.081122-Makefile.patch 1322 RMD160 b0976005bc164765bc924e126431f3b2a1696d44 SHA1 72552a9849b6c139a831e29ef468739c4296206b SHA256 a97d12817b04f3bcc4f73b2c3fb7b931137193977a98b1182db21c16e8f8f6a5 +AUX 6.51.081122-Makefile.patch 1456 RMD160 2274cc1f803bb38ea5d1cba0f28b583859e7520d SHA1 7fb4e5b1f8e33e211dced62b779e5c09034e5857 SHA256 7f1b2d39007683b4ecb391ec5bd711ca32115f361dcfc0aa05b25fe52817bb4c DIST prekin.6.51.081122.src.tgz 350756 RMD160 a48df8558ee98396492851b0f1b73723cb4b9559 SHA1 7b3c1da210c26fd9740ecba4de02e985efdbbe61 SHA256 74a771cd8be000df13ac908f23a2e945e8bd3590884c6bc6ccff75804cc0fb7a -EBUILD prekin-6.51.081122.ebuild 1065 RMD160 504dcd7c584899b1e546e7e18f062963680b4117 SHA1 9896f92e47dbedc6a949cc1fdb4298e2a5c808e6 SHA256 aff61d526202d5d7361aa47512d94fbdaaa159759bf10a6a4e72dcdc418777ae +EBUILD prekin-6.51.081122.ebuild 1097 RMD160 e15e97f08a4c2a8eb146540b8f0b136a4646b83f SHA1 682b89a881bfbb9b53614e8ecec4ab5379276f30 SHA256 3604120f07794e3a70ac54570c4628f1add7ce2a7ebcac0331d445d3c7ece5f9 MISC ChangeLog 1136 RMD160 63b90a8a7f0ab88c2247dc7500d689ef039b90ee SHA1 4a2648ffdf0cfe3d724a5fb0f888a148ab5995de SHA256 6d57373f81e39d3394893bdd8a55d234848e8213e180b4afa56b56963229eafb -MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852 +MISC metadata.xml 223 RMD160 7d8c63fa814e8ba780a059e37d2c9db5f2cb4a83 SHA1 3bdbbc98b27729db0c2895c7e611ac974a946d54 SHA256 f2b57b258a607b1f88bd6353285a8ab044a6417b2b433183fddecbf5ee445853 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (GNU/Linux) -iEYEARECAAYFAksWaq4ACgkQgAnW8HDreRZYBwCgrbLHzqr/7QL22ZRs/rPTvWKF -QF0AnAkiKUpSzwBzvLzYo4/CjpSI79pz -=sqgH +iEYEARECAAYFAksWdKIACgkQgAnW8HDreRbX6wCdEWhKIcnZKBU9AmiGIIFaI5HU +D10An2vrTcEm8qRcpMWYekOdkzPSEurc +=cgmm -----END PGP SIGNATURE----- diff --git a/sci-chemistry/prekin/files/6.51.081122-Makefile.patch b/sci-chemistry/prekin/files/6.51.081122-Makefile.patch index a0a257838..5fd9d00d9 100644 --- a/sci-chemistry/prekin/files/6.51.081122-Makefile.patch +++ b/sci-chemistry/prekin/files/6.51.081122-Makefile.patch @@ -1,8 +1,8 @@ diff --git a/Makefile.linux b/Makefile.linux -index 65a021a..95e3f75 100755 +index 65a021a..3daacd8 100755 --- a/Makefile.linux +++ b/Makefile.linux -@@ -1,14 +1,14 @@ +@@ -1,15 +1,15 @@ # -CFLAGS = -I/usr/X11R6/include +CFLAGS += -I/usr/X11R6/include @@ -16,10 +16,12 @@ index 65a021a..95e3f75 100755 ifeq ($(MAKECMDGOALS),nogui) -CFLAGS = -D NOGUI -I/usr/X11R6/include +-LIBS = -L/usr/lib -L/usr/X11R6/lib -lXmu -lXt -lSM -lICE -lXext -lX11 +CFLAGS += -D NOGUI -I/usr/X11R6/include - LIBS = -L/usr/lib -L/usr/X11R6/lib -lXmu -lXt -lSM -lICE -lXext -lX11 ++LIBS = -L/usr/GENTOOLIBDIR -L/usr/X11R6/lib -lXmu -lXt -lSM -lICE -lXext -lX11 endif + FIN = -lm -pthread #for RH9.0, ok for RH7.3 & RH8.0 @@ -26,13 +26,13 @@ OBJS = PKINANGL.o PKINCRTL.o PKINCSBS.o PKINCSUB.o PKINCOUT.o PKINMENU.o PKINROT # Commands specific to clients created by this Makefile diff --git a/sci-chemistry/prekin/metadata.xml b/sci-chemistry/prekin/metadata.xml index 9ac9ffdb3..9a1f70b1f 100644 --- a/sci-chemistry/prekin/metadata.xml +++ b/sci-chemistry/prekin/metadata.xml @@ -2,4 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>sci-chemistry</herd> +<use> + <flag name='gui'>build gui support</flag> +</use> </pkgmetadata> diff --git a/sci-chemistry/prekin/prekin-6.51.081122.ebuild b/sci-chemistry/prekin/prekin-6.51.081122.ebuild index f63869a98..4d62c5d8a 100644 --- a/sci-chemistry/prekin/prekin-6.51.081122.ebuild +++ b/sci-chemistry/prekin/prekin-6.51.081122.ebuild @@ -4,7 +4,7 @@ EAPI="2" -inherit toolchain-funcs eutils +inherit toolchain-funcs eutils multilib MY_P="${PN}.${PV}" @@ -15,7 +15,7 @@ SRC_URI="http://kinemage.biochem.duke.edu/downloads/software/prekin/${MY_P}.src. LICENSE="richardson" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="X" +IUSE="gui" RDEPEND="x11-libs/openmotif" DEPEND="${RDEPEND}" @@ -26,13 +26,14 @@ src_prepare() { epatch "${FILESDIR}"/${PV}-Makefile.patch sed \ -e 's:cc:$(CC):g' \ + -e "s:GENTOOLIBDIR:$(get_libdir):g" \ "${S}"/Makefile.linux > Makefile } src_compile() { local mytarget - if use X; then + if use gui; then mytarget="${PN}" else mytarget="nogui" @@ -40,10 +41,9 @@ src_compile() { emake \ CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS}" \ ${mytarget} || die "make failed" } src_install() { - dobin ${S}/prekin || die "dobin failed" + dobin "${S}"/prekin || die "dobin failed" } |