Revision bump: EAPI 5, epatch_user, add ~amd64 keyword, fix work with new media-libs/freeglut, add desktop-effects herd to metadata

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

5 files changed, 63 insertions, 11 deletions

diff --git a/x11-misc/3dfb/3dfb-0.6.1-r1.ebuild b/x11-misc/3dfb/3dfb-0.6.1-r1.ebuild
new file mode 100644
index 000000000000..74c34f81b4cf
--- /dev/null
+++ b/x11-misc/3dfb/3dfb-0.6.1-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/3dfb/3dfb-0.6.1-r1.ebuild,v 1.1 2014/03/13 09:01:46 pinkbyte Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="3D File Browser"
+HOMEPAGE="http://sourceforge.net/projects/dz3d/"
+SRC_URI="mirror://sourceforge/dz3d/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="dev-libs/glib:2
+	media-libs/freeglut
+	virtual/opengl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS README WISHLIST )
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-gcc41.patch" \
+		"${FILESDIR}/${P}-freeglut-compat.patch"
+	epatch_user
+}
diff --git a/x11-misc/3dfb/ChangeLog b/x11-misc/3dfb/ChangeLog
index 92ec483b48fe..703cca828a6e 100644
--- a/x11-misc/3dfb/ChangeLog
+++ b/x11-misc/3dfb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/3dfb
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/3dfb/ChangeLog,v 1.11 2014/03/11 19:47:56 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/3dfb/ChangeLog,v 1.12 2014/03/13 09:01:46 pinkbyte Exp $
+
+*3dfb-0.6.1-r1 (13 Mar 2014)
+
+  13 Mar 2014; Sergey Popov <pinkbyte@gentoo.org> +3dfb-0.6.1-r1.ebuild,
+  +files/3dfb-0.6.1-freeglut-compat.patch, metadata.xml:
+  Revision bump: EAPI 5, epatch_user, add ~amd64 keyword, fix work with new
+  media-libs/freeglut, add desktop-effects herd to metadata
 
   11 Mar 2014; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due #53266
diff --git a/x11-misc/3dfb/Manifest b/x11-misc/3dfb/Manifest
index d7bd3e6175f9..2e81d3444c84 100644
--- a/x11-misc/3dfb/Manifest
+++ b/x11-misc/3dfb/Manifest
@@ -2,14 +2,20 @@
 Hash: SHA256
 
 AUX 0.6.1-gcc41.patch 330 SHA256 5f94be8d79e92ac241a86ae5c3c2cadded16a1489b4a16cc6376474348f4192d SHA512 af8a42cd700c00b25b7d984be14da8cc78c10397f49982c9ddba6fd6dfa8d5bb3a31e2a86a15ba60832ba7083916d72d2f8a8de642ffb257d630cecd4a8a7fea WHIRLPOOL 97a31b175cb62bdd12736d9f064ae60ea124e4eb41b29da100bd99d5abbb8c31a2aeab5343c676db348ff3c158b5bcaea844a850e85a5545f3f4e35303ee0008
-DIST 3dfb-0.6.1.tar.gz 102343 SHA256 94321725651711a7f7e61f8c479e519985f980e788dfa6a840300d8a41dacf3f
+AUX 3dfb-0.6.1-freeglut-compat.patch 246 SHA256 d80bfc5a22489cd48c31a823ab425352e89dc45ef3c510e29d459579cc6c64dd SHA512 72d9e5326c28455b09f868b6eed6f38844914db84cbba7f603f46b5211dfe8c54f1db022aef9cd3586681548f2910d07bc2033dfaa246f3ef566eea2af458378 WHIRLPOOL 6c3a01aad9e39f01f59dde4affda292b1e0eb223a90d103df6f103ff79261a595e2d174993c482e30be860bbc62256a705a1cf3810e5091a6820af565ce718d5
+DIST 3dfb-0.6.1.tar.gz 102343 SHA256 94321725651711a7f7e61f8c479e519985f980e788dfa6a840300d8a41dacf3f SHA512 3eb43dd80d5ffaea8845e84e2cf21599ee36739ac99d558c4c11592363970795e60b30f444229c987f527a0765fa657111d7a54eef84b5d3d9375c7a812588f1 WHIRLPOOL 4d589d3f9a0b3823e7e64db15f147eced83224db5c20e73c40ac98a7192b93a409f36d561017fc4d23a354e210bdf1e9cafddee8461fe94c88abc79cb578263a
+EBUILD 3dfb-0.6.1-r1.ebuild 693 SHA256 484a1423c9784c0798a1d2697db21bb8916689b9e60552335669bbee09e21a0f SHA512 382f3580423560932946c4ee82a4e512b1096cee4c2cb2979054dd16e2466561e656a553f25ecac85a398e7879425ae83c3036e8076e6bc9271436a3bff4c006 WHIRLPOOL 05398ab50ee59de4d34297cfd57b226fee4db8182cc13aa084ad173931f9409495e748c7542960decd1b665c86fadb465bed3b03d85dd23708e49717451870d2
 EBUILD 3dfb-0.6.1.ebuild 739 SHA256 2560fede31c7dde45b53c16dd3dfaf638665776327c21660ea30ff2665bb143a SHA512 63485c443d68e9aa864d800fa239ce4f91df9a677cb12056701d5342d391ff394259cae5cbbafd6f6067df30f10c57943eb051ce941d0124770ff01c68efdd2b WHIRLPOOL 16c92a772d89b31b4958f06cf08fcd4064945e74d940fcfa4b8004ff4c6e4169ec83cdf85db321d07f6f4dc3a47770b97fd4b6ba8d9cdbbedd7dd24114f870fa
-MISC ChangeLog 1676 SHA256 15367b8cb291a3fa30e5a0f75fa5c89b4d31ea23019d8ce25e22407f6213af0b SHA512 1680edfc1c390e9c2856350a22af0b42e5b65c4e8f1339f2bd5e57c1fddac19b834429d4e511f918b037c55684256bd4ff47fa07657c2bab651ee35f4111b9c4 WHIRLPOOL 79402931b1fd7014661c4529cdcc969b289eb0cf468af7eccba3589679789288c2b596abe1384a4fa2540ec9d30f65a9d706bb98e389c81f4acae3f11c9bf0de
-MISC metadata.xml 248 SHA256 7404eee9a4427538674065b37d113a6531546b1126da727a21b6dbae1926bf98 SHA512 62af57b5fac4401e2f1b9d0006ae15a8cf4d22f16380384636e02fe3f203da7202b990b8f5b5e126e74bbc3a30a2f37a521bcbaeb17dc6581d9f88c1610f3243 WHIRLPOOL 34ed8bec35a46601b44386479d7f52e4a72483c41e7c6f7a5b9b5195e280e296283d40f00954043baa1a2498ae0faceb98523cf17e21da2df1f9d047909d66ec
+MISC ChangeLog 1976 SHA256 b3b50fb75867d5fd46e68f45de3982d5e2fb75c41120949603f3ce196298d50a SHA512 42425270408159c2837eeaa3bb3595faae495c4c9a51a844607836e3a0b243e84bfbcf09d8fbd85c339f12a3240a42bcf9e464852c66dcd6daa7c85a1254c2d8 WHIRLPOOL 2403d10b5f8436cfa419298976ec991b6b057d051f806595014b87b90db59de8d440286f9b1bc95f6c0cbe16b7d78ed6a5c9cf5083b3ef39a2562e8fbb99aced
+MISC metadata.xml 243 SHA256 517a11ccc0053776c8b66bc137b27c4f5257d852ce1477ce3bd420577b7f0f52 SHA512 b4fea89e2f4a15f7e5d86c9959db55036399b63ec77402d2faac134b3a2cf7836b5e030f71885d66c863c02637e0953e3dc4f5ca17bb703f60dfb525af2b9a48 WHIRLPOOL 163095411b7cac68900b7f9312fec9bd98d6912276424a3d9491df409a4547c4152bd835cfba317705bb4c55217a1060dfbcbb4a079bd362b02a0f541675fd24
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMfaG0ACgkQCaWpQKGI+9TxLwCfdaesGPMcq0tW4X6lPQlxV5Df
-0IEAn0+y5ZYVMSbDnixoxq1BGbsxOzd6
-=OX2l
+iQEcBAEBCAAGBQJTIXPfAAoJECo/aRed9267FfgIALwLOFgYug76/V1b5AMo2PeR
+XKt0F5mZKa63zJceVE2yWLsB0BjAJzVjxP5Hv74HmpLtFLYO64ua+rnMb2wN1RGg
+T8aacIVh2zgAfCvL/kSLScwpaHsaZ+ucV7XGCsa1r30lRbJFoU68WZ/b3DKppg+R
+Z5Qp4WQtX9+LNPxEURlpKjCr4QuA4jIkJ3gz96VdiHgXyDuew1LzkgmGjjWH/4rR
+4eBaVP5QDuUYNS2Jsr4Uj7lbMfewZyPuvgC45fFQWr3msaE0wz2xDyk2EtPbvmlR
+OSdLDXYR1ZvPp1VVrSm9uExAixvKYrHbX8u+Ncv/T9GoRMSVa2zWVbsL/f2FIns=
+=Syaf
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/3dfb/files/3dfb-0.6.1-freeglut-compat.patch b/x11-misc/3dfb/files/3dfb-0.6.1-freeglut-compat.patch
new file mode 100644
index 000000000000..f05e3538120d
--- /dev/null
+++ b/x11-misc/3dfb/files/3dfb-0.6.1-freeglut-compat.patch
@@ -0,0 +1,10 @@
+--- src/main.cpp.bak	2014-03-13 12:24:32.155889466 +0400
++++ src/main.cpp	2014-03-13 12:24:42.482890090 +0400
+@@ -7,6 +7,7 @@
+ 
+ int main(int argc, char **argv)
+ {
++    glutInit(&argc, argv);
+     gui_init();
+     glutMainLoop();
+     return(0);
diff --git a/x11-misc/3dfb/metadata.xml b/x11-misc/3dfb/metadata.xml
index 1076258a0ce8..d0053fa8abcf 100644
--- a/x11-misc/3dfb/metadata.xml
+++ b/x11-misc/3dfb/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
-<longdescription></longdescription>
+	<herd>desktop-effects</herd>
+	<upstream>
+		<remote-id type="sourceforge">dz3d</remote-id>
+	</upstream>
 </pkgmetadata>