From 30dceb225fc04e357ef704136c39fb2286e8f81b Mon Sep 17 00:00:00 2001 From: Jeffrey Gardner Date: Fri, 1 Jun 2012 00:06:25 +0000 Subject: Cleanup svn path=/; revision=339 --- media-video/makemkv/Manifest | 6 - .../files/makemkv-1.7.2-makefile.linux.patch | 20 -- media-video/makemkv/makemkv-1.7.2.ebuild | 73 ----- sci-chemistry/jmol/Manifest | 6 - sci-chemistry/jmol/files/caffeine.xyz | 26 -- sci-chemistry/jmol/files/index.html | 14 - sci-chemistry/jmol/files/jmol-12.2.27-nointl.patch | 330 --------------------- sci-chemistry/jmol/jmol-12.2.27.ebuild | 120 -------- sci-libs/naga/ChangeLog | 14 - sci-libs/naga/Manifest | 3 - sci-libs/naga/metadata.xml | 12 - sci-libs/naga/naga-2.1.ebuild | 30 -- 12 files changed, 654 deletions(-) delete mode 100644 media-video/makemkv/Manifest delete mode 100644 media-video/makemkv/files/makemkv-1.7.2-makefile.linux.patch delete mode 100644 media-video/makemkv/makemkv-1.7.2.ebuild delete mode 100644 sci-chemistry/jmol/Manifest delete mode 100644 sci-chemistry/jmol/files/caffeine.xyz delete mode 100644 sci-chemistry/jmol/files/index.html delete mode 100644 sci-chemistry/jmol/files/jmol-12.2.27-nointl.patch delete mode 100644 sci-chemistry/jmol/jmol-12.2.27.ebuild delete mode 100644 sci-libs/naga/ChangeLog delete mode 100644 sci-libs/naga/Manifest delete mode 100644 sci-libs/naga/metadata.xml delete mode 100644 sci-libs/naga/naga-2.1.ebuild diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest deleted file mode 100644 index a44c844..0000000 --- a/media-video/makemkv/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX makemkv-1.7.2-makefile.linux.patch 654 RMD160 464dccd8aa87f7e54534e3534f921d3cff5feebb SHA1 859bd6b205346c6802dc73dc7acd9642ce81a77a SHA256 99bb83537e2be8bab736086faaa0c06c0c8e6274b5816bbc772eab1d672433cc -DIST makemkv_v1.7.2_bin.tar.gz 5990443 RMD160 8ffc43809ee3508fecd3bc0f6b48010a97812a86 SHA1 73f4d24fe0fe39cc1ff0ede6d5d10b84c640a172 SHA256 68f612b64f05d04987f9f4190d80be3d3a43f51313bac98d1bcedb8ed7ea0b05 -DIST makemkv_v1.7.2_oss.tar.gz 471666 RMD160 ceac252e38e45360296be65d0cb81c09f02ae6f0 SHA1 3e49d0e4ef6a133831d4c4570e75575ac95bd63c SHA256 a2ae09da7347bd4cfc4ebfe1a82d853a719991d2a2ee47f5c59051ccb269f290 -EBUILD makemkv-1.7.2.ebuild 2249 RMD160 35373ee71428f9d6ae6d4e6b9214ba534b8bc336 SHA1 adee702c8a69817c1e3d8a2d36002f24589df844 SHA256 c7bf487d265f18d74fbdced549f5a57687160fd738b353721390eafa20601357 -MISC ChangeLog 290 RMD160 6c63f8fd81af37bac4c65f44345123ed76cb3701 SHA1 b6c134947b89267e5f5d13625246ac305f9598bd SHA256 db7c04d2bc4c62f7bc9c0024b9bc6c54241371c8e98df9dc2a0d789fc1f4f0df -MISC metadata.xml 281 RMD160 8d2f06c351e0b0756ea539eb32e2faa8dec4b64a SHA1 9ee2c10cfadb609245eff08b108f809b1d0f1046 SHA256 d91256704dd7de0642182be6f861a9cdce239252bcd7567364dca852ef907b35 diff --git a/media-video/makemkv/files/makemkv-1.7.2-makefile.linux.patch b/media-video/makemkv/files/makemkv-1.7.2-makefile.linux.patch deleted file mode 100644 index 4a545af..0000000 --- a/media-video/makemkv/files/makemkv-1.7.2-makefile.linux.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- makemkv_v1.7.2_oss/makefile.linux.orig 2012-02-10 07:22:18.373318016 -0600 -+++ makemkv_v1.7.2_oss/makefile.linux 2012-02-10 07:26:06.179324161 -0600 -@@ -8,7 +8,7 @@ - MOC=moc - endif - --CXXOPTS=-Os -D_GNU_SOURCE -D_linux_ -+CXXOPTS=-D_GNU_SOURCE -D_linux_ - - BUILDINFO_ARCH_NAME=$(shell $(GCC) -dumpmachine) - BUILDINFO_BUILD_DATE=$(shell date) -@@ -38,7 +38,7 @@ - install -D -m 644 makemkvgui/src/img/128/mkv_icon.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/makemkv.png - - out/%: out/%.full -- objcopy --strip-all --strip-debug --strip-unneeded --discard-all $< $@ -+ objcopy --discard-all $< $@ - - out/libdriveio.so.0.full: - mkdir -p out diff --git a/media-video/makemkv/makemkv-1.7.2.ebuild b/media-video/makemkv/makemkv-1.7.2.ebuild deleted file mode 100644 index 7a899ad..0000000 --- a/media-video/makemkv/makemkv-1.7.2.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/makemkv-1.6.16.ebuild,v 1.5 2011/12/03 00:44:41 beandog Exp $ - -EAPI=3 - -RESTRICT="mirror" - -inherit multilib eutils - -MY_P="makemkv_v${PV}_oss" -MY_PB="makemkv_v${PV}_bin" - -DESCRIPTION="Tool for ripping Blu-Ray, HD-DVD and DVD discs and copying content to a Matroska container" -HOMEPAGE="http://www.makemkv.com/" -SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz - http://www.makemkv.com/download/${MY_PB}.tar.gz" - -LICENSE="MakeMKV-EULA" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="" - -DEPEND="x11-libs/qt-gui:4 - dev-libs/openssl:0 - media-libs/mesa - x11-libs/qt-dbus:4 - sys-libs/zlib" -RDEPEND="${DEPEND}" - -QA_PREBUILT="opt/bin/makemkvcon" - -src_prepare() { - epatch "${FILESDIR}/${P}-makefile.linux.patch" - cd "${MY_P}" -} - -src_compile() { - cd "${MY_P}" - emake GCC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" -f makefile.linux || die "make failed" -} - -src_install() { - # install oss package - cd "${MY_P}" - dolib.so out/libdriveio.so.0 || die "dolib.so out/libdriveio.so.0 died" - dolib.so out/libmakemkv.so.1 || die "dolib.so out/libmakemkv.so.1 died" - dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so.0.${PV} || die "dosym libdriveio.so.0 died " - dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so || die "dosym libdriveio.so.0 died " - dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so.1.${PV} || die "dosym libmakemkv.so.1 died" - dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so || die "dosym libmakemkv.so.1 died" - into /opt - dobin out/makemkv || die "dobin makemkv died" - - newicon makemkvgui/src/img/128/mkv_icon.png ${PN}.png - make_desktop_entry ${PN} "MakeMKV" ${PN} "Qt;AudioVideo;Video" - - # install bin package - cd "../${MY_PB}/bin" - if use x86; then - dobin i386/makemkvcon || die "dobin makemkvcon died" - elif use amd64; then - dobin amd64/makemkvcon || die "dobin makemkvcon died" - fi -} - -pkg_postinst() { - elog "While MakeMKV is in beta mode, upstream has provided a license" - elog "to use if you do not want to purchase one." - elog "" - elog "See this forum thread for more information, including the key:" - elog "http://www.makemkv.com/forum2/viewtopic.php?f=5&t=1053" -} diff --git a/sci-chemistry/jmol/Manifest b/sci-chemistry/jmol/Manifest deleted file mode 100644 index afda356..0000000 --- a/sci-chemistry/jmol/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX caffeine.xyz 1116 RMD160 92b432c6584cd927fa1bfb155ea41011ab7a82d8 SHA1 d0f35a447b333b8ea51c15ab0ac67d887556e43c SHA256 45a9afac0b247780595944a98f8e1076a7e7e0dbb3e02cb54cecb0764b1cb67f -AUX index.html 328 RMD160 60d2a573c228e018a864fd7d9cfc7554264ccd6b SHA1 7ab256d768d3a4da43b5e497dfb1c3a53a8068a9 SHA256 8cba2c5eb7f25c0ecf23bc007eb61549a7d2177ac327db6c1e5f51f333ae2451 -AUX jmol-12.2.27-nointl.patch 13821 RMD160 4d6a6a598f4b550b6c2e3665c01b4f915d39c563 SHA1 2bc04f7a5e781f8628622a69f12d1f4a33b26140 SHA256 330a911405f00552d37a9c241c4a18b9d3e6812ce858933dbc4574df8248e345 -DIST Jmol-12.2.27-full.tar.gz 29493780 RMD160 e0f530e92ed079b1debf9fbd5c720ad19ba71977 SHA1 663a3a83a1fff373cea624d4cec4fdd71efcd505 SHA256 f2ca3b810ea16a488f6f57003d2a407c8ac040d610479a7ae6d95631157db801 -DIST jmol-selfSignedCertificate.store.tar 10240 RMD160 a6d4df5f108a2c13074190569b95d3310439ea57 SHA1 218fff84df0c542b634ba08ed2e82d3d3280a481 SHA256 416744934991ef4f1fa298c0afc8e855d43771de2f2278ed3fbc60f707ea46b2 -EBUILD jmol-12.2.27.ebuild 3122 RMD160 d2f11cd8ca0caa93d1a61ce8d4b8c4dcc3844449 SHA1 3adb087d63b0afb95b539936cd98768191e156d4 SHA256 c3475664390783f8a00aa462216dce7ef26286549ef0a81215688673d8694f27 diff --git a/sci-chemistry/jmol/files/caffeine.xyz b/sci-chemistry/jmol/files/caffeine.xyz deleted file mode 100644 index f0325b0..0000000 --- a/sci-chemistry/jmol/files/caffeine.xyz +++ /dev/null @@ -1,26 +0,0 @@ -24 -Caffeine -H -3.3804130 -1.1272367 0.5733036 -N 0.9668296 -1.0737425 -0.8198227 -C 0.0567293 0.8527195 0.3923156 -N -1.3751742 -1.0212243 -0.0570552 -C -1.2615018 0.2590713 0.5234135 -C -0.3068337 -1.6836331 -0.7169344 -C 1.1394235 0.1874122 -0.2700900 -N 0.5602627 2.0839095 0.8251589 -O -0.4926797 -2.8180554 -1.2094732 -C -2.6328073 -1.7303959 -0.0060953 -O -2.2301338 0.7988624 1.0899730 -H 2.5496990 2.9734977 0.6229590 -C 2.0527432 -1.7360887 -1.4931279 -H -2.4807715 -2.7269528 0.4882631 -H -3.0089039 -1.9025254 -1.0498023 -H 2.9176101 -1.8481516 -0.7857866 -H 2.3787863 -1.1211917 -2.3743655 -H 1.7189877 -2.7489920 -1.8439205 -C -0.1518450 3.0970046 1.5348347 -C 1.8934096 2.1181245 0.4193193 -N 2.2861252 0.9968439 -0.2440298 -H -0.1687028 4.0436553 0.9301094 -H 0.3535322 3.2979060 2.5177747 -H -1.2074498 2.7537592 1.7203047 diff --git a/sci-chemistry/jmol/files/index.html b/sci-chemistry/jmol/files/index.html deleted file mode 100644 index 35a5d49..0000000 --- a/sci-chemistry/jmol/files/index.html +++ /dev/null @@ -1,14 +0,0 @@ - - - Jmol Test Page -
All the Sugar and Twice the Caffeine.

- - - -
- - - diff --git a/sci-chemistry/jmol/files/jmol-12.2.27-nointl.patch b/sci-chemistry/jmol/files/jmol-12.2.27-nointl.patch deleted file mode 100644 index 0a43faa..0000000 --- a/sci-chemistry/jmol/files/jmol-12.2.27-nointl.patch +++ /dev/null @@ -1,330 +0,0 @@ ---- orig-build.xml 2012-05-31 13:42:43.943062427 -0500 -+++ build.xml 2012-05-31 14:01:01.691982062 -0500 -@@ -52,8 +52,6 @@ - - - -- -- - - - -@@ -111,10 +109,6 @@ - - -- -- -- - - - -@@ -124,14 +118,6 @@ - - -- -- -- -- -- -- - - - -@@ -141,14 +127,6 @@ - - -- -- -- -- -- -- - - - -@@ -158,14 +136,6 @@ - - -- -- -- -- -- -- - - - -@@ -388,17 +358,12 @@ - - - -+ depends="init,classes,jmolGuide,jmolHistory,jmolDevelopersGuide,libjars"> - - - - - -- -- -- -- -- - - - -@@ -603,18 +568,6 @@ - - - -- -- -- -- -- -- -- -- -- -- - - - -@@ -729,7 +682,6 @@ - - - -- - - - -@@ -755,7 +707,6 @@ - - - -- - - - -@@ -868,16 +819,6 @@ - keystore="selfSignedCertificate/selfSignedCertificate.store" - storepass="selfSignedCertificate" alias="selfSignedCertificate" /> - -- -- -- -- -- -- - - -@@ -1123,7 +1048,7 @@ - - - -+ depends="doc,main,signed-applet"> - - - -@@ -1183,7 +1108,6 @@ - - - -- - - - -@@ -1278,7 +1202,6 @@ - - - -- - - - -@@ -1374,7 +1297,7 @@ - - - -- -+ - - - -@@ -1438,16 +1361,6 @@ - - - -- -- -- -- -- -- -- -- - - - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - -@@ -1575,12 +1432,4 @@ - - - -- -- -- -- -- -- -- -- - diff --git a/sci-chemistry/jmol/jmol-12.2.27.ebuild b/sci-chemistry/jmol/jmol-12.2.27.ebuild deleted file mode 100644 index 5c80596..0000000 --- a/sci-chemistry/jmol/jmol-12.2.27.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=1 -WEBAPP_OPTIONAL="yes" - -inherit eutils webapp java-pkg-2 java-ant-2 - -MY_P="Jmol" - -DESCRIPTION="Jmol is a java molecular viever for 3-D chemical structures." -SRC_URI=" - mirror://sourceforge/${PN}/${MY_P}-${PV}-full.tar.gz - http://dev.gentoo.org/~jlec/distfiles/${PN}-selfSignedCertificate.store.tar" - -HOMEPAGE="http://jmol.sourceforge.net/" -KEYWORDS="~x86 ~amd64" -LICENSE="LGPL-2.1" - -IUSE="client-only vhosts" - -WEBAPP_MANUAL_SLOT="yes" -SLOT="0" - -COMMON_DEP="dev-java/commons-cli - dev-java/itext:0 - sci-libs/jmol-acme - sci-libs/vecmath-objectclub - sci-libs/naga" -RDEPEND=">=virtual/jre-1.5 - ${COMMON_DEP}" -DEPEND=">=virtual/jdk-1.5 - dev-java/saxon:6.5 - !client-only? ( ${WEBAPP_DEPEND} ) - ${COMMON_DEP}" - -pkg_setup() { - - use client-only || webapp_pkg_setup - java-pkg-2_pkg_setup -} - -src_unpack() { - - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${P}-nointl.patch - - rm -v "${S}"/*.jar "${S}"/plugin-jars/*.jar || die - cd "${S}/jars" - -# We still have to use netscape.jar on amd64 until a nice way to include plugin.jar comes along. - if use amd64; then - mv -v netscape.jar netscape.tempjar || die "Failed to move netscape.jar." - rm -v *.jar *.tar.gz || die "Failed to remove jars." - mv -v netscape.tempjar netscape.jar || die "Failed to move netscape.tempjar." - fi - - java-pkg_jar-from vecmath-objectclub vecmath-objectclub.jar vecmath1.2-1.14.jar - java-pkg_jar-from itext iText.jar itext-1.4.5.jar - java-pkg_jar-from jmol-acme jmol-acme.jar Acme.jar - java-pkg_jar-from commons-cli-1 commons-cli.jar commons-cli-1.0.jar - java-pkg_jar-from naga - java-pkg_jar-from saxon-6.5 saxon.jar - - mkdir -p "${S}/build/appjars" || die -} - -src_compile() { - # prevent absorbing dep's classes - eant -Dlibjars.uptodate=true main -} - -src_install() { - - java-pkg_dojar build/Jmol.jar - dohtml -r build/doc/* || die "Failed to install html docs." - dodoc *.txt doc/*license* || die "Failed to install licenses." - - java-pkg_dolauncher ${PN} --main org.openscience.jmol.app.Jmol \ - --java_args "-Xmx512m" - - if ! use client-only ; then - webapp_src_preinst || die "Failed webapp_src_preinst." - cmd="cp Jmol.js build/Jmol.jar "${D}${MY_HTDOCSDIR}"" ; ${cmd} \ - || die "${cmd} failed." - cmd="cp build/JmolApplet*.jar "${D}${MY_HTDOCSDIR}"" ; ${cmd} \ - || die "${cmd} failed." - cmd="cp applet.classes "${D}${MY_HTDOCSDIR}"" ; ${cmd} \ - || die "${cmd} failed." - cmd="cp -r build/classes/* "${D}${MY_HTDOCSDIR}"" ; ${cmd} \ - || die "${cmd} failed." - cmd="cp -r build/appletjars/* "${D}${MY_HTDOCSDIR}"" ; ${cmd} \ - || die "${cmd} failed." - cmd="cp "${FILESDIR}"/caffeine.xyz "${D}${MY_HTDOCSDIR}"" ; ${cmd} \ - || die "${cmd} failed." - cmd="cp "${FILESDIR}"/index.html "${D}${MY_HTDOCSDIR}"" ; ${cmd} \ - || die "${cmd} failed." - - webapp_src_install || die "Failed running webapp_src_install" - fi -} - -pkg_postinst() { - - if ! use client-only ; then - webapp_pkg_postinst || die "webapp_pkg_postinst failed" - fi - -} - -pkg_prerm() { - - if ! use client-only ; then - webapp_pkg_prerm || die "webapp_pkg_prerm failed" - fi - -} diff --git a/sci-libs/naga/ChangeLog b/sci-libs/naga/ChangeLog deleted file mode 100644 index 5cf9787..0000000 --- a/sci-libs/naga/ChangeLog +++ /dev/null @@ -1,14 +0,0 @@ -# ChangeLog for sci-libs/naga -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - -*naga-2.1 (31 May 2012) - - 31 May 2012; Jeff Gardner +naga-2.1.ebuild: - Add older version, supports Jmol. - -*naga-3.0 (30 May 2012) - - 30 May 2012; Jeff Gardner +naga-3.0.ebuild: - Initial ebuild - dependency for new Jmol. - diff --git a/sci-libs/naga/Manifest b/sci-libs/naga/Manifest deleted file mode 100644 index e4a3b7d..0000000 --- a/sci-libs/naga/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -EBUILD naga-2.1.ebuild 591 RMD160 d06971567e4ff00520b36a77098ead399536a5c0 SHA1 53e19fa72038b2f6b1ebabb23f1cb27ee07ecd29 SHA256 83a0eb91324317332e5d0819c0a12a6345d12ce8cfaa168cc953014fe0754fe8 -MISC ChangeLog 378 RMD160 c3995eb59b80fef5d249bbf3063d49ee0900d699 SHA1 5848423d1c159c180199cca740de4494a039ecbe SHA256 a12f9ae7dc4216c9deef15db5f7244eecd2842ede4ab0268664cd737c5f1130d -MISC metadata.xml 323 RMD160 2174743fad48617537ae62516c80a9007b6e369a SHA1 07d234c82e9fa7ce2611958b1dff1199720705c6 SHA256 28113df115a6185cd10fb09ea7098095ffee8e993dfc8ae97600bee56e8542be diff --git a/sci-libs/naga/metadata.xml b/sci-libs/naga/metadata.xml deleted file mode 100644 index ce4f93d..0000000 --- a/sci-libs/naga/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - je_fro@gentoo.org - Jeff Gardner - - - Simplified Java NIO asynchronous sockets - - - diff --git a/sci-libs/naga/naga-2.1.ebuild b/sci-libs/naga/naga-2.1.ebuild deleted file mode 100644 index 588e30e..0000000 --- a/sci-libs/naga/naga-2.1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ -EAPI=4 - -inherit subversion java-pkg-2 java-ant-2 - -ESVN_REPO_URI="http://naga.googlecode.com/svn/trunk@57" -MY_PV=${PV//./_} -MY_PVR="${MY_PV}-r43" - -DESCRIPTION="Simplified Java NIO asynchronous sockets" -HOMEPAGE="http://code.google.com/p/naga/" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -DEPEND=">=virtual/jdk-1.5 - dev-java/ant-core" -RDEPEND=">=virtual/jre-1.5" - -src_compile() { - eant build -} - -src_install() { - java-pkg_newjar _DIST/${PN}-${MY_PVR}.jar ${PN}.jar -} -- cgit v1.2.3-65-gdbad